4 files changed, 33 insertions, 33 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend
index 6e1e5765..1ef82195 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend
@@ -1,31 +1,31 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns

 

+import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.InverseRelationAssertion

+import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.LowerMultiplicityAssertion

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolTypeReference

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntTypeReference

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealTypeReference

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringTypeReference

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference

+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem

+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.DefinedByDerivedFeature

+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery

+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransformedViatraWellformednessConstraint

+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.TypeInferenceMethod

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

+import java.util.HashMap

 import java.util.Map

+import org.eclipse.emf.ecore.EAttribute

 import org.eclipse.emf.ecore.EReference

 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery

 import org.eclipse.xtend.lib.annotations.Accessors

-import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery

+

 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*

-import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem

-import org.eclipse.emf.ecore.EAttribute

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

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

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

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

-import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.LowerMultiplicityAssertion

-import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransformedViatraWellformednessConstraint

-import java.util.HashMap

-import java.util.HashSet

-import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.InverseRelationAssertion

-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation

-import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.DefinedByDerivedFeature

-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference

-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolTypeReference

-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntTypeReference

-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealTypeReference

-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringTypeReference

 

 class PatternGenerator {

         @Accessors(PUBLIC_GETTER) val TypeIndexer typeIndexer //= new TypeIndexer(this)

@@ -183,7 +183,7 @@ class PatternGenerator {
                         } or {

                                 find interpretation(problem,interpetation);

                                 PartialInterpretation.realelements(interpetation,element);

-                        }

+                        } or {

                                 find interpretation(problem,interpetation);

                                 PartialInterpretation.stringelements(interpetation,element);

                         }

@@ -197,15 +197,15 @@ class PatternGenerator {
                         } or {

                                 find interpretation(problem,interpetation);

                                 neg find integerCloseWorld(interpetation);

-                                PartialInterpretation.newIntegers(interpetation,element)

+                                PartialInterpretation.newIntegers(interpetation,element);

                         } or {

                                 find interpretation(problem,interpetation);

                                 neg find realCloseWorld(interpetation);

-                                PartialInterpretation.newReals(interpetation,element)

+                                PartialInterpretation.newReals(interpetation,element);

                         } or {

                                 find interpretation(problem,interpetation);

                                 neg find stringCloseWorld(interpetation);

-                                PartialInterpretation.newStrings(interpetation,element)

+                                PartialInterpretation.newStrings(interpetation,element);

                         }

                         

                         private pattern elementCloseWorld(interpetation:PartialInterpretation) {

@@ -242,25 +242,25 @@ class PatternGenerator {
                         //////////

                         // 1.1.1 primitive Type Indexers

                         //////////

-                        pattern instaneofBoolean(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {

+                        pattern instanceofBoolean(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {

                                 find interpretation(problem,interpretation);

                                 PartialInterpretation.booleanelements(interpretation,element);

                         }

-                        pattern instaneofInteger(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {

+                        pattern instanceofInteger(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {

                                 find interpretation(problem,interpretation);

                                 PartialInterpretation.integerelements(interpretation,element);

                         } or {

                                 find interpretation(problem,interpretation);

                                 PartialInterpretation.newIntegers(interpetation,element);

                         }

-                        pattern instaneofReal(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {

+                        pattern instanceofReal(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {

                                 find interpretation(problem,interpretation);

-                                PartialInterpretation.realements(interpretation,element);

+                                PartialInterpretation.realelements(interpretation,element);

                         } or {

                                 find interpretation(problem,interpretation);

                                 PartialInterpretation.newReals(interpetation,element);

                         }

-                        pattern instaneofString(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {

+                        pattern instanceofString(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {

                                 find interpretation(problem,interpretation);

                                 PartialInterpretation.stringelements(interpretation,element);

                         } or {

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 73e43d52..fd0b7c18 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
@@ -81,7 +81,7 @@ class TypeIndexerWithPreliminaryTypeAnalysis extends TypeIndexer{
                         «ENDFOR»

                 } or {

                         find interpretation(problem,interpretation);

-                        PartialInterpretation.openWorldElementPrototype(interpetation,element);

+                        PartialInterpretation.openWorldElementPrototypes(interpetation,element);

                 } or

                 «ENDIF»

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

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend
index 3db21ea4..7751c8eb 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend
@@ -46,7 +46,7 @@ class PartialModelAsLogicInterpretation implements LogicModelInterpretation{
                 

                 this.elementBackwardTrace = initElementBackwardTrace(trace)

                 this.booleanForwardTrace = initialisePrimitiveElementTrace(

-                        null,null,null,partialInterpretation.booleanelements,[it.value])

+                        null,null,[null],partialInterpretation.booleanelements,[it.value])

                 integerForwardTrace = initialisePrimitiveElementTrace(

                         0,[it+1],[it],partialInterpretation.integerelements,[it.value])

                 realForwardTrace = initialisePrimitiveElementTrace(

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
index 78382c2a..d73303fa 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
@@ -64,16 +64,16 @@ class SimpleRun {
                 println("Problem created")

                 var LogicResult solution

                 var LogicReasoner reasoner

-                /*

+                //*

                 reasoner = new ViatraReasoner

                 val viatraConfig = new ViatraReasonerConfiguration => [

                         it.typeScopes.maxNewElements = 40

                         it.typeScopes.minNewElements = 40

                         it.solutionScope.numberOfRequiredSolution = 1

                         it.existingQueries = queries.patterns.map[it.internalQueryRepresentation]

-                        it.debugCongiguration.logging = true

+                        it.debugCongiguration.logging = false

                         it.debugCongiguration.partalInterpretationVisualisationFrequency = 1

-                        it.debugCongiguration.partialInterpretatioVisualiser = new GraphvizVisualisation

+                        it.debugCongiguration.partialInterpretatioVisualiser = null//new GraphvizVisualisation

                 ]

                 solution = reasoner.solve(logicProblem,viatraConfig,workspace)

                 /*/