iterator fix

6 files changed, 54 insertions, 26 deletions

diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/VersionedMap.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/VersionedMap.java
index d5c636d9..4328fde1 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/VersionedMap.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/VersionedMap.java
@@ -9,10 +9,10 @@ import org.eclipse.viatra.solver.data.map.internal.MutableNode;
 import org.eclipse.viatra.solver.data.map.internal.Node;
 
 public class VersionedMap<KEY,VALUE> implements Versioned{
-
         protected final ContinousHashProvider<? super KEY> hashProvider;
         protected final VALUE defaultValue;
         protected Node<KEY,VALUE> root = null;
+        //TODO: protected final iterators
         
         protected VersionedMap(ContinousHashProvider<? super KEY> hashProvider, VALUE defaultValue) {
                 this.hashProvider = hashProvider;
@@ -61,4 +61,14 @@ public class VersionedMap<KEY,VALUE> implements Versioned{
         public void restore(long state) {
                 // TODO Auto-generated method stub
         }
+        
+        public void prettyPrint() {
+                StringBuilder s = new StringBuilder();
+                if(this.root != null) {
+                        this.root.prettyPrint(s, 0, -1);
+                        System.out.println(s.toString());
+                } else {
+                        System.out.println("empty tree");
+                }
+        }
 }
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 908d335c..70c4daff 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
@@ -203,8 +203,8 @@ 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.add(subnode);
-                        cursor.nodeIndexStack.add(newNodeIndex);
+                        cursor.nodeStack.push(subnode);
+                        cursor.nodeIndexStack.push(newNodeIndex);
                         return subnode.moveToNext(cursor);
                 } else {
                         // 3. no subnode found, move up
@@ -222,7 +222,7 @@ public class ImmutableNode<KEY, VALUE> extends Node<KEY, VALUE> {
         }
         
         @Override
-        protected void prettyPrint(StringBuilder builder, int depth, int code) {
+        public void prettyPrint(StringBuilder builder, int depth, int code) {
                 for(int i = 0; i<depth; i++) {
                         builder.append("\t");
                 }
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MapCursor.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MapCursor.java
index 4a4912d8..40ba55fa 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MapCursor.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MapCursor.java
@@ -20,14 +20,19 @@ public class MapCursor<KEY,VALUE> {
                 // Initializing tree stack
                 super();
                 this.nodeStack = new Stack<>();
-                this.nodeStack.add(root);
+                if(root != null) {
+                        this.nodeStack.add(root);
+                }
                 this.nodeIndexStack = new Stack<>();
-                this.nodeIndexStack.add(IndexStart);
+                this.nodeIndexStack.push(IndexStart);
                 this.dataIndex = IndexStart;
                 
                 // Initializing cache
                 this.key = null;
                 this.value = null;
+                
+                // move to first
+                move();
         }
         
         public KEY getKey() {
@@ -43,10 +48,10 @@ public class MapCursor<KEY,VALUE> {
         }
         
         public boolean move() {
-                if(this.isTerminated()) {
-                        return false;
+                if(!isTerminated()) {
+                        return this.nodeStack.peek().moveToNext(this);
                 } else {
-                        return true;
+                        return false;
                 }
         }
 }
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MapEntryIterator.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MapEntryIterator.java
index 82983484..47976b46 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MapEntryIterator.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/MapEntryIterator.java
@@ -16,20 +16,20 @@ import java.util.NoSuchElementException;
  */
 public class MapEntryIterator<KEY,VALUE> extends MapCursor<KEY, VALUE> implements Iterator<Map.Entry<KEY,VALUE>>{
 
+        
         public MapEntryIterator(Node<KEY, VALUE> root) {
                 super(root);
-                // move to first
-                move();
+
         }
         
         @Override
         public boolean hasNext() {
-                return this.isTerminated();
+                return !this.isTerminated();
         }
 
         @Override
         public Entry<KEY, VALUE> next() {
-                if(!this.hasNext()) {
+                if(this.hasNext()) {
                         Map.Entry<KEY, VALUE> result = new AbstractMap.SimpleEntry<KEY, VALUE>(this.key, this.value);
                         this.move();
                         return result;
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 9b30dbb7..4c764f2b 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
@@ -112,7 +112,8 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> {
                                 if(value == defaultValue) {
                                         return removeEntry(selectedHashFragment);
                                 } else {
-                                        return updateValue(value, selectedHashFragment);
+                                        content[2*selectedHashFragment+1] = value;
+                                        return this;
                                 }
                         } else {
                                 if(value == defaultValue) {
@@ -129,12 +130,24 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> {
                                 Node<KEY, VALUE> newNode = nodeCandidate.putValue(key, value, hashProvider, defaultValue, newHash(hashProvider, key, hash, depth+1), depth+1);
                                 return updateSubNode(selectedHashFragment,newNode);
                         } else {
-                                content[2*selectedHashFragment] = key;
-                                return updateValue(value, selectedHashFragment);
+                                if(value == defaultValue) {
+                                        // dont need to add new key-value pair
+                                        return this;
+                                } else {
+                                        content[2*selectedHashFragment] = key;
+                                        content[2*selectedHashFragment+1] = value;
+                                        return this;
+                                }
+                                
                         }
                 }
         }
         
+        Node<KEY, VALUE> updateValue(VALUE value, int selectedHashFragment) {
+                content[2*selectedHashFragment+1] = value;
+                return this;
+        }
+        
         Node<KEY, VALUE> updateSubNode(int selectedHashFragment, Node<KEY, VALUE> newNode) {
                 content[2*selectedHashFragment+1] = newNode;
                 for(int i = 0; i<this.content.length; i++) {
@@ -162,10 +175,6 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> {
                 return this;
         }
         
-        Node<KEY, VALUE> updateValue(VALUE value, int selectedHashFragment) {
-                content[2*selectedHashFragment+1] = value;
-                return this;
-        }
         Node<KEY, VALUE> removeEntry(int selectedHashFragment) {
                 content[2*selectedHashFragment] = null;
                 content[2*selectedHashFragment+1] = null;
@@ -217,8 +226,9 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> {
                                         return true;
                                 }
                         }
+                        cursor.dataIndex = MapCursor.IndexFinish;
                 }
-                cursor.dataIndex = MapCursor.IndexFinish;
+                
                 // 2. look inside the subnodes
                 for(int index = cursor.nodeIndexStack.peek()+1; index < factor; index++) {
                         if(this.content[index*2]==null && this.content[index*2+1] !=null) {
@@ -226,8 +236,9 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> {
                                 Node<KEY, VALUE> subnode = (Node<KEY, VALUE>) this.content[index*2+1];
                                 
                                 cursor.dataIndex = MapCursor.IndexStart;
-                                cursor.nodeStack.add(subnode);
-                                cursor.nodeIndexStack.add(index);
+                                cursor.nodeIndexStack.set(0,index);
+                                cursor.nodeStack.push(subnode);
+                                cursor.nodeIndexStack.push(MapCursor.IndexStart);
                                 
                                 return subnode.moveToNext(cursor);
                         }
@@ -246,7 +257,7 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> {
         }
         
         @Override
-        protected void prettyPrint(StringBuilder builder, int depth, int code) {
+        public void prettyPrint(StringBuilder builder, int depth, int code) {
                 for(int i = 0; i<depth; i++) {
                         builder.append("\t");
                 }
@@ -255,6 +266,7 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> {
                         builder.append(":");
                 }
                 builder.append("Mutable(");
+                // print content
                 boolean hadContent = false;
                 for(int i = 0; i<factor; i++) {
                         if(content[2*i] != null) {
@@ -271,8 +283,9 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> {
                         }
                 }
                 builder.append(")");
+                // print subnodes
                 for(int i = 0; i<factor; i++) {
-                        if(content[2*i] == null || content[2*i+1]!=null) {
+                        if(content[2*i] == null && content[2*i+1]!=null) {
                                 @SuppressWarnings("unchecked")
                                 Node<KEY,VALUE> subNode = (Node<KEY, VALUE>) content[2*i+1];
                                 builder.append("\n");
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/Node.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/Node.java
index 7a6599a2..9b01cfcf 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/Node.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.solver.data/src/org/eclipse/viatra/solver/data/map/internal/Node.java
@@ -66,7 +66,7 @@ public abstract class Node<KEY,VALUE>{
         //abstract boolean moveIteratorToNextData(NodeIterator<KEY,VALUE> iterator, int currentIndex);
         //abstract boolean moveIteratorToNextNode(NodeIterator<KEY,VALUE> iterator, int currentIndex);
         ///////// FOR printing
-        abstract protected void prettyPrint(StringBuilder builder, int depth, int code);
+        abstract public void prettyPrint(StringBuilder builder, int depth, int code);
         @Override
         public String toString() {
                 StringBuilder stringBuilder = new StringBuilder();