Adjust measurement setup. TaxationWithRoot support. JAR creation

author: ArenBabikian <aren.babikian@mail.mcgill.ca> 2020-05-13 00:34:43 -0400
committer: ArenBabikian <aren.babikian@mail.mcgill.ca> 2020-05-13 00:34:43 -0400
commit: 4d914f3a77f64dc326933921b03735d4aabd9214 (patch)
tree: 2d2a7374c5becd54029e872cc38960cf3ce3610b /Tests/MODELS2020-CaseStudies/case.study.pledge.run/config
parent: Adjust FamilyTree MM. Add new Taxation MM with possible Multiple Roots (diff)
download: VIATRA-Generator-4d914f3a77f64dc326933921b03735d4aabd9214.tar.gz
VIATRA-Generator-4d914f3a77f64dc326933921b03735d4aabd9214.tar.zst
VIATRA-Generator-4d914f3a77f64dc326933921b03735d4aabd9214.zip
5 files changed, 132 insertions, 29 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 60e6b895..2ce18b6f 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTree.vsconfig
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTree.vsconfig
@@ -1,5 +1,26 @@
 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
+        }
+        runs = 1
+        output = "measurements/debug/warmup"
+}
 generate {
        metamodel = { package familytree }
@@ -7,8 +28,7 @@ generate {
        partial-model = { "inputs/FamilyTree.xmi" }
        solver = ViatraSolver
        scope = {
-                #node = 6..15,
+                #node = 6..*
-                #int = {}
        }
        
        config = {
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 b683073a..ab25ea32 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericSatellite.vsconfig
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericSatellite.vsconfig
@@ -1,5 +1,4 @@
 import epackage "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore"
-//import viatra "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql"
 import viatra "src/queries/SatelliteQueries.vql"
 generate {
@@ -8,7 +7,26 @@ generate {
        partial-model = { "inputs/SatelliteInstance.xmi"}
        solver = ViatraSolver
        scope = {
-                #node += 64..128
+                #node += 20..*
+        }
+        config = {
+                runtime = 10000,
+                log-level = normal
+        }
+        runs = 1
+        output = "measurements/debug/warmup"
+}
+generate {
+        metamodel = { package satellite }
+        constraints = { package hu.bme.mit.inf.dslreasoner.domains.satellite.queries }
+        partial-model = { "inputs/SatelliteInstance.xmi"}
+        solver = ViatraSolver
+        scope = {
+                #node += 64..*
        }
        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
deleted file mode 100644
index 67e0a804..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxation.vsconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-import epackage "../case.study.pledge.model/model/Taxation.ecore"
-import viatra   "src/queries/case_study_A.vql"
-generate {
-        metamodel = { package Taxation }
-        constraints = { package queries}
-        partial-model = { "inputs/Household.xmi" }
-        solver = ViatraSolver
-        scope = {
-                #node = 70..80,
-                #int = {}
-        }
-        
-        config = {
-                runtime = 10000,
-                log-level = normal
-        }
-        
-        runs = 1
-        
-        debug =                 "output/debug/"
-        log =                   "output/debug/log.txt"
-        output =                "output/models"
-        statistics =    "output/debug/statistics.csv"
-}
-\ No newline at end of file
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationNoRoot.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationNoRoot.vsconfig
new file mode 100644
index 00000000..31e828e7
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationNoRoot.vsconfig
@@ -0,0 +1,45 @@
+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"
+}
+\ No newline at end of file
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationWithRoot.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationWithRoot.vsconfig
new file mode 100644
index 00000000..107c3294
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationWithRoot.vsconfig
@@ -0,0 +1,45 @@
+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..*
+        }
+        
+        config = {
+                runtime = 10000,
+                log-level = normal
+        }
+        
+        runs = 1
+        
+        debug =                 "output/debug/"
+        log =                   "output/debug/log.txt"
+        output =                "output/models"
+        statistics =    "output/debug/statistics.csv"
+}
+\ No newline at end of file
author	ArenBabikian <aren.babikian@mail.mcgill.ca>	2020-05-13 00:34:43 -0400
committer	ArenBabikian <aren.babikian@mail.mcgill.ca>	2020-05-13 00:34:43 -0400
commit	4d914f3a77f64dc326933921b03735d4aabd9214 (patch)
tree	2d2a7374c5becd54029e872cc38960cf3ce3610b /Tests/MODELS2020-CaseStudies/case.study.pledge.run/config
parent	Adjust FamilyTree MM. Add new Taxation MM with possible Multiple Roots (diff)
download	VIATRA-Generator-4d914f3a77f64dc326933921b03735d4aabd9214.tar.gz VIATRA-Generator-4d914f3a77f64dc326933921b03735d4aabd9214.tar.zst VIATRA-Generator-4d914f3a77f64dc326933921b03735d4aabd9214.zip

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 60e6b895..2ce18b6f 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTree.vsconfig +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTree.vsconfig
@@ -1,5 +1,26 @@
1	import epackage "../case.study.familyTree.model/model/familytree.ecore"	1	import epackage "../case.study.familyTree.model/model/familytree.ecore"
2	import viatra "src/queries/familyTreeConstraints.vql"	2	import viatra "src/queries/familyTreeConstraints.vql"
		3	import epackage "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore"
		4	import viatra "src/queries/SatelliteQueries.vql"
		5
		6	generate {
		7	metamodel = { package satellite }
		8	constraints = { package hu.bme.mit.inf.dslreasoner.domains.satellite.queries }
		9	partial-model = { "inputs/SatelliteInstance.xmi"}
		10	solver = ViatraSolver
		11	scope = {
		12	#node += 20..*
		13	}
		14
		15	config = {
		16	runtime = 10000,
		17	log-level = normal
		18	}
		19
		20	runs = 1
		21
		22	output = "measurements/debug/warmup"
		23	}
3		24
4	generate {	25	generate {
5	metamodel = { package familytree }	26	metamodel = { package familytree }
@@ -7,8 +28,7 @@ generate {
7	partial-model = { "inputs/FamilyTree.xmi" }	28	partial-model = { "inputs/FamilyTree.xmi" }
8	solver = ViatraSolver	29	solver = ViatraSolver
9	scope = {	30	scope = {
10	#node = 6..15,	31	#node = 6..*
11	#int = {}
12	}	32	}
13		33
14	config = {	34	config = {


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 b683073a..ab25ea32 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericSatellite.vsconfig +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericSatellite.vsconfig
@@ -1,5 +1,4 @@
1	import epackage "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore"	1	import epackage "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore"
2	//import viatra "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql"
3	import viatra "src/queries/SatelliteQueries.vql"	2	import viatra "src/queries/SatelliteQueries.vql"
4		3
5	generate {	4	generate {
@@ -8,7 +7,26 @@ generate {
8	partial-model = { "inputs/SatelliteInstance.xmi"}	7	partial-model = { "inputs/SatelliteInstance.xmi"}
9	solver = ViatraSolver	8	solver = ViatraSolver
10	scope = {	9	scope = {
11	#node += 64..128	10	#node += 20..*
		11	}
		12
		13	config = {
		14	runtime = 10000,
		15	log-level = normal
		16	}
		17
		18	runs = 1
		19
		20	output = "measurements/debug/warmup"
		21	}
		22
		23	generate {
		24	metamodel = { package satellite }
		25	constraints = { package hu.bme.mit.inf.dslreasoner.domains.satellite.queries }
		26	partial-model = { "inputs/SatelliteInstance.xmi"}
		27	solver = ViatraSolver
		28	scope = {
		29	#node += 64..*
12	}	30	}
13		31
14	config = {	32	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 deleted file mode 100644 index 67e0a804..00000000 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxation.vsconfig +++ /dev/null
@@ -1,25 +0,0 @@
1	import epackage "../case.study.pledge.model/model/Taxation.ecore"
2	import viatra "src/queries/case_study_A.vql"
3
4	generate {
5	metamodel = { package Taxation }
6	constraints = { package queries}
7	partial-model = { "inputs/Household.xmi" }
8	solver = ViatraSolver
9	scope = {
10	#node = 70..80,
11	#int = {}
12	}
13
14	config = {
15	runtime = 10000,
16	log-level = normal
17	}
18
19	runs = 1
20
21	debug = "output/debug/"
22	log = "output/debug/log.txt"
23	output = "output/models"
24	statistics = "output/debug/statistics.csv"
25	} \ No newline at end of file


diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationNoRoot.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationNoRoot.vsconfig new file mode 100644 index 00000000..31e828e7 --- /dev/null +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationNoRoot.vsconfig
@@ -0,0 +1,45 @@
		1	import epackage "../case.study.pledge.model/model/Taxation.ecore"
		2	import viatra "src/queries/case_study_A.vql"
		3	import epackage "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore"
		4	import viatra "src/queries/SatelliteQueries.vql"
		5
		6	generate {
		7	metamodel = { package satellite }
		8	constraints = { package hu.bme.mit.inf.dslreasoner.domains.satellite.queries }
		9	partial-model = { "inputs/SatelliteInstance.xmi"}
		10	solver = ViatraSolver
		11	scope = {
		12	#node += 20..*
		13	}
		14
		15	config = {
		16	runtime = 10000,
		17	log-level = normal
		18	}
		19
		20	runs = 1
		21
		22	output = "measurements/debug/warmup"
		23	}
		24
		25	generate {
		26	metamodel = { package Taxation }
		27	constraints = { package queries}
		28	partial-model = { "inputs/Household.xmi" }
		29	solver = ViatraSolver
		30	scope = {
		31	#node = 70..*
		32	}
		33
		34	config = {
		35	runtime = 10000,
		36	log-level = normal
		37	}
		38
		39	runs = 1
		40
		41	debug = "output/debug/"
		42	log = "output/debug/log.txt"
		43	output = "output/models"
		44	statistics = "output/debug/statistics.csv"
		45	} \ No newline at end of file


diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationWithRoot.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationWithRoot.vsconfig new file mode 100644 index 00000000..107c3294 --- /dev/null +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericTaxationWithRoot.vsconfig
@@ -0,0 +1,45 @@
		1	import epackage "../case.study.pledge.model/model/TaxationWithRoot.ecore"
		2	import viatra "src/queries/case_study_A_withRoot.vql"
		3	import epackage "../../../Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore"
		4	import viatra "src/queries/SatelliteQueries.vql"
		5
		6	generate {
		7	metamodel = { package satellite }
		8	constraints = { package hu.bme.mit.inf.dslreasoner.domains.satellite.queries }
		9	partial-model = { "inputs/SatelliteInstance.xmi"}
		10	solver = ViatraSolver
		11	scope = {
		12	#node += 20..*
		13	}
		14
		15	config = {
		16	runtime = 10000,
		17	log-level = normal
		18	}
		19
		20	runs = 1
		21
		22	output = "measurements/debug/warmup"
		23	}
		24
		25	generate {
		26	metamodel = { package TaxationWithRoot }
		27	constraints = { package queries}
		28	partial-model = { "inputs/Resource.xmi" }
		29	solver = ViatraSolver
		30	scope = {
		31	#node = 70..*
		32	}
		33
		34	config = {
		35	runtime = 10000,
		36	log-level = normal
		37	}
		38
		39	runs = 1
		40
		41	debug = "output/debug/"
		42	log = "output/debug/log.txt"
		43	output = "output/models"
		44	statistics = "output/debug/statistics.csv"
		45	} \ No newline at end of file