From d1b2d628bf515f0a1772eaff7366f9c29c1b02ce Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Wed, 16 Aug 2017 17:13:22 +0200 Subject: Mapping of primitive types in patterns --- .../partialinterpretation2logic/InstanceModel2Logic.xtend | 5 ++--- .../InstanceModel2PartialInterpretation.xtend | 10 ++++------ 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver') diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2Logic.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2Logic.xtend index 216ae348..d2b59754 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2Logic.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2Logic.xtend @@ -13,10 +13,9 @@ class InstanceModel2Logic { public def transform( TracedOutput metamodelTranslationResult, - List objects, - TypeScopes typeScopes) + List objects) { - val res1 = this.instanceModel2PartialInterpretation.transform(metamodelTranslationResult,objects,true,typeScopes) + val res1 = instanceModel2PartialInterpretation.transform(metamodelTranslationResult,objects,true) this.partialInterpretation2Logic.transformPartialIntepretation2Logic(metamodelTranslationResult.output,res1) return metamodelTranslationResult//.output } 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 4c6cf769..080ad963 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 @@ -30,22 +30,20 @@ class InstanceModel2PartialInterpretation { public def transform( TracedOutput metamodelTranslationResult, Resource resource, - boolean withID, - TypeScopes typeScopes) + boolean withID) { val objects = resource.allContents.toList - return transform(metamodelTranslationResult,objects,withID,typeScopes) + return transform(metamodelTranslationResult,objects,withID) } public def transform( TracedOutput metamodelTranslationResult, List objects, - boolean withID, - TypeScopes typeScopes) + boolean withID) { val problem = metamodelTranslationResult.output val ecore2LogicTrace = metamodelTranslationResult.trace - val tracedOutput = partialInterpretationInitialiser.initialisePartialInterpretation(problem, typeScopes) + val tracedOutput = partialInterpretationInitialiser.initialisePartialInterpretation(problem, new TypeScopes) val partialInterpretation = tracedOutput.output val partialInterpretationTrace = tracedOutput.trace -- cgit v1.2.3-54-g00ecf