From 41938f5b15d0dc4196f4842d85e5cbf6b4b161f1 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Fri, 13 Oct 2017 13:36:23 +0200 Subject: By default, Alloy uses filtered type ORM mapping --- .../src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme') 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 b9723d18..f5a9510d 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 @@ -7,7 +7,7 @@ import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder.AlloyModelInterpretatio import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder.AlloyModelInterpretation_TypeInterpretation_FilteredTypes import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder.Logic2AlloyLanguageMapper import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder.Logic2AlloyLanguageMapperTrace -import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder.Logic2AlloyLanguageMapper_TypeMapper_InheritanceAndHorizontal +import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder.Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes import hu.bme.mit.inf.dslreasoner.AlloyLanguageStandaloneSetupGenerated import hu.bme.mit.inf.dslreasoner.alloyLanguage.AlloyLanguagePackage import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner @@ -25,7 +25,7 @@ class AlloySolver extends LogicReasoner{ x.createInjectorAndDoEMFRegistration } - val Logic2AlloyLanguageMapper forwardMapper = new Logic2AlloyLanguageMapper(new Logic2AlloyLanguageMapper_TypeMapper_InheritanceAndHorizontal) + val Logic2AlloyLanguageMapper forwardMapper = new Logic2AlloyLanguageMapper(new Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes) val AlloyHandler handler = new AlloyHandler val Alloy2LogicMapper backwardMapper = new Alloy2LogicMapper @@ -77,7 +77,7 @@ class AlloySolver extends LogicReasoner{ //val res = answers.map sols.map[ new AlloyModelInterpretation( - new AlloyModelInterpretation_TypeInterpretation_FilteredTypes, + forwardMapper.typeMapper.typeInterpreter, it as A4Solution, forwardMapper, modelResult.trace as Logic2AlloyLanguageMapperTrace -- cgit v1.2.3-54-g00ecf