upgraded attribute support for the graph solver

1 files changed, 9 insertions, 3 deletions

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

                                 }

                         }