Changeset 5215

Timestamp:

02/04/08 07:13:22 (6 months ago)

Author:

morris

Message:

Don't depend on sorting to get heaviest child node

Files:

• Tuna/trunk/TNNode.h (modified) (1 diff)
• Tuna/trunk/TNNode.m (modified) (2 diffs)
• Tuna/trunk/TNSessionController.m (modified) (1 diff)

Tuna/trunk/TNNode.h

@@ -57 +57 @@
-- (NSUInteger)children;
-- (TNNode *)childAtIndex:(NSUInteger)index;
-- (TNNode *)firstChild;
-- (id)childWithFunction:(TNFunction *)function;
-- (id)childWithFunctionIdenticalTo:(TNFunction *)function;
+- (TNNode *)childWithHighestCumulativePercent;
-- (TNNode *)parent;
-- (BOOL)isLeaf;

Tuna/trunk/TNNode.m

@@ -180 +180 @@
-
-
-- (TNNode *)firstChild {
-        return ([_children count] == 0) ? NULL : [_children objectAtIndex:0];
-}
-
-
-
-- (id)childWithFunction:(TNFunction *)function {
-        TNNode                  *node;
@@ -222 +216 @@
-        
-        return NULL;
+}
+
+
+
+- (TNNode *)childWithHighestCumulativePercent {
+        TNNode                  *node, *child = NULL;
+        NSUInteger              i, count;
+        double                  percent = 0.0;
+        
+        if(_children) {
+                count = CFArrayGetCount((CFMutableArrayRef) _children);
+                
+                for(i = 0; i < count; i++) {
+                        node = (id) CFArrayGetValueAtIndex((CFMutableArrayRef) _children, i);
+                        
+                        if(!child || node->_cumulativePercent > percent) {
+                                child = node;
+                                percent = child->_cumulativePercent;
+                        }
+                }
+        }
+        
+        return child;
-}
-

Tuna/trunk/TNSessionController.m

@@ -184 +184 @@
-        while([node children] > 0) {
-                before  = [node cumulativePercent];
-firstChild
+childWithHighestCumulativePercent
-                after   = [node cumulativePercent];
-                delta   = (before - after) / before;