aboutsummaryrefslogtreecommitdiffstats
path: root/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend
diff options
context:
space:
mode:
Diffstat (limited to 'Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend')
-rw-r--r--Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend8
1 files changed, 5 insertions, 3 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 12fe775a..702b1740 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
@@ -135,7 +135,7 @@ class ScenarioRunner {
135 135
136 var FileSystemWorkspace workspace = new FileSystemWorkspace('''output_«id»/''',"") 136 var FileSystemWorkspace workspace = new FileSystemWorkspace('''output_«id»/''',"")
137 workspace.initAndClear 137 workspace.initAndClear
138 val config = getSolverConfiguration(scenario,vq) 138 val config = getSolverConfiguration(scenario,vq,run)
139 139
140 // Execute 140 // Execute
141 val solution = getSolver(scenario).solve(problem,config,workspace) 141 val solution = getSolver(scenario).solve(problem,config,workspace)
@@ -181,7 +181,7 @@ class ScenarioRunner {
181 } 181 }
182 } 182 }
183 183
184 def private getSolverConfiguration(Scenario scenario, ViatraQuerySetDescriptor vq) { 184 def private getSolverConfiguration(Scenario scenario, ViatraQuerySetDescriptor vq, int run) {
185 if(scenario.solver == Solver.ViatraSolver) { 185 if(scenario.solver == Solver.ViatraSolver) {
186 val viatraConfig = new ViatraReasonerConfiguration => [ 186 val viatraConfig = new ViatraReasonerConfiguration => [
187 it.runtimeLimit = 300 187 it.runtimeLimit = 300
@@ -226,6 +226,7 @@ class ScenarioRunner {
226 it.solutionScope.numberOfRequiredSolution = scenario.number 226 it.solutionScope.numberOfRequiredSolution = scenario.number
227 it.typeScopes.maxNewIntegers = 0 227 it.typeScopes.maxNewIntegers = 0
228 it.writeToFile=true 228 it.writeToFile=true
229 it.randomise = run-1
229 ] 230 ]
230 } 231 }
231 232
@@ -317,7 +318,8 @@ class ScenarioRunner {
317 318
318class DiverseMeasurementRunner { 319class DiverseMeasurementRunner {
319 def static void main(String[] args) { 320 def static void main(String[] args) {
320 val scenario = new Scenario(30,29,Metamodel::YakinduWOSynch,Constraints.Metamodel,StateCoder.R1,20,Solver::Alloy) 321 val scenario = new Scenario(30,29,Metamodel::YakinduWOSynch,Constraints.Metamodel,StateCoder.R3,20,Solver::Alloy
322 )
321 val scenarioRunner = new ScenarioRunner 323 val scenarioRunner = new ScenarioRunner
322 scenarioRunner.runScenario(scenario) 324 scenarioRunner.runScenario(scenario)
323 } 325 }