Changes between Version 23 and Version 24 of IMMUTABLE_TREE_R0

Timestamp:

08/25/09 15:35:35 (16 years ago)

Author:

stefan

Comment:

--

IMMUTABLE_TREE_R0

@@ -57 +57 @@
 {{{
 public static Hash getHash(ImmCollection<?> col, int begin, int end) {
-                if(!(col instanceof ImmTreeCollection<?>)) {
-                        throw new IllegalArgumentException("Non Hashable Collection - cannot get Hash!");
-                }
+        if(!(col instanceof ImmTreeCollection<?>)) {
+                throw new IllegalArgumentException("Non Hashable Collection - cannot get Hash!");
+        }
                 
-                ImmTreeCollection<?> treeCol = (ImmTreeCollection<?>)col;
-                
-                if(!(treeCol.getTree().getRoot() instanceof HashingNode<?>)) {
-                        throw new IllegalArgumentException("Non Hashable Tree - cannot get Hash!");
-                }
-                
-                HashingNode<?> node = (HashingNode<?>)treeCol.getTree().getRoot();
-                
-                Hasher res = new Hasher();
-                int count = end - begin;
-                
-                node.getHash(res, begin + treeCol.getTreeBegin(), count);
-                return res.toHash();
+        ImmTreeCollection<?> treeCol = (ImmTreeCollection<?>)col;
+        
+        if(!(treeCol.getTree().getRoot() instanceof HashingNode<?>)) {
+                throw new IllegalArgumentException("Non Hashable Tree - cannot get Hash!");
         }
+        
+        HashingNode<?> node = (HashingNode<?>)treeCol.getTree().getRoot();
+        
+        Hasher res = new Hasher();
+        int count = end - begin;
+        
+        node.getHash(res, begin + treeCol.getTreeBegin(), count);
+        return res.toHash();
+}
 }}}
 
@@ -81 +81 @@
 {{{
 public void getHash(Hasher res, int start, int count) {
-                        assert start >= 0;
-                        assert count <= getSize();
-                        
-                        int end = start + count;
-                        if(start == 0 && count == getSize()) {
-                                res.addHashed(getHash());
-                                return;
-                        } if (count == 0) { 
-                                return;
-                        }
-                        if(start < getLeft().getSize()) {
-                                int leftStart = start;
-                                int leftCount = Math.min(getLeft().getSize() - leftStart, count);
-                                getLeft().getHash(res, leftStart, leftCount);
-                        }
-                        if(start <= getLeft().getSize() && end > getLeft().getSize()) {
-                                res.addObject(getData());
-                        }
-                        if(end > getLeft().getSize() + 1) {
-                                int rightStart = Math.max(0, start - getLeft().getSize() - 1);
-                                int rightCount = (end - getLeft().getSize() - 1) - rightStart;
-                                getRight().getHash(res, rightStart, rightCount);
-                        }
-                }
+        assert start >= 0;
+        assert count <= getSize();
+        
+        int end = start + count;
+        if(start == 0 && count == getSize()) {
+                res.addHashed(getHash());
+                return;
+        } if (count == 0) { 
+                return;
+        }
+        if(start < getLeft().getSize()) {
+                int leftStart = start;
+                int leftCount = Math.min(getLeft().getSize() - leftStart, count);
+                getLeft().getHash(res, leftStart, leftCount);
+        }
+        if(start <= getLeft().getSize() && end > getLeft().getSize()) {
+                res.addObject(getData());
+        }
+        if(end > getLeft().getSize() + 1) {
+                int rightStart = Math.max(0, start - getLeft().getSize() - 1);
+                int rightCount = (end - getLeft().getSize() - 1) - rightStart;
+                getRight().getHash(res, rightStart, rightCount);
+        }
+}
 }}}