From 53cf6e18913a9f0c7717ff84eedd56941944367a Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Wed, 5 Jul 2017 15:00:37 +0200 Subject: Adding multiple model generation support for the alloy solver. --- .../bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend') diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend index d0c7d320..65539155 100644 --- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend +++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend @@ -16,6 +16,8 @@ import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace +import edu.mit.csail.sdg.alloy4compiler.translator.A4Solution +import java.util.List class AlloySolver extends LogicReasoner{ @@ -72,16 +74,16 @@ class AlloySolver extends LogicReasoner{ } override getInterpretations(ModelResult modelResult) { - val answers = (modelResult.representation as MonitoredAlloySolution).aswers.map[key] - val res = answers.map [ + //val answers = (modelResult.representation as MonitoredAlloySolution).aswers.map[key] + val sols = modelResult.representation// as List + //val res = answers.map + sols.map[ new AlloyModelInterpretation( new AlloyModelInterpretation_TypeInterpretation_FilteredTypes, - it, + it as A4Solution, forwardMapper, modelResult.trace as Logic2AlloyLanguageMapperTrace ) ] - - return res } } \ No newline at end of file -- cgit v1.2.3-54-g00ecf