Mapping of primitive types in patterns

2 files changed, 6 insertions, 9 deletions

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<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult,

-                List<EObject> objects,

-                TypeScopes typeScopes) 

+                List<EObject> 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<LogicProblem, Ecore2Logic_Trace> 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<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult,

                 List<EObject> 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