runners with new type scopes

author: OszkarSemerath <oszka@SEMERATH-LAPTOP> 2017-08-16 17:19:10 +0200
committer: OszkarSemerath <oszka@SEMERATH-LAPTOP> 2017-08-16 17:19:10 +0200
commit: 24f1e1363bfc3d9225f8e2a68fad300bff634ced (patch)
tree: 1a79b551b8b4034ced0787d6673c6af58c480362 /Tests
parent: SMT support for primitive types (diff)
download: VIATRA-Generator-24f1e1363bfc3d9225f8e2a68fad300bff634ced.tar.gz
VIATRA-Generator-24f1e1363bfc3d9225f8e2a68fad300bff634ced.tar.zst
VIATRA-Generator-24f1e1363bfc3d9225f8e2a68fad300bff634ced.zip
3 files changed, 4 insertions, 4 deletions
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend
index c3f77ad7..40edbd02 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend
@@ -225,7 +225,7 @@ class ScenarioRunner {
                                it.typeScopes.maxNewElements = scenario.size
                                it.typeScopes.minNewElements = scenario.size
                                it.solutionScope.numberOfRequiredSolution = scenario.number
-                                it.typeScopes.maxIntScope = 0
+                                it.typeScopes.maxNewIntegers = 0
                                it.writeToFile=true
                        ]
                }
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend
index 8de44b5b..e96a6bf6 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend
@@ -136,7 +136,7 @@ class RunMeasurements {
                                it.typeScopes.maxNewElements = size
                                it.typeScopes.minNewElements = size
                                it.solutionScope.numberOfRequiredSolution = number
-                                it.typeScopes.maxIntScope = 0
+                                it.typeScopes.maxNewIntegers = 0
                                it.writeToFile = true
                        ]
                        val solution = this.alloyReasoner.solve(
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
index 0a304915..78382c2a 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
@@ -64,7 +64,7 @@ class SimpleRun {
                println("Problem created")
                var LogicResult solution
                var LogicReasoner reasoner
-                //*
+                /*
                reasoner = new ViatraReasoner
                val viatraConfig = new ViatraReasonerConfiguration => [
                        it.typeScopes.maxNewElements = 40
@@ -82,7 +82,7 @@ class SimpleRun {
                                it.typeScopes.maxNewElements = 5
                                it.typeScopes.minNewElements = 5
                                it.solutionScope.numberOfRequiredSolution = 1
-                                it.typeScopes.maxIntScope = 0
+                                it.typeScopes.maxNewIntegers = 0
                                it.writeToFile = true
                        ]
                solution = reasoner.solve(logicProblem,alloyConfig,workspace)
author	OszkarSemerath <oszka@SEMERATH-LAPTOP>	2017-08-16 17:19:10 +0200
committer	OszkarSemerath <oszka@SEMERATH-LAPTOP>	2017-08-16 17:19:10 +0200
commit	24f1e1363bfc3d9225f8e2a68fad300bff634ced (patch)
tree	1a79b551b8b4034ced0787d6673c6af58c480362 /Tests
parent	SMT support for primitive types (diff)
download	VIATRA-Generator-24f1e1363bfc3d9225f8e2a68fad300bff634ced.tar.gz VIATRA-Generator-24f1e1363bfc3d9225f8e2a68fad300bff634ced.tar.zst VIATRA-Generator-24f1e1363bfc3d9225f8e2a68fad300bff634ced.zip

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend index c3f77ad7..40edbd02 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend
@@ -225,7 +225,7 @@ class ScenarioRunner {
225	it.typeScopes.maxNewElements = scenario.size	225	it.typeScopes.maxNewElements = scenario.size
226	it.typeScopes.minNewElements = scenario.size	226	it.typeScopes.minNewElements = scenario.size
227	it.solutionScope.numberOfRequiredSolution = scenario.number	227	it.solutionScope.numberOfRequiredSolution = scenario.number
228	it.typeScopes.maxIntScope = 0	228	it.typeScopes.maxNewIntegers = 0
229	it.writeToFile=true	229	it.writeToFile=true
230	]	230	]
231	}	231	}


diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend index 8de44b5b..e96a6bf6 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend
@@ -136,7 +136,7 @@ class RunMeasurements {
136	it.typeScopes.maxNewElements = size	136	it.typeScopes.maxNewElements = size
137	it.typeScopes.minNewElements = size	137	it.typeScopes.minNewElements = size
138	it.solutionScope.numberOfRequiredSolution = number	138	it.solutionScope.numberOfRequiredSolution = number
139	it.typeScopes.maxIntScope = 0	139	it.typeScopes.maxNewIntegers = 0
140	it.writeToFile = true	140	it.writeToFile = true
141	]	141	]
142	val solution = this.alloyReasoner.solve(	142	val solution = this.alloyReasoner.solve(


diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend index 0a304915..78382c2a 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
@@ -64,7 +64,7 @@ class SimpleRun {
64	println("Problem created")	64	println("Problem created")
65	var LogicResult solution	65	var LogicResult solution
66	var LogicReasoner reasoner	66	var LogicReasoner reasoner
67	//*	67	/*
68	reasoner = new ViatraReasoner	68	reasoner = new ViatraReasoner
69	val viatraConfig = new ViatraReasonerConfiguration => [	69	val viatraConfig = new ViatraReasonerConfiguration => [
70	it.typeScopes.maxNewElements = 40	70	it.typeScopes.maxNewElements = 40
@@ -82,7 +82,7 @@ class SimpleRun {
82	it.typeScopes.maxNewElements = 5	82	it.typeScopes.maxNewElements = 5
83	it.typeScopes.minNewElements = 5	83	it.typeScopes.minNewElements = 5
84	it.solutionScope.numberOfRequiredSolution = 1	84	it.solutionScope.numberOfRequiredSolution = 1
85	it.typeScopes.maxIntScope = 0	85	it.typeScopes.maxNewIntegers = 0
86	it.writeToFile = true	86	it.writeToFile = true
87	]	87	]
88	solution = reasoner.solve(logicProblem,alloyConfig,workspace)	88	solution = reasoner.solve(logicProblem,alloyConfig,workspace)