5 files changed, 51 insertions, 56 deletions

diff --git a/Solvers/SMT-Solver/hu.bme.mit.inf.dslreasoner.smt.reasoner/src/hu/bme/mit/inf/dslreasoner/smt/reasoner/Logic2Smt_TypeMapper_FilteredTypes.xtend b/Solvers/SMT-Solver/hu.bme.mit.inf.dslreasoner.smt.reasoner/src/hu/bme/mit/inf/dslreasoner/smt/reasoner/Logic2Smt_TypeMapper_FilteredTypes.xtend
index 2796e077..56668b79 100644
--- a/Solvers/SMT-Solver/hu.bme.mit.inf.dslreasoner.smt.reasoner/src/hu/bme/mit/inf/dslreasoner/smt/reasoner/Logic2Smt_TypeMapper_FilteredTypes.xtend
+++ b/Solvers/SMT-Solver/hu.bme.mit.inf.dslreasoner.smt.reasoner/src/hu/bme/mit/inf/dslreasoner/smt/reasoner/Logic2Smt_TypeMapper_FilteredTypes.xtend
@@ -7,8 +7,8 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration

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

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

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

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

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

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

 import hu.bme.mit.inf.dslreasoner.smtLanguage.SMTComplexTypeReference

 import hu.bme.mit.inf.dslreasoner.smtLanguage.SMTDocument

 import hu.bme.mit.inf.dslreasoner.smtLanguage.SMTEnumLiteral

@@ -111,7 +111,7 @@ class Logic2Smt_TypeMapperTrace_FilteredTypes implements Logic2Smt_TypeMapperTra
         }

         

         def validate(EObject element, EObject other) {

-                if(element != null) {

+                if(element !== null) {

                         val headOfElement = EcoreUtil2.getContainerOfType(element,SMTDocument)

                         val expectedHeadOfElement = EcoreUtil2.getContainerOfType(other,SMTDocument)

                         if(headOfElement !== expectedHeadOfElement) {

@@ -234,8 +234,8 @@ class Logic2Smt_TypeMapper_FilteredTypes implements Logic2Smt_TypeMapper {
         }

         

         protected def transformOldTypes(Iterable<Type> oldTypes,Iterable<DefinedElement> oldElements, Logic2SmtMapperTrace trace, SMTInput document, ViatraQueryEngine engine) {

-                val possibleTypeMatcher = PossibleDynamicTypeMatcher.on(engine)

-                val supertypeStarMatcher = SupertypeStarMatcher.on(engine)

+                val possibleTypeMatcher = PossibleDynamicType.Matcher.on(engine)

+                val supertypeStarMatcher = SupertypeStar.Matcher.on(engine)

 //              val possibleTypes = new LinkedList

 //              if(hasDefinedElement) possibleTypes += typesWithDefinedSupertype

 //              if(hasUndefinedElement) possibleTypes += typesWithoutDefinedSupertype

@@ -351,7 +351,7 @@ class Logic2Smt_TypeMapper_FilteredTypes implements Logic2Smt_TypeMapper {
                 Iterable<TypeDeclaration> typesWithoutDefinedSupertype,

                 Logic2SmtMapperTrace trace, SMTInput document, ViatraQueryEngine engine)

         {

-                val supertypeStarMatcher = SupertypeStarMatcher.on(engine)

+                val supertypeStarMatcher = SupertypeStar.Matcher.on(engine)

                 val possibleTypes = typesWithoutDefinedSupertype

                 val possibleConcreteTypes = possibleTypes.filter[!it.isIsAbstract].toList

                 

@@ -483,7 +483,7 @@ class Logic2Smt_TypeMapper_FilteredTypes implements Logic2Smt_TypeMapper {
                 }

                 

                 if(list.empty) throw new AssertionError('''Typereference to type is «type.name» empty''')

-                if(list.exists[it.type == null]){

+                if(list.exists[it.type === null]){

                         throw new AssertionError('''Typereference to null!''')

                 }

                 return list

@@ -520,14 +520,14 @@ class Logic2Smt_TypeMapper_FilteredTypes implements Logic2Smt_TypeMapper {
                 }

                 

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

-                val supertypeStarMatcher = SupertypeStarMatcher.on(engine)

+                val supertypeStarMatcher = SupertypeStar.Matcher.on(engine)

                 

                 val Map<Type,List<DefinedElement>> type2Elements = new HashMap

                 for(key : problem.types) {

                         type2Elements.put(key,new LinkedList<DefinedElement>)

                 }

                 

-                if(trace.typeTrace.independentClasses != null) {

+                if(trace.typeTrace.independentClasses !== null) {

                         for(type : trace.typeTrace.independentClasses.keySet) {

                                 if(type instanceof TypeDefinition) {

                                         type.lookup(type2Elements).addAll(type.elements)

@@ -537,7 +537,7 @@ class Logic2Smt_TypeMapper_FilteredTypes implements Logic2Smt_TypeMapper {
                         }

                 }

                 

-                if(trace.typeTrace.oldObjectTypeFunction != null) {

+                if(trace.typeTrace.oldObjectTypeFunction !== null) {

                         val inverseOldTypeMap = trace.typeTrace.oldObjectTypeMap.bijectiveInverse

                         for(oldElement: trace.typeTrace.elementMap.values) {

                                 val type = interpretation.queryEngine.resolveFunctionDefinition(

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF
index 6510a20a..b2e3667c 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF
@@ -4,23 +4,22 @@ Bundle-Name: Logic2viatra
 Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Export-Package: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra,
-  hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries,
-  hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.util
+  hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries
 Require-Bundle: hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
- hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",
- hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
- hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",
- com.google.guava,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro,
- org.eclipse.viatra.query.runtime;bundle-version="1.5.0",
- org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.5.0",
- org.eclipse.viatra.query.patternlanguage.emf;bundle-version="1.5.0",
- com.google.inject;bundle-version="3.0.0",
- org.eclipse.xtext;bundle-version="2.10.0",
- org.eclipse.viatra.transformation.runtime.emf;bundle-version="1.5.0",
- org.eclipse.xtext.xbase;bundle-version="2.10.0"
+  hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
+  hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",
+  com.google.guava,
+  org.eclipse.xtext.xbase.lib,
+  org.eclipse.xtend.lib,
+  org.eclipse.xtend.lib.macro,
+  org.eclipse.viatra.query.runtime;bundle-version="1.5.0",
+  org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.5.0",
+  org.eclipse.viatra.query.patternlanguage.emf;bundle-version="1.5.0",
+  com.google.inject;bundle-version="3.0.0",
+  org.eclipse.xtext;bundle-version="2.10.0",
+  org.eclipse.viatra.transformation.runtime.emf;bundle-version="1.5.0",
+  org.eclipse.xtext.xbase;bundle-version="2.10.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
 Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/TypeAnalysis.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/TypeAnalysis.xtend
index 395aba85..2dd01343 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/TypeAnalysis.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/TypeAnalysis.xtend
@@ -1,21 +1,21 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra

 

-import org.eclipse.xtend.lib.annotations.Data

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

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

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

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

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.DontHaveDefinedSupertype

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.NewElementMayTypeNegativeConstraint

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.NewElementTypeConstructor

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.NewElementTypeRefinementNegativeConstraint

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.NewElementTypeRefinementTarget

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

+import java.util.ArrayList

 import java.util.List

 import java.util.Map

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

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

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

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

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.NewElementTypeConstructorMatcher

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.NewElementTypeRefinementTargetMatcher

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.NewElementTypeRefinementNegativeConstraintMatcher

-import java.util.ArrayList

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.DontHaveDefinedSupertypeMatcher

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

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

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.NewElementMayTypeNegativeConstraintMatcher

+import org.eclipse.xtend.lib.annotations.Data

 

 @Data class TypeRefinementPrecondition {

         Type targetType

@@ -60,11 +60,11 @@ class TypeAnalysis {
         

         def TypeAnalysisResult performTypeAnalysis(LogicProblem problem, PartialInterpretation interpretation) {

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

-                val negativeMatcher = NewElementTypeRefinementNegativeConstraintMatcher.on(viatraEngine)

+                val negativeMatcher = NewElementTypeRefinementNegativeConstraint.Matcher.on(viatraEngine)

                 

-                val possibleNewDynamicTypes =  NewElementTypeConstructorMatcher.on(viatraEngine).allValuesOftype

+                val possibleNewDynamicTypes =  NewElementTypeConstructor.Matcher.on(viatraEngine).allValuesOftype

                 

-                val possibleNewTypeRefinementTargets = NewElementTypeRefinementTargetMatcher.on(viatraEngine).allValuesOfrefined

+                val possibleNewTypeRefinementTargets = NewElementTypeRefinementTarget.Matcher.on(viatraEngine).allValuesOfrefined

                 val possibleNewTypeRefinements = new ArrayList

                 for(possibleNewTypeRefinementTarget : possibleNewTypeRefinementTargets) {

                         val inhibitorTypes = negativeMatcher.getAllValuesOfinhibitor(possibleNewTypeRefinementTarget)

@@ -73,8 +73,8 @@ class TypeAnalysis {
                                 inhibitorTypes.toList)

                 }

                 

-                val possibleTypes = DontHaveDefinedSupertypeMatcher.on(viatraEngine).allValuesOftype

-                val newElementMayTypeMatcher = NewElementMayTypeNegativeConstraintMatcher.on(viatraEngine)

+                val possibleTypes = DontHaveDefinedSupertype.Matcher.on(viatraEngine).allValuesOftype

+                val newElementMayTypeMatcher = NewElementMayTypeNegativeConstraint.Matcher.on(viatraEngine)

                 

                 val mayNewTypePreconditions = possibleTypes.toInvertedMap[type | 

                         val inhibitorTypes = newElementMayTypeMatcher.getAllValuesOfinhibitor(type as TypeDeclaration)

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/util/ParseUtil.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/util/ParseUtil.xtend
index d315ac3f..6febe0a6 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/util/ParseUtil.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/util/ParseUtil.xtend
@@ -12,21 +12,18 @@ import java.util.LinkedHashMap
 import org.eclipse.emf.common.util.URI

 import org.eclipse.emf.ecore.resource.Resource

 import org.eclipse.emf.ecore.util.EcoreUtil

-import org.eclipse.viatra.query.patternlanguage.PatternLanguageStandaloneSetup

-import org.eclipse.viatra.query.patternlanguage.annotations.ExtensionBasedAnnotationValidatorLoader

-import org.eclipse.viatra.query.patternlanguage.annotations.IAnnotationValidatorLoader

 import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageRuntimeModule

 import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup

 import org.eclipse.viatra.query.patternlanguage.emf.GenmodelExtensionLoader

 import org.eclipse.viatra.query.patternlanguage.emf.IGenmodelMappingLoader

-import org.eclipse.viatra.query.patternlanguage.emf.eMFPatternLanguage.PatternModel

 import org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder

+import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternModel

 import org.eclipse.xtext.resource.XtextResourceSet

 

 class MyModule extends EMFPatternLanguageRuntimeModule implements Module{

-    def public Class<? extends IAnnotationValidatorLoader> bindAnnotationValidatorLoader() {

-        return typeof(ExtensionBasedAnnotationValidatorLoader);

-    }

+//    def public Class<? extends IAnnotationValidatorLoader> bindAnnotationValidatorLoader() {

+//        return typeof(ExtensionBasedAnnotationValidatorLoader);

+//    }

     def public Class<? extends IGenmodelMappingLoader> bindGenmodelMappingLoader() {

         return typeof(GenmodelExtensionLoader);

     }

@@ -35,7 +32,6 @@ class MyModule extends EMFPatternLanguageRuntimeModule implements Module{
 class ParseUtil {

         val Injector injector;

         new() {

-                PatternLanguageStandaloneSetup.doSetup

                 EMFPatternLanguageStandaloneSetup.doSetup;

                 PartialinterpretationPackage.eINSTANCE.class;

                 LogicproblemPackage.eINSTANCE.class;

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend
index 9ddee6a7..45fd2c6d 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend
@@ -1,15 +1,19 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage

 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -23,10 +27,6 @@ import org.eclipse.viatra.query.runtime.emf.EMFScope
 import org.eclipse.xtend.lib.annotations.Data

 

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

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

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

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

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

 

 @Data class Problem2PartialInterpretationTrace {

         Map<TypeDeclaration, PartialTypeInterpratation> type2Interpretation = new HashMap

@@ -112,7 +112,7 @@ class PartialInterpretationInitialiser {
          * Initialize type with existing elements

          */

         def private initialisePartialTypeInterpretation(TypeDeclaration t, ViatraQueryEngine engine, Problem2PartialInterpretationTrace trace) {

-                val supertypeMatcher = SupertypeStarMatcher.on(engine)

+                val supertypeMatcher = SupertypeStar.Matcher.on(engine)

                 val res = createPartialTypeInterpratation => [

                         it.interpretationOf = t

                         it.elements += supertypeMatcher.getAllValuesOfsubtype(t)