Removed equals from hash provider, as nodes are compared without it.

3 files changed, 22 insertions, 19 deletions

diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/ContinousHashProvider.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/ContinousHashProvider.java
index c4567458..56c5fefd 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/ContinousHashProvider.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/ContinousHashProvider.java
@@ -19,16 +19,17 @@ public interface ContinousHashProvider<KEY> {
          * @return A hash code.
          */
         public int getHash(KEY key, int index);
-        /**
-         * Compares the equivalnce of two objects {@code key1} and {@code key2}. It has the contracts of a equivalence relation:
-         * <ul>
-         * <li> Reflexive: {@code equals(key,key) == true}.</li>
-         * <li> Symmetric: {@code equals(key1,key2) == equals(key2,key1)}.</li>
-         * <li> Transitive: {@code equals(key1,key2) == true} and {@code equals(key2,key3) == true} then {@code equals(key1,key3) == true}.</li>
-         * </ul>
-         * @param key1 First data object.
-         * @param key2 Second data object.
-         * @return whether {@code key1} and {@code key2} are equivalent with respect to an equivalence relation represented by the given .
-         */
-        public boolean equals(KEY key1, KEY key2);
+//      /**
+//       * Compares the equivalence of two objects {@code key1} and {@code key2}. It has the contracts of a equivalence relation:
+//       * <ul>
+//       * <li> Reflexive: {@code equals(key,key) == true}.</li>
+//       * <li> Symmetric: {@code equals(key1,key2) == equals(key2,key1)}.</li>
+//       * <li> Transitive: {@code equals(key1,key2) == true} and {@code equals(key2,key3) == true} then {@code equals(key1,key3) == true}.</li>
+//       * </ul>
+//       * TODO: clarify relation to Object.equals() on keys
+//       * @param key1 First data object.
+//       * @param key2 Second data object.
+//       * @return whether {@code key1} and {@code key2} are equivalent with respect to an equivalence relation represented by the given .
+//       */
+//      public boolean equals(KEY key1, KEY key2);
 }
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java
index 19b0720d..49b98863 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java
@@ -100,7 +100,7 @@ public class ImmutableNode<KEY, VALUE> extends Node<KEY, VALUE> {
                 if((dataMap & bitposition) != 0) {
                         int keyIndex = 2*index(dataMap, bitposition);
                         KEY keyCandidate = (KEY) content[keyIndex];
-                        if(hashProvider.equals(keyCandidate, key)) {
+                        if(keyCandidate.equals(key)) {
                                 return (VALUE) content[keyIndex+1];
                         } else {
                                 return defaultValue;
@@ -128,7 +128,7 @@ public class ImmutableNode<KEY, VALUE> extends Node<KEY, VALUE> {
                 if((dataMap & bitposition) != 0) {
                         int keyIndex = 2*index(dataMap, bitposition);
                         KEY keyCandidate = (KEY) content[keyIndex];
-                        if(hashProvider.equals(keyCandidate, key)) {
+                        if(keyCandidate.equals(key)) {
                                 if(value == defaultValue) {
                                         // delete
                                         MutableNode<KEY, VALUE> mutable = this.toMutable();
@@ -231,8 +231,10 @@ public class ImmutableNode<KEY, VALUE> extends Node<KEY, VALUE> {
                         // 2.1 found next subnode, move down to the subnode
                         Node<KEY, VALUE> subnode = (Node<KEY, VALUE>) this.content[this.content.length-1-newNodeIndex];
                         cursor.dataIndex = MapCursor.IndexStart;
-                        cursor.nodeStack.push(subnode);
+                        cursor.nodeIndexStack.pop();
                         cursor.nodeIndexStack.push(newNodeIndex);
+                        cursor.nodeIndexStack.push(MapCursor.IndexStart);
+                        cursor.nodeStack.push(subnode);
                         return subnode.moveToNext(cursor);
                 } else {
                         // 3. no subnode found, move up
@@ -330,8 +332,8 @@ public class ImmutableNode<KEY, VALUE> extends Node<KEY, VALUE> {
                         if(key != null) {
                                 // Check whether a new Key-Value pair can fit into the immutable container 
                                 if(datas*2+nodes+2 <= immutableLength) {
-                                        if(     mutable.content[datas*2]        != key ||
-                                                mutable.content[datas*2+1]      != immutable.content[i*2+1])
+                                        if(     !immutable.content[datas*2].equals(key) ||
+                                                !immutable.content[datas*2+1].equals(mutable.content[i*2+1]))
                                         {
                                                 return false;
                                         }
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MutableNode.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MutableNode.java
index 4d216785..eaded957 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MutableNode.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MutableNode.java
@@ -59,7 +59,7 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> {
                 int selectedHashFragment = hashFragment(hash,shiftDepth(depth));
                 KEY keyCandidate = (KEY) this.content[2*selectedHashFragment];
                 if(keyCandidate != null) {
-                        if(hashProvider.equals(keyCandidate, key)) {
+                        if(keyCandidate.equals(key)) {
                                 return (VALUE) this.content[2*selectedHashFragment+1];
                         } else {
                                 return defaultValue;
@@ -90,7 +90,7 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> {
                 KEY keyCandidate = (KEY) content[2*selectedHashFragment];
                 if(keyCandidate != null) {
                         // If has key
-                        if(hashProvider.equals(keyCandidate,key)) {
+                        if(keyCandidate.equals(key)) {
                                 // The key is equals to an existing key -> update entry
                                 if(value == defaultValue) {
                                         return removeEntry(selectedHashFragment);