Merge remote-tracking branch 'origin/master' into kris

3 files changed, 10 insertions, 3 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend
index 179690dd..50f088d4 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend
@@ -32,7 +32,7 @@ class EReferenceMapper_RelationsOverTypes implements EReferenceMapper{
         val extension Ecore2logicannotationsFactory builder2 = Ecore2logicannotationsFactory.eINSTANCE

         val extension EClassMapper classMapper;

         

-        public new(EClassMapper classMapper) {

+        new(EClassMapper classMapper) {

                 this.classMapper = classMapper

         }

         

@@ -117,7 +117,7 @@ class EReferenceMapper_RelationsOverTypes implements EReferenceMapper{
         def createInverseReferenceConstraints(Ecore2Logic_Trace trace, LogicProblem problem, Iterable<EReference> references) {

                 trace.referenceMapperTrace.asTrace.inverseEdges = new HashMap

                 for(reference : references) {

-                        if(reference.EOpposite!=null) {

+                        if(reference.EOpposite!==null && references.exists[it === reference.EOpposite]) {

                                 val opposite = reference.EOpposite

                                 if(trace.referenceMapperTrace.asTrace.inverseEdges.containsKey(opposite)) {

                                         trace.referenceMapperTrace.asTrace.inverseEdges.put(reference,trace.referenceMapperTrace.asTrace.inverseEdges.get(opposite))

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 bf593add..6dc40705 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
@@ -41,6 +41,13 @@ abstract class PartialInterpretation2NeighbourhoodRepresentation<ModelRepresenta
                 return createRepresentation(model,range,parallels,maxNumber,null,null)

         }

         

+        /**

+         * Creates a neighbourhood representation with traces

+         * @param model The model to be represented.

+         * @param range The range of the neighbourhood.

+         * @param parallels The maximal number of parallel references to be differentiated.

+         * @param maxNumber The maximal number of elements in a equivalence class that chan be differentiated.

+         */

         def public createRepresentation(

                 PartialInterpretation model,

                 int range, int parallels, int maxNumber,

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend
index b6d2043d..a86bcd1f 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend
@@ -43,7 +43,7 @@ class NeighbourhoodBasedStateCoderFactory implements IStateCoderFactory {
         val Set<RelationDeclaration> relevantRelations
         
         public new() {
-                this.range = PartialInterpretation2NeighbourhoodRepresentation::FixPointRage
+                this.range = PartialInterpretation2NeighbourhoodRepresentation::GraphWidthRange
                 this.parallels = PartialInterpretation2NeighbourhoodRepresentation::FullParallels
                 this.maxNumber = PartialInterpretation2NeighbourhoodRepresentation::MaxNumbers
                 this.relevantTypes = null