2 files changed, 40 insertions, 3 deletions

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 f7a1ce4f..d37acb6d 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
@@ -42,6 +42,7 @@ 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

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

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

 

 @Data class Problem2PartialInterpretationTrace {

         Map<TypeDeclaration, PartialComplexTypeInterpretation> type2Interpretation

@@ -233,7 +234,11 @@ class PartialInterpretationInitialiser {
         

         def private Map<RelationDeclaration, PartialRelationInterpretation> initRelations(PartialInterpretation interpretation, PrimitiveValueTrace trace) {

                 val Map<RelationDeclaration, PartialRelationInterpretation> relation2Interpretation = new HashMap

-                for(relation : interpretation.problem.relations.filter(RelationDeclaration)) {

+                val definedRelationDeclarations = interpretation.problem.relations.filter(RelationDefinition).map[defines]

+                val undefinedRelationDeclarations = interpretation.problem.relations.filter(RelationDeclaration).filter[

+                        declared | !definedRelationDeclarations.exists[defined | defined === declared]

+                ]

+                for(relation : undefinedRelationDeclarations) {

                         val partialInterpretation = relation.initialisePartialRelationInterpretation

                         interpretation.partialrelationinterpretation += partialInterpretation

                         relation2Interpretation.put(relation,partialInterpretation)

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/visualisation/PartialInterpretation2Gml.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/visualisation/PartialInterpretation2Gml.xtend
index 2b42a8b1..bdf402f3 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/visualisation/PartialInterpretation2Gml.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/visualisation/PartialInterpretation2Gml.xtend
@@ -5,9 +5,13 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type

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

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

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

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

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

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

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

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

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

 import java.util.HashMap

 import java.util.Map

 import java.util.Set

@@ -106,10 +110,38 @@ class PartialInterpretation2Gml {
                 '''

         }

         

-        def protected transormTitle(DefinedElement object) {

-                if(object.name!= null)object.name

+        def protected dispatch transormTitle(DefinedElement object) {

+                if(object.name !== null) object.name.replace("\"", "")

                 else "null"

         }

+        def protected dispatch transormTitle(BooleanElement object) {

+                if(object.valueSet) {

+                        object.value.toString

+                } else {

+                        "?"

+                }

+        }

+        def protected dispatch transormTitle(IntegerElement object) {

+                if(object.valueSet) {

+                        object.value.toString

+                } else {

+                        "?"

+                }

+        }

+        def protected dispatch transormTitle(RealElement object) {

+                if(object.valueSet) {

+                        object.value.toString

+                } else {

+                        "?"

+                }

+        }

+        def protected dispatch transormTitle(StringElement object) {

+                if(object.valueSet) {

+                        object.value.toString

+                } else {

+                        "?"

+                }

+        }

         

         def protected transformLink(

                 PartialRelationInterpretation reference,