From f42954a45bea9f3e40090447804f33f12c080640 Mon Sep 17 00:00:00 2001
From: OszkarSemerath <oszkar.semerath@gmail.com>
Date: Sat, 24 Mar 2018 21:44:49 -0400
Subject: upgraded attribute support for the graph solver

---
 .../PartialInterpretation2NeighbourhoodRepresentation.xtend  | 12 +++++++++---
 .../visualisation/PartialInterpretation2Gml.xtend            | 12 +++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner')

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
index 936f2117..a5739edf 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
@@ -184,7 +184,13 @@ abstract class PartialInterpretation2NeighbourhoodRepresentation<ModelRepresenta
 	}
 	
 	def private getElements(PartialInterpretation model) {
-		return model.problem.elements + model.newElements
+		return
+			model.problem.elements +
+			model.newElements +
+			model.booleanelements+
+			model.integerelements+
+			model.stringelement+
+			model.realelements
 	}
 	
 	def private fillTypes(PartialInterpretation model, Map<DefinedElement, Set<String>> node2Type, Set<TypeDeclaration> relevantTypes) {
@@ -222,8 +228,8 @@ abstract class PartialInterpretation2NeighbourhoodRepresentation<ModelRepresenta
 			if(type.isRelevant(relevantRelations)) {
 				for(link : relationInterpretation.relationlinks) {
 					if(link instanceof BinaryElementRelationLink) {
-						OutgoingRelations.get(link.param1) += new OutgoingRelation(link.param2,type.name)
-						IncomingRelations.get(link.param2) += new IncomingRelation(link.param1,type.name)
+							OutgoingRelations.get(link.param1) += new OutgoingRelation(link.param2,type.name)
+							IncomingRelations.get(link.param2) += new IncomingRelation(link.param1,type.name)
 					} else throw new UnsupportedOperationException
 				}
 			}
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 819cae00..6e948827 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
@@ -12,6 +12,16 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation
 import java.util.Set
 
 class PartialInterpretation2Gml {
+	def private getElements(PartialInterpretation model) {
+		return
+			model.problem.elements +
+			model.newElements +
+			model.booleanelements+
+			model.integerelements+
+			model.stringelement+
+			model.realelements
+	}
+	
 	def public transform(PartialInterpretation i) {
 		val p = i.problem
 		val Map<DefinedElement, Integer> objectToID = new HashMap
@@ -19,7 +29,7 @@ class PartialInterpretation2Gml {
 		'''
 		graph
 		[
-			«FOR object:p.elements + i.newElements SEPARATOR '\n'»
+			«FOR object:i.elements SEPARATOR '\n'»
 				«this.transformObject(object,object.typesOfElement(i),objectToID)»
 			«ENDFOR»
 			«FOR relation:i.partialrelationinterpretation»
-- 
cgit v1.2.3-54-g00ecf