From 1cc691755412d988975357316d7ef079e45458aa Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Tue, 15 Aug 2017 02:55:57 +0200 Subject: Type scope support for initial instance model mapping --- .../InstanceModel2PartialInterpretation.xtend | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend') diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend index 96e174a4..4c6cf769 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend @@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EObject import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* import org.eclipse.emf.ecore.resource.Resource import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput +import hu.bme.mit.inf.dslreasoner.logic.model.builder.TypeScopes class InstanceModel2PartialInterpretation { val extension LogiclanguageFactory factory = LogiclanguageFactory.eINSTANCE @@ -29,20 +30,22 @@ class InstanceModel2PartialInterpretation { public def transform( TracedOutput metamodelTranslationResult, Resource resource, - boolean withID) + boolean withID, + TypeScopes typeScopes) { val objects = resource.allContents.toList - return transform(metamodelTranslationResult,objects,withID) + return transform(metamodelTranslationResult,objects,withID,typeScopes) } public def transform( TracedOutput metamodelTranslationResult, List objects, - boolean withID) + boolean withID, + TypeScopes typeScopes) { val problem = metamodelTranslationResult.output val ecore2LogicTrace = metamodelTranslationResult.trace - val tracedOutput = partialInterpretationInitialiser.initialisePartialInterpretation(problem, null) + val tracedOutput = partialInterpretationInitialiser.initialisePartialInterpretation(problem, typeScopes) val partialInterpretation = tracedOutput.output val partialInterpretationTrace = tracedOutput.trace -- cgit v1.2.3-70-g09d2