From 1cc691755412d988975357316d7ef079e45458aa Mon Sep 17 00:00:00 2001
From: OszkarSemerath <oszka@SEMERATH-LAPTOP>
Date: Tue, 15 Aug 2017 02:55:57 +0200
Subject: Type scope support for initial instance model mapping

---
 .../partialinterpretation2logic/InstanceModel2Logic.xtend     |  6 ++++--
 .../InstanceModel2PartialInterpretation.xtend                 | 11 +++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'Solvers')

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 2910a702..216ae348 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
@@ -5,6 +5,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput
 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem
 import java.util.List
 import org.eclipse.emf.ecore.EObject
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.TypeScopes
 
 class InstanceModel2Logic {
 	val InstanceModel2PartialInterpretation instanceModel2PartialInterpretation = new InstanceModel2PartialInterpretation
@@ -12,9 +13,10 @@ class InstanceModel2Logic {
 	
 	public def transform(
 		TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult,
-		List<EObject> objects) 
+		List<EObject> objects,
+		TypeScopes typeScopes) 
 	{
-		val res1 = this.instanceModel2PartialInterpretation.transform(metamodelTranslationResult,objects,true)
+		val res1 = this.instanceModel2PartialInterpretation.transform(metamodelTranslationResult,objects,true,typeScopes)
 		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 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<LogicProblem, Ecore2Logic_Trace> 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<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult,
 		List<EObject> 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-54-g00ecf