4 files changed, 17 insertions, 10 deletions

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 91c6a61a..ae22af1c 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
@@ -41,7 +41,7 @@ import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
 @Data class ViatraQuerySetDescriptor {

         val List<? extends IQuerySpecification<?>> patterns

         val Set<? extends IQuerySpecification<?>> validationPatterns

-        val Map<PQuery,EStructuralFeature> derivedFeatures

+        val Map<IQuerySpecification<?>,EStructuralFeature> derivedFeatures

 }

 class Viatra2LogicTrace {

         public val Map<PQuery, RelationDefinition> query2Relation = new HashMap

@@ -155,7 +155,7 @@ class  Viatra2Logic {
         

         def transformQueryConstraints(

                 Set<? extends IQuerySpecification<?>> validationPatterns,

-                Map<PQuery,EStructuralFeature> derivedFeatures,

+                Map<IQuerySpecification<?>,EStructuralFeature> derivedFeatures,

                 TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace,

                 Viatra2LogicTrace viatra2LogicTrace)

         {

@@ -179,7 +179,7 @@ class  Viatra2Logic {
                         ecore2LogicTrace.output.annotations.add(annotation)

                 }

                 for(derivedFeature : derivedFeatures.entrySet) {

-                        val relationDefinition = derivedFeature.key.lookup(viatra2LogicTrace.query2Relation)

+                        val relationDefinition = derivedFeature.key.internalQueryRepresentation.lookup(viatra2LogicTrace.query2Relation)

                         val feature = derivedFeature.value

                         if(feature instanceof EAttribute) {

                                 val declaration = ecore2Logic.relationOfAttribute(ecore2LogicTrace.trace,feature)

@@ -190,7 +190,7 @@ class  Viatra2Logic {
                         } else throw new IllegalArgumentException('''Unknown feature: «feature»''')

                         val annotation = createDefinedByDerivedFeature => [

                                 it.target = relationDefinition.defines

-                                it.query = derivedFeature.key.lookup(viatra2LogicTrace.query2Annotation)

+                                it.query = derivedFeature.key.internalQueryRepresentation.lookup(viatra2LogicTrace.query2Annotation)

                         ]

                         ecore2LogicTrace.output.annotations+=annotation

                 }

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 005304ea..d315ac3f 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
@@ -55,7 +55,7 @@ class ParseUtil {
     }

         

 //      @Inject

-//      var ParseHelper<PatternModel> parseHelper;

+//  var ParseHelper<PatternModel> parseHelper;

     val builder = new SpecificationBuilder

         

         public def parse(CharSequence vqlFileContent) {

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
index e07da778..43d145d3 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
@@ -74,8 +74,8 @@ class FAMLoader extends MetamodelLoader{
                 val patterns = i.specifications.toList

                 val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name== "Constraint"]].toSet

                 val derivedFeatures = new LinkedHashMap

-                derivedFeatures.put(i.type.internalQueryRepresentation,metamodel.attributes.filter[it.name == "type"].head)

-                derivedFeatures.put(i.model.internalQueryRepresentation,metamodel.references.filter[it.name == "model"].head)

+                derivedFeatures.put(i.type,metamodel.attributes.filter[it.name == "type"].head)

+                derivedFeatures.put(i.model,metamodel.references.filter[it.name == "model"].head)

                 val res = new ViatraQuerySetDescriptor(

                         patterns,

                         wfPatterns,

@@ -196,7 +196,7 @@ class FileSystemLoader extends MetamodelLoader{
                 val patterns = patternGroup.specifications.toList

                 val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name == "Constraint"]].toSet

                 val derivedFeatures = new HashMap

-                derivedFeatures.put(patternGroup.live.internalQueryRepresentation,metamodel.references.filter[it.name == "live"].head)

+                derivedFeatures.put(patternGroup.live,metamodel.references.filter[it.name == "live"].head)

                 return new ViatraQuerySetDescriptor(

                         patterns,

                         wfPatterns,

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 d0f88b65..863a91c8 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
@@ -34,6 +34,8 @@ import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner

 import java.util.LinkedList

 import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualisation

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

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

 

 class SimpleRun {

         

@@ -93,6 +95,11 @@ class SimpleRun {
                 val interpretations = reasoner.getInterpretations(solution as ModelResult)

                 val models = new LinkedList

                 for(interpretation : interpretations) {

+                        val extension b = new LogicStructureBuilder

+                        val extension a = new LogicProblemBuilder

+                        

+                        

+                        

                         val instanceModel = logic2Ecore.transformInterpretation(interpretation,modelGenerationProblem.trace)

                         models+=instanceModel

                 }

@@ -115,8 +122,8 @@ class SimpleRun {
                 val patterns = i.specifications.toList

                 val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name== "Constraint"]].toSet

                 val derivedFeatures = new LinkedHashMap

-                derivedFeatures.put(i.type.internalQueryRepresentation,metamodel.attributes.filter[it.name == "type"].head)

-                derivedFeatures.put(i.model.internalQueryRepresentation,metamodel.references.filter[it.name == "model"].head)

+                derivedFeatures.put(i.type,metamodel.attributes.filter[it.name == "type"].head)

+                derivedFeatures.put(i.model,metamodel.references.filter[it.name == "model"].head)

                 val res = new ViatraQuerySetDescriptor(

                         patterns,

                         wfPatterns,