1 files changed, 49 insertions, 13 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 c1925786..01f74f29 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
@@ -1,7 +1,9 @@
 package run

 

+import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ClassTypeScope

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigSpecification

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript

+import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ExactNumber

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.FileSpecification

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.GenerationTask

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.IntervallNumber

@@ -10,8 +12,10 @@ import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.RuntimeEn
 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ScopeSpecification

 import hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor

 import hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor

+import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace

 import java.text.SimpleDateFormat

 import java.util.Date

+import org.apache.commons.cli.BasicParser

 import org.apache.commons.cli.CommandLine

 import org.apache.commons.cli.CommandLineParser

 import org.apache.commons.cli.HelpFormatter

@@ -19,26 +23,27 @@ import org.apache.commons.cli.Option
 import org.apache.commons.cli.Options

 import org.apache.commons.cli.ParseException

 import org.eclipse.core.runtime.NullProgressMonitor

-import org.apache.commons.cli.BasicParser

+import org.eclipse.emf.ecore.resource.Resource

+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl

 

 class RunGeneratorConfig {

         static var SIZE_LB = 20

         static var SIZE_UB = -1

+        static var HOUSEHOLD = -1

 

         static var RUNS = 10

-        static var RUNTIME = 600

+        static var RUNTIME = 900

 

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

         static val QUERIES = true

         static val INITIAL = true

 

         def static void main(String[] args) {

-

                 val options = new Options()

 

                 val lb = new Option("lb", "lowerBound", true, "generated model Lower bound")

                 options.addOption(lb)

-                

+

                 val ub = new Option("ub", "upperBound", true, "generated model Upper bound")

                 options.addOption(ub)

 

@@ -50,7 +55,10 @@ class RunGeneratorConfig {
 

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

                 options.addOption(d)

-                

+

+                val hh = new Option("hh", "household", true, "number of households")

+                options.addOption(hh)

+

                 val CommandLineParser parser = new BasicParser

                 val formatter = new HelpFormatter()

                 var CommandLine cmd

@@ -62,7 +70,7 @@ class RunGeneratorConfig {
                         formatter.printHelp("utility-name", options)

                         System.exit(1)

                 }

-                

+

                 val lbIn = cmd.getOptionValue("lowerBound")

                 if(lbIn !== null) SIZE_LB = Integer.parseInt(lbIn)

                 val ubIn = cmd.getOptionValue("upperBound")

@@ -73,7 +81,9 @@ class RunGeneratorConfig {
                 if(rtIn !== null) RUNTIME = Integer.parseInt(rtIn)

                 val dIn = cmd.getOptionValue("domain")

                 if(dIn !== null) DOMAIN = dIn

-                

+                val hhIn = cmd.getOptionValue("household")

+                if(hhIn !== null) HOUSEHOLD = Integer.parseInt(hhIn)

+

                 // Workspace setup

                 val Date date = new Date(System.currentTimeMillis)

                 val SimpleDateFormat format = new SimpleDateFormat("dd-HHmm")

@@ -85,12 +95,21 @@ class RunGeneratorConfig {
 

                 // /////////////////////////

                 // BEGIN RUN

-                println("<<DOMAIN: " + DOMAIN + ", SIZE=" + SIZE_LB + "to" + SIZE_UB + ", Runs=" + RUNS + ", Runtime=" + RUNTIME+">>\n")

-

-                val outputPath = "measurements/" + "models/"+ DOMAIN + "/size" + SIZE_LB + "to" + SIZE_UB + "_" + formattedDate

-                val debugPath = "measurements/" + "debug/" + DOMAIN + "/size" + SIZE_LB + "to" + SIZE_UB + "_" + formattedDate

+                println(

+                        "<<DOMAIN: " + DOMAIN + ", SIZE=" + SIZE_LB + "to" + SIZE_UB + ", Runs=" + RUNS + ", Runtime=" + RUNTIME +

+                                ">>")

+                if (DOMAIN == "TaxationWithRoot") {

+                        println("<<Households: " + HOUSEHOLD + ">>")

+                }

+                println()

+                

+                val naming = DOMAIN + "/size" + toStr(SIZE_LB) + "to" + toStr(SIZE_UB) + "x" + RUNS

+                

+                val outputPath = "measurements/" + "models/" + naming + "_" + formattedDate

+                val debugPath = "measurements/" + "debug/" + naming + "_" + formattedDate

                 val logPath = debugPath + "/log.txt"

-                val statsPath = "measurements/" + "stats/" + DOMAIN + "/size" + SIZE_LB  + "to" + SIZE_UB + "x" + RUNS + "stats_" + formattedDate + ".csv"

+                val statsPath = "measurements/" + "stats/" + naming +

+                        "stats_" + formattedDate + ".csv"

 

                 // Basic Adjustments

                 val genTask = config.commands.get(1) as GenerationTask

@@ -103,12 +122,23 @@ class RunGeneratorConfig {
                 val objScope = scopeSpec.scopes.get(0) as ObjectTypeScope

                 val interval = objScope.number as IntervallNumber

                 interval.min = SIZE_LB

-                if(SIZE_UB == -1) interval.maxUnlimited = true

+                if (SIZE_UB == -1)

+                        interval.maxUnlimited = true

                 else {

                         interval.maxUnlimited = false

                         interval.maxNumber = SIZE_UB

                 }

 

+                if (DOMAIN == "TaxationWithRoot") {

+                        if (HOUSEHOLD == -1) {

+                                scopeSpec.scopes.remove(1)

+                        } else {

+                                val clsScope = scopeSpec.scopes.get(1) as ClassTypeScope

+                                val num = clsScope.number as ExactNumber

+                                num.exactNumber = HOUSEHOLD

+                        }

+                }

+

                 // Runtime

                 val configScope = genTask.config as ConfigSpecification

                 val runtimeEntry = configScope.entries.get(0) as RuntimeEntry

@@ -129,5 +159,11 @@ class RunGeneratorConfig {
 

                 println()

         }

+        

+        static def String toStr(int i) {

+                var toAdd = ""

+                if(i<100 && i != -1) toAdd = "0"

+                return toAdd+i

+        }

 

 }