Refactored to the milestone version of Viatra 2.0

3 files changed, 19 insertions, 19 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
index b4f60202..763ba19c 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.core.runtime,
   org.eclipse.core.resources;bundle-version="3.8.101",
   org.eclipse.viatra.query.runtime;bundle-version="1.3.0",
   org.apache.commons.lang;bundle-version="2.6.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.log4j
 Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.logic.model
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/consistencychecker/TypeConsistencyChecker.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/consistencychecker/TypeConsistencyChecker.xtend
index 9148424c..7e9dd5fb 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/consistencychecker/TypeConsistencyChecker.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/consistencychecker/TypeConsistencyChecker.xtend
@@ -1,19 +1,19 @@
 package hu.bme.mit.inf.dslreasoner.logic.model.builder.consistencychecker

 

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner

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

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration

-import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasonerException

-import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult

-import org.eclipse.viatra.query.runtime.emf.EMFScope

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine

+import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration

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

 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicresultFactory

-import hu.bme.mit.inf.dslreasoner.logic.model.patterns.TypeSystemIsInconsistentMatcher

-import hu.bme.mit.inf.dslreasoner.logic.model.patterns.ElementNotDefinedInSupertypeMatcher

-import hu.bme.mit.inf.dslreasoner.logic.model.patterns.ElementWithNoPossibleDynamicTypeMatcher

-import hu.bme.mit.inf.dslreasoner.logic.model.patterns.PossibleDynamicTypeMatcher

+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult

+import hu.bme.mit.inf.dslreasoner.logic.model.patterns.ElementNotDefinedInSupertype

+import hu.bme.mit.inf.dslreasoner.logic.model.patterns.ElementWithNoPossibleDynamicType

+import hu.bme.mit.inf.dslreasoner.logic.model.patterns.PossibleDynamicType

+import hu.bme.mit.inf.dslreasoner.logic.model.patterns.TypeSystemIsInconsistent

+import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace

+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine

+import org.eclipse.viatra.query.runtime.emf.EMFScope

 

 class TypeConsistencyChecker extends LogicReasoner{

         val extension LogicresultFactory factory = LogicresultFactory.eINSTANCE

@@ -32,10 +32,10 @@ class TypeConsistencyChecker extends LogicReasoner{
                 

                 val queryEngine = ViatraQueryEngine.on(new EMFScope(problem))

                 

-                val typeSystemInconsistencyMatcher = TypeSystemIsInconsistentMatcher.on(queryEngine)

-                val elementNotDefinedInSupertype = ElementNotDefinedInSupertypeMatcher.on(queryEngine)

-                val elementWithNoPossibleDynamicType = ElementWithNoPossibleDynamicTypeMatcher.on(queryEngine)

-                val possibleDynamicType = PossibleDynamicTypeMatcher.on(queryEngine)

+                val typeSystemInconsistencyMatcher = TypeSystemIsInconsistent.Matcher.on(queryEngine)

+                val elementNotDefinedInSupertype = ElementNotDefinedInSupertype.Matcher.on(queryEngine)

+                val elementWithNoPossibleDynamicType = ElementWithNoPossibleDynamicType.Matcher.on(queryEngine)

+                val possibleDynamicType = PossibleDynamicType.Matcher.on(queryEngine)

                 

                 val hasErrorPatternMatch = typeSystemInconsistencyMatcher.hasMatch(problem)

                 

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend
index 42c93da1..8d234fe9 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend
@@ -143,7 +143,7 @@ class  Viatra2Logic {
         {

                 val pquery = squery.internalQueryRepresentation

                 val disjunction = if(config.normalize) {

-                        val normalizer = new PBodyNormalizer(EMFQueryMetaContext.INSTANCE,true)

+                        val normalizer = new PBodyNormalizer(EMFQueryMetaContext.DEFAULT)

                         normalizer.rewrite(pquery)

                 } else {

                         pquery.disjunctBodies

@@ -255,7 +255,7 @@ class  Viatra2Logic {
         def TypeDescriptor getType(PVariable v, PBody body, TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {

                 if(v.isPositiveVariable) {

                         val allTypes = v.lookup(

-                                body.getAllUnaryTypeRestrictions(EMFQueryMetaContext.INSTANCE))

+                                body.getAllUnaryTypeRestrictions(EMFQueryMetaContext.DEFAULT))

                         val types = allTypes.filter[it.inputKey instanceof BaseEMFTypeKey<?>].toSet

                         

                         if(types.size == 0) {

@@ -279,7 +279,7 @@ class  Viatra2Logic {
                         val indexOfVariable = v.lookup(onlyConstraint.actualParametersTuple.invertIndex)

                         val parameter = onlyConstraint.referredQuery.parameters.get(indexOfVariable)

                         val declaredUnaryType = parameter.declaredUnaryType as BaseEMFTypeKey<? extends EClassifier>

-                        if(declaredUnaryType == null) {

+                        if(declaredUnaryType === null) {

                                 throw new UnsupportedOperationException(

                                 '''parameter «parameter.name» in pattern «

                                 onlyConstraint.referredQuery.fullyQualifiedName» does not have type!''')