Diffcursor dependency update

4 files changed, 15 insertions, 7 deletions

diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/Cursor.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/Cursor.java
index 95e59ee2..e45b1f20 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/Cursor.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/Cursor.java
@@ -9,5 +9,6 @@ public interface Cursor<K,V> {
         public boolean move();
         public boolean isDirty();
         
-        public List<VersionedMap<K,V>> getDependingMaps();
+        @SuppressWarnings("squid:S1452")
+        public List<VersionedMap<?,?>> getDependingMaps();
 }
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/DiffCursor.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/DiffCursor.java
index 7042f7c9..f0af1436 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/DiffCursor.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/DiffCursor.java
@@ -1,5 +1,6 @@
 package org.eclipse.viatra.solver.data.map;
 
 public interface DiffCursor<K, V> extends Cursor<K,V> {
-
+        public V getFromValue();
+        public V getToValue();
 }
\ No newline at end of file
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapCursor.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapCursor.java
index 97fbcd8f..cc5a3982 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapCursor.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapCursor.java
@@ -83,7 +83,7 @@ public class MapCursor<K,V> implements Cursor<K,V> {
                 return this.map.hashCode() != this.creationHash;
         }
         @Override
-        public List<VersionedMap<K, V>> getDependingMaps() {
+        public List<VersionedMap<?, ?>> getDependingMaps() {
                 return List.of(this.map);
         }
         
@@ -103,7 +103,7 @@ public class MapCursor<K,V> implements Cursor<K,V> {
          * @param <V>
          * @param cursor1
          * @param cursor2
-         * @returnv Positive number if cursor 1 is behind, negative number if cursor 2 is behind, and 0 if they are at the same position.
+         * @return Positive number if cursor 1 is behind, negative number if cursor 2 is behind, and 0 if they are at the same position.
          */
         public static <K,V> int compare(MapCursor<K,V> cursor1, MapCursor<K,V> cursor2) {
                 // two cursors are equally deep
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapDiffCursor.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapDiffCursor.java
index 9e3a47ab..e97e4aa1 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapDiffCursor.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapDiffCursor.java
@@ -51,13 +51,15 @@ public class MapDiffCursor<K,V> implements DiffCursor<K, V>, Cursor<K,V>{
                 this.cursor1 = (MapCursor<K, V>) cursor1;
                 this.cursor2 = (MapCursor<K, V>) cursor2;
         }
-
+        @Override
         public K getKey() {
                 return key;
         }
+        @Override
         public V getFromValue() {
                 return fromValue;
         }
+        @Override
         public V getToValue() {
                 return toValue;
         }
@@ -73,7 +75,7 @@ public class MapDiffCursor<K,V> implements DiffCursor<K, V>, Cursor<K,V>{
                 return this.cursor1.isDirty() || this.cursor2.isDirty();
         }
         @Override
-        public List<VersionedMap<K, V>> getDependingMaps() {
+        public List<VersionedMap<?, ?>> getDependingMaps() {
                 return Stream.concat(
                                 cursor1.getDependingMaps().stream(),
                                 cursor2.getDependingMaps().stream()
@@ -142,7 +144,11 @@ public class MapDiffCursor<K,V> implements DiffCursor<K, V>, Cursor<K,V>{
 
         
         protected boolean sameValues() {
-                return this.fromValue == this.toValue;
+                if(this.fromValue == null) {
+                        return this.toValue == null;
+                } else {
+                        return this.fromValue.equals(this.toValue);
+                }
         }
         protected boolean moveOne() {
                 if(isTerminated()) {