Add most of the measurements

5 files changed, 63 insertions, 10 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 64e0de68..8c11636c 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTree.vsconfig
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTree.vsconfig
@@ -9,7 +9,7 @@ generate {
         partial-model = { "inputs/SatelliteInstance.xmi"}

         solver = ViatraSolver

         scope = {

-                #node += 20..*

+                #node += 10..*

         }

 

         config = {

@@ -33,12 +33,14 @@ generate {
         

         config = {

                 runtime = 10000,

-                log-level = normal

+                log-level = normal,

+                "fitness-punishSize" = "false",

+                "fitness-scope" = "3"

         }

         

         runs = 1

-        number = 10

-        

+        number = 10     

+

         debug =                 "outputs/debug"

         log =                   "outputs/log.txt"

         output =                "outputs/models"        

diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTEnd.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTEnd.vsconfig
index 723f401c..4a02395d 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTEnd.vsconfig
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTEnd.vsconfig
@@ -9,13 +9,12 @@ generate {
         partial-model = { "inputs/SatelliteInstance.xmi"}
         solver = ViatraSolver
         scope = {
-                #node += 20..*
+                #node += 10..*
         }
 
         config = {
                 runtime = 10000,
-                log-level = normal,
-                "numeric-solver-at-end" = "true"
+                log-level = normal
         }
 
         runs = 1
@@ -34,7 +33,10 @@ generate {
         
         config = {
                 runtime = 10000,
-                log-level = normal
+                log-level = normal,
+                "fitness-punishSize" = "false",
+                "fitness-scope" = "3",
+                "numeric-solver-at-end" = "true"
         }
         
         runs = 1
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig
new file mode 100644
index 00000000..47706ab6
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig
@@ -0,0 +1,49 @@
+import epackage "../case.study.familyTree.model/model/familytree.ecore"
+import viatra   "src/queries/familyTreeConstraintsQual.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 += 10..*
+        }
+
+        config = {
+                runtime = 10000,
+                log-level = normal
+        }
+
+        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,
+                "fitness-punishSize" = "false",
+                "fitness-scope" = "3",
+                "numeric-solver-at-end" = "true"
+        }
+        
+        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 ed06d32f..b9a606f0 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericSatellite.vsconfig
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericSatellite.vsconfig
@@ -7,7 +7,7 @@ generate {
         partial-model = { "inputs/SatelliteInstance.xmi"}

         solver = ViatraSolver

         scope = {

-                #node += 20..*

+                #node += 10..*

         }

 

         config = {

diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxation.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxation.vsconfig
index 842a770a..23eec7fe 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxation.vsconfig
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxation.vsconfig
@@ -9,7 +9,7 @@ generate {
         partial-model = { "inputs/SatelliteInstance.xmi"}
         solver = ViatraSolver
         scope = {
-                #node += 20..*
+                #node += 10..*
         }
 
         config = {