1 files changed, 15 insertions, 11 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeIndexerWithPreliminaryTypeAnalysis.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeIndexerWithPreliminaryTypeAnalysis.xtend
index 7bdb9a5b..fde5f4b6 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeIndexerWithPreliminaryTypeAnalysis.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/TypeIndexerWithPreliminaryTypeAnalysis.xtend
@@ -4,10 +4,9 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeAnalysisResult

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeRefinementPrecondition

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

 import org.eclipse.emf.ecore.EClass

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeRefinementPrecondition

-import java.util.Collections

 

 class TypeIndexerWithPreliminaryTypeAnalysis extends TypeIndexer{

         val PatternGenerator base;

@@ -18,22 +17,26 @@ class TypeIndexerWithPreliminaryTypeAnalysis extends TypeIndexer{
         override requiresTypeAnalysis() { true }

         

         override getRequiredQueries() '''

-        private pattern typeInterpretation(problem:LogicProblem, interpetation:PartialInterpretation, type:TypeDeclaration, typeInterpretation:PartialComplexTypeInterpretation) {

-                find interpretation(problem,interpetation);

+        private pattern typeInterpretation(problem:LogicProblem, interpretation:PartialInterpretation, type:TypeDeclaration, typeInterpretation:PartialComplexTypeInterpretation) {

+                find interpretation(problem,interpretation);

                 LogicProblem.types(problem,type);

-                PartialInterpretation.partialtypeinterpratation(interpetation,typeInterpretation);

+                PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);

                 PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);

         }

         

-        private pattern directInstanceOf(problem:LogicProblem, interpetation:PartialInterpretation, element:DefinedElement, type:Type) {

-                find interpretation(problem,interpetation);

+        private pattern directInstanceOf(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement, type:Type) {

+                find interpretation(problem,interpretation);

                 LogicProblem.types(problem,type);

                 TypeDefinition.elements(type,element);

         } or {

-                find interpretation(problem,interpetation);

-                find typeInterpretation(problem,interpetation,type,typeInterpretation);

+                find interpretation(problem,interpretation);

+                find typeInterpretation(problem,interpretation,type,typeInterpretation);

                 PartialComplexTypeInterpretation.elements(typeInterpretation,element);

         }

+        

+        private pattern isPrimitive(element: PrimitiveElement) {

+                PrimitiveElement(element);

+        }

         '''

         

         override generateInstanceOfQueries(LogicProblem problem, PartialInterpretation emptySolution, TypeAnalysisResult typeAnalysisResult) {

@@ -73,15 +76,16 @@ class TypeIndexerWithPreliminaryTypeAnalysis extends TypeIndexer{
                  * An element may be an instance of type "«type.name»".

                  */

                 private pattern «patternName(type,Modality.MAY)»(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)

-                «IF inhibitorTypes != null»{

+                «IF inhibitorTypes !== null»{

                         find interpretation(problem,interpretation);

                         PartialInterpretation.newElements(interpretation,element);

                         «FOR inhibitorType : inhibitorTypes»

                                 neg «referInstanceOf(inhibitorType,Modality.MUST,"element")»

                         «ENDFOR»

+                        neg find isPrimitive(element);

                 } or {

                         find interpretation(problem,interpretation);

-                        PartialInterpretation.openWorldElements(interpetation,element);

+                        PartialInterpretation.openWorldElements(interpretation,element);

                 } or

                 «ENDIF»

                 { «referInstanceOf(type,Modality.MUST,"element")» }