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 {
         static var MODELS = 10

         static var RUNTIME = 1500

         static var NUM_SOLVER = "z3"

-        static var SCOPE_PROPAGATOR = "typeHierarchy"

+        static var DREAL_PATH = ""

+//      static var SCOPE_PROPAGATOR = "typeHierarchy"

 

         static var DOMAIN = "FamilyTree" // "FamilyTree", "Satellite", "Taxation"

         static val QUERIES = true

@@ -71,9 +72,12 @@ class RunGeneratorConfig {
                 val ns = new Option("ns", "numericSolver", true, "what numeric solver to use")

                 options.addOption(ns)

                 

-                val sp = new Option("sp", "scopePropagator", true, "scope Propagator")

-                options.addOption(sp)

-

+                val drp = new Option("drp", "drealPath", true, "path to dreal executeable")

+                options.addOption(drp)

+                

+//              val sp = new Option("sp", "scopePropagator", true, "scope Propagator")

+//              options.addOption(sp)

+//

                 val d = new Option("d", "domain", true, "domain")

                 options.addOption(d)

 

@@ -103,9 +107,11 @@ class RunGeneratorConfig {
                 val rtIn = cmd.getOptionValue("runtime")

                 if(rtIn !== null) RUNTIME = Integer.parseInt(rtIn)

                 val nsIn = cmd.getOptionValue("numericSolver")

-                if(nsIn !== null && nsIn.equals("dreal")) NUM_SOLVER = "dreal"

-                val spIn = cmd.getOptionValue("scopePropagator")

-                if(spIn !== null ) SCOPE_PROPAGATOR = spIn

+                if(nsIn !== null && nsIn.equals("dreal")) NUM_SOLVER = "dreal-local"

+                val drpIn = cmd.getOptionValue("drealPath")

+                if(drpIn !== null) DREAL_PATH = drpIn

+//              val spIn = cmd.getOptionValue("scopePropagator")

+//              if(spIn !== null ) SCOPE_PROPAGATOR = spIn

                 val dIn = cmd.getOptionValue("domain")

                 if(dIn !== null) DOMAIN = dIn

                 val hhIn = cmd.getOptionValue("household")

@@ -126,7 +132,7 @@ class RunGeneratorConfig {
                 println(

                         "<<DOMAIN: " + DOMAIN + 

                         ", NumSolver=" + NUM_SOLVER + 

-                        ", scopeProp=" + SCOPE_PROPAGATOR +

+//                      ", scopeProp=" + SCOPE_PROPAGATOR +

                         ", SIZE=" + SIZE_LB + "to" + SIZE_UB + 

                         ", Runs=" + RUNS + 

                         ", ModelsPerRun=" + MODELS + 

@@ -203,8 +209,10 @@ class RunGeneratorConfig {
                 runtimeEntry.millisecLimit = RUNTIME

                 val numSolverEntry = configScope.entries.get(1) as CustomEntry

                 numSolverEntry.value = NUM_SOLVER

-                val scopePropEntry = configScope.entries.get(2) as CustomEntry

-                scopePropEntry.value = SCOPE_PROPAGATOR

+                val drealPathEntry = configScope.entries.get(2) as CustomEntry

+                drealPathEntry.value = DREAL_PATH

+//              val scopePropEntry = configScope.entries.get(3) as CustomEntry

+//              scopePropEntry.value = SCOPE_PROPAGATOR

 

                 // Output locations

                 val debug = genTask.debugFolder as FileSpecification