From fbe0a911b6afd03eed54592904521d08880e8381 Mon Sep 17 00:00:00 2001 From: Oszkár Semeráth Date: Wed, 11 Nov 2020 21:59:08 +0100 Subject: Update SolverLoader.xtend AlloySolverConfiguration returned SMTSolverConfiguration --- .../hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Application') diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend index a549df00..b76941de 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend @@ -73,7 +73,7 @@ class SolverLoader { if (!objectiveEntries.empty) { throw new IllegalArgumentException("Objectives are not supported by Alloy.") } - val c = new SmtSolverConfiguration + val c = new AlloySolverConfiguration config.getAsBoolean("fixRandomSeed", console).ifPresent[c.fixRandomSeed = it] config.getAsType("path", console, [it], String).ifPresent[c.solverPath = it] c -- cgit v1.2.3-54-g00ecf From b54cee937bd8a36e1e0ff5ab409a6efed52803c4 Mon Sep 17 00:00:00 2001 From: Oszkar Semerath Date: Fri, 13 Nov 2020 15:44:50 +0100 Subject: copy-paste error fix attempt no2 --- .../bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Application') diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend index b76941de..fd50ad51 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend @@ -28,6 +28,7 @@ import java.util.Optional import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternModel import org.eclipse.xtext.EcoreUtil2 import org.eclipse.xtext.xbase.lib.Functions.Function1 +import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloyBackendSolver class SolverLoader { def loadSolver(Solver solver, Map config) { @@ -74,8 +75,8 @@ class SolverLoader { throw new IllegalArgumentException("Objectives are not supported by Alloy.") } val c = new AlloySolverConfiguration - config.getAsBoolean("fixRandomSeed", console).ifPresent[c.fixRandomSeed = it] - config.getAsType("path", console, [it], String).ifPresent[c.solverPath = it] + config.getAsInteger("symmetry", console).ifPresent[c.symmetry = it] + config.getAsType("solver",console,[x|AlloyBackendSolver::valueOf(x)],AlloyBackendSolver).ifPresent[c.solver = it] c } case SMT_SOLVER: { -- cgit v1.2.3-54-g00ecf