Changeset 51

Timestamp:

02/22/10 15:54:12 (2 years ago)

Author:

ke

Message:

Added methods for recomputing the layer information of a tree or subtree.

Files:

• kahina/trunk/src/org/kahina/data/tree/KahinaDbTree.java (modified) (6 diffs)
• kahina/trunk/src/org/kahina/data/tree/KahinaTree.java (modified) (1 diff)

kahina/trunk/src/org/kahina/data/tree/KahinaDbTree.java

@@ -164 +164 @@
-                        throw new KahinaException("SQL error.", e);
-                }
+                computeAndStoreLayerInformation(child);
+        }
+        
+        private void computeAndStoreLayerInformation(int child)
+        {
-                int layer = decider.decideOnLayer(child, this);
-parent
+getParent(child)
-                while (getLayer(virtualParent) > layer)
-                {
@@ -183 +188 @@
-
-        @Override
+        public void setLayerDecider(LayerDecider decider)
+        {
+                super.setLayerDecider(decider);
+                recomputeLayers();
+        }
+
+        public void recomputeLayers()
+        {
+                recomputeLayers(getRootID());
+        }
+
+        public void recomputeLayers(int nodeID)
+        {
+                computeAndStoreLayerInformation(nodeID);
+                for (int childID : getChildren(nodeID))
+                {
+                        recomputeLayers(childID);
+                }
+        }
+
+        @Override
-        public int getParent(int nodeID)
-        {
@@ -270 +296 @@
-                {
-                        // usually only the case for the root of a partial tree
-Real
+
-                        for (int i = 0; i < frontLine.size();)
-                        {
@@ -277 +303 @@
-                                {
-                                        frontLine.remove(i);
-Real
+
-                                } else
-                                {
@@ -289 +315 @@
-        }
-
-Real
+
-        {
-                try
@@ -329 +355 @@
-        protected void collectLeaves(int nodeID, List<Integer> leaves)
-        {
-Real
+
-                if (children.isEmpty())
-                {

kahina/trunk/src/org/kahina/data/tree/KahinaTree.java

@@ -34 +34 @@
-                primaryModel = this;
-                rootID = -1;
+        }
+        
+        public LayerDecider getLayerDecider()
+        {
+                return decider;
+        }
+        
+        public void setLayerDecider(LayerDecider decider)
+        {
+                this.decider = decider;
-        }
-