diff options
Diffstat (limited to 'Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/run/RunGeneratorConfig.xtend')
-rw-r--r-- | Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/run/RunGeneratorConfig.xtend | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/run/RunGeneratorConfig.xtend b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/run/RunGeneratorConfig.xtend index e1232040..eddb8bb5 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/run/RunGeneratorConfig.xtend +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/run/RunGeneratorConfig.xtend | |||
@@ -38,7 +38,8 @@ class RunGeneratorConfig { | |||
38 | static var MODELS = 10 | 38 | static var MODELS = 10 |
39 | static var RUNTIME = 1500 | 39 | static var RUNTIME = 1500 |
40 | static var NUM_SOLVER = "z3" | 40 | static var NUM_SOLVER = "z3" |
41 | static var SCOPE_PROPAGATOR = "typeHierarchy" | 41 | static var DREAL_PATH = "" |
42 | // static var SCOPE_PROPAGATOR = "typeHierarchy" | ||
42 | 43 | ||
43 | static var DOMAIN = "FamilyTree" // "FamilyTree", "Satellite", "Taxation" | 44 | static var DOMAIN = "FamilyTree" // "FamilyTree", "Satellite", "Taxation" |
44 | static val QUERIES = true | 45 | static val QUERIES = true |
@@ -71,9 +72,12 @@ class RunGeneratorConfig { | |||
71 | val ns = new Option("ns", "numericSolver", true, "what numeric solver to use") | 72 | val ns = new Option("ns", "numericSolver", true, "what numeric solver to use") |
72 | options.addOption(ns) | 73 | options.addOption(ns) |
73 | 74 | ||
74 | val sp = new Option("sp", "scopePropagator", true, "scope Propagator") | 75 | val drp = new Option("drp", "drealPath", true, "path to dreal executeable") |
75 | options.addOption(sp) | 76 | options.addOption(drp) |
76 | 77 | ||
78 | // val sp = new Option("sp", "scopePropagator", true, "scope Propagator") | ||
79 | // options.addOption(sp) | ||
80 | // | ||
77 | val d = new Option("d", "domain", true, "domain") | 81 | val d = new Option("d", "domain", true, "domain") |
78 | options.addOption(d) | 82 | options.addOption(d) |
79 | 83 | ||
@@ -103,9 +107,11 @@ class RunGeneratorConfig { | |||
103 | val rtIn = cmd.getOptionValue("runtime") | 107 | val rtIn = cmd.getOptionValue("runtime") |
104 | if(rtIn !== null) RUNTIME = Integer.parseInt(rtIn) | 108 | if(rtIn !== null) RUNTIME = Integer.parseInt(rtIn) |
105 | val nsIn = cmd.getOptionValue("numericSolver") | 109 | val nsIn = cmd.getOptionValue("numericSolver") |
106 | if(nsIn !== null && nsIn.equals("dreal")) NUM_SOLVER = "dreal" | 110 | if(nsIn !== null && nsIn.equals("dreal")) NUM_SOLVER = "dreal-local" |
107 | val spIn = cmd.getOptionValue("scopePropagator") | 111 | val drpIn = cmd.getOptionValue("drealPath") |
108 | if(spIn !== null ) SCOPE_PROPAGATOR = spIn | 112 | if(drpIn !== null) DREAL_PATH = drpIn |
113 | // val spIn = cmd.getOptionValue("scopePropagator") | ||
114 | // if(spIn !== null ) SCOPE_PROPAGATOR = spIn | ||
109 | val dIn = cmd.getOptionValue("domain") | 115 | val dIn = cmd.getOptionValue("domain") |
110 | if(dIn !== null) DOMAIN = dIn | 116 | if(dIn !== null) DOMAIN = dIn |
111 | val hhIn = cmd.getOptionValue("household") | 117 | val hhIn = cmd.getOptionValue("household") |
@@ -126,7 +132,7 @@ class RunGeneratorConfig { | |||
126 | println( | 132 | println( |
127 | "<<DOMAIN: " + DOMAIN + | 133 | "<<DOMAIN: " + DOMAIN + |
128 | ", NumSolver=" + NUM_SOLVER + | 134 | ", NumSolver=" + NUM_SOLVER + |
129 | ", scopeProp=" + SCOPE_PROPAGATOR + | 135 | // ", scopeProp=" + SCOPE_PROPAGATOR + |
130 | ", SIZE=" + SIZE_LB + "to" + SIZE_UB + | 136 | ", SIZE=" + SIZE_LB + "to" + SIZE_UB + |
131 | ", Runs=" + RUNS + | 137 | ", Runs=" + RUNS + |
132 | ", ModelsPerRun=" + MODELS + | 138 | ", ModelsPerRun=" + MODELS + |
@@ -203,8 +209,10 @@ class RunGeneratorConfig { | |||
203 | runtimeEntry.millisecLimit = RUNTIME | 209 | runtimeEntry.millisecLimit = RUNTIME |
204 | val numSolverEntry = configScope.entries.get(1) as CustomEntry | 210 | val numSolverEntry = configScope.entries.get(1) as CustomEntry |
205 | numSolverEntry.value = NUM_SOLVER | 211 | numSolverEntry.value = NUM_SOLVER |
206 | val scopePropEntry = configScope.entries.get(2) as CustomEntry | 212 | val drealPathEntry = configScope.entries.get(2) as CustomEntry |
207 | scopePropEntry.value = SCOPE_PROPAGATOR | 213 | drealPathEntry.value = DREAL_PATH |
214 | // val scopePropEntry = configScope.entries.get(3) as CustomEntry | ||
215 | // scopePropEntry.value = SCOPE_PROPAGATOR | ||
208 | 216 | ||
209 | // Output locations | 217 | // Output locations |
210 | val debug = genTask.debugFolder as FileSpecification | 218 | val debug = genTask.debugFolder as FileSpecification |