update measurements setup. make archives.

4 files changed, 95 insertions, 90 deletions

diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTree.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTree.vsconfig
index 2ce18b6f..64e0de68 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTree.vsconfig
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTree.vsconfig
@@ -28,7 +28,7 @@ generate {
         partial-model = { "inputs/FamilyTree.xmi" }

         solver = ViatraSolver

         scope = {

-                #node = 6..*

+                #node += 6..*

         }

         

         config = {

@@ -37,6 +37,7 @@ generate {
         }

         

         runs = 1

+        number = 10

         

         debug =                 "outputs/debug"

         log =                   "outputs/log.txt"

diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationNoRoot.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTEnd.vsconfig
index 31e828e7..723f401c 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationNoRoot.vsconfig
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTEnd.vsconfig
@@ -1,45 +1,47 @@
-import epackage "../case.study.pledge.model/model/Taxation.ecore"

-import viatra   "src/queries/case_study_A.vql"

-import epackage "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore"

-import viatra "src/queries/SatelliteQueries.vql"

-

-generate {

-        metamodel = { package satellite }

-        constraints = { package hu.bme.mit.inf.dslreasoner.domains.satellite.queries }

-        partial-model = { "inputs/SatelliteInstance.xmi"}

-        solver = ViatraSolver

-        scope = {

-                #node += 20..*

-        }

-

-        config = {

-                runtime = 10000,

-                log-level = normal

-        }

-

-        runs = 1

-

-        output = "measurements/debug/warmup"

-}

-

-generate {

-        metamodel = { package Taxation }

-        constraints = { package queries}

-        partial-model = { "inputs/Household.xmi" }

-        solver = ViatraSolver

-        scope = {

-                #node = 70..*

-        }

-        

-        config = {

-                runtime = 10000,

-                log-level = normal

-        }

-        

-        runs = 1

-        

-        debug =                 "output/debug/"

-        log =                   "output/debug/log.txt"

-        output =                "output/models"

-        statistics =    "output/debug/statistics.csv"

+import epackage "../case.study.familyTree.model/model/familytree.ecore"
+import viatra   "src/queries/familyTreeConstraints.vql"
+import epackage "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore"
+import viatra "src/queries/SatelliteQueries.vql"
+
+generate {
+        metamodel = { package satellite }
+        constraints = { package hu.bme.mit.inf.dslreasoner.domains.satellite.queries }
+        partial-model = { "inputs/SatelliteInstance.xmi"}
+        solver = ViatraSolver
+        scope = {
+                #node += 20..*
+        }
+
+        config = {
+                runtime = 10000,
+                log-level = normal,
+                "numeric-solver-at-end" = "true"
+        }
+
+        runs = 1
+
+        output = "measurements/debug/warmup"
+}
+
+generate {
+        metamodel = { package familytree }
+        constraints = { package queries}
+        partial-model = { "inputs/FamilyTree.xmi" }
+        solver = ViatraSolver
+        scope = {
+                #node += 6..*
+        }
+        
+        config = {
+                runtime = 10000,
+                log-level = normal
+        }
+        
+        runs = 1
+        number = 10
+        
+        debug =                 "outputs/debug"
+        log =                   "outputs/log.txt"
+        output =                "outputs/models"        
+        statistics =    "output/debug/statistics.csv"
 }
\ No newline at end of file
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericSatellite.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericSatellite.vsconfig
index ab25ea32..ed06d32f 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericSatellite.vsconfig
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericSatellite.vsconfig
@@ -35,6 +35,7 @@ generate {
         }

 

         runs = 1

+        number = 10

 

         debug = "outputs/debug"

         log = "outputs/log.txt"

diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationWithRoot.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxation.vsconfig
index b9ff7318..842a770a 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationWithRoot.vsconfig
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxation.vsconfig
@@ -1,46 +1,47 @@
-import epackage "../case.study.pledge.model/model/TaxationWithRoot.ecore"

-import viatra   "src/queries/case_study_A_withRoot.vql"

-import epackage "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore"

-import viatra "src/queries/SatelliteQueries.vql"

-

-generate {

-        metamodel = { package satellite }

-        constraints = { package hu.bme.mit.inf.dslreasoner.domains.satellite.queries }

-        partial-model = { "inputs/SatelliteInstance.xmi"}

-        solver = ViatraSolver

-        scope = {

-                #node += 20..*

-        }

-

-        config = {

-                runtime = 10000,

-                log-level = normal

-        }

-

-        runs = 1

-

-        output = "measurements/debug/warmup"

-}

-

-generate {

-        metamodel = { package TaxationWithRoot }

-        constraints = { package queries}

-        partial-model = { "inputs/Resource.xmi" }

-        solver = ViatraSolver

-        scope = {

-                #node = 70..*,

-                #<Household> += 0

-        }

-        

-        config = {

-                runtime = 10000,

-                log-level = normal

-        }

-        

-        runs = 1

-        

-        debug =                 "output/debug/"

-        log =                   "output/debug/log.txt"

-        output =                "output/models"

-        statistics =    "output/debug/statistics.csv"

+import epackage "../case.study.pledge.model/model/TaxationWithRoot.ecore"
+import viatra   "src/queries/case_study_A_withRoot.vql"
+import epackage "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore"
+import viatra "src/queries/SatelliteQueries.vql"
+
+generate {
+        metamodel = { package satellite }
+        constraints = { package hu.bme.mit.inf.dslreasoner.domains.satellite.queries }
+        partial-model = { "inputs/SatelliteInstance.xmi"}
+        solver = ViatraSolver
+        scope = {
+                #node += 20..*
+        }
+
+        config = {
+                runtime = 10000,
+                log-level = normal
+        }
+
+        runs = 1
+
+        output = "measurements/debug/warmup"
+}
+
+generate {
+        metamodel = { package TaxationWithRoot }
+        constraints = { package queries}
+        partial-model = { "inputs/Resource.xmi" }
+        solver = ViatraSolver
+        scope = {
+                #node += 70..*,
+                #<Household> += 0
+        }
+        
+        config = {
+                runtime = 10000,
+                log-level = normal
+        }
+        
+        runs = 1
+        number = 10
+        
+        debug =                 "output/debug/"
+        log =                   "output/debug/log.txt"
+        output =                "output/models"
+        statistics =    "output/debug/statistics.csv"
 }
\ No newline at end of file