Changeset 14510

Timestamp:

Aug 15, 2007, 10:41:43 AM (19 years ago)

Author:

jhoblitt

Message:

add pxNodeFuncCountDependants()
add pxNodeHasChildren()
add pxNodeHasGrandChildren()

Location:

trunk/ippTools/src

Files:

• pxtree.c (modified) (3 diffs)
• pxtree.h (modified) (2 diffs)

trunk/ippTools/src/pxtree.c

@@ -73 +73 @@
 }
 
+// func() returning false means decend no futher along this branch
 
-bool pxTreeCrawl(pxNode *node, pxNodeFunc func)
+bool pxTreeCrawl(pxNode *node, pxNodeFunc func, void *arg)
 {
     // if func() returns false, stop
-    if (!func(node)) {
+    if (!func(arg, node)) {
         return false;
     }
@@ -84 +85 @@
     pxNode *child = NULL;
     while ((child = psListGetAndIncrement(iter))) {
-        // if func() returns false, pxTreeCrawl() well return false, and we
-        // should stop
-        if (!pxTreeCrawl(child, func)) {
-            return false;
-        }
+        pxTreeCrawl(child, func, arg);
     }
     psFree(iter);
@@ -94 +91 @@
     return true;
 }
+
+bool pxNodeFuncCountDependants(void *arg, pxNode *node)
+{
+    (*(int *)arg)++;
+    return true;
+}
+
+bool pxNodeHasChildren(pxNode *node)
+{
+    int children = psListLength(node->children);
+
+    return children ? true : false;
+}
+
+bool pxNodeHasGrandChildren(pxNode *node)
+{
+    // find out how many nodes there are lower in the tree
+    // subtract the parent node from the count so we have just a tally of
+    // decendants
+    int nodes = -1;
+    pxTreeCrawl(node, pxNodeFuncCountDependants, &nodes);
+    psTrace("pxtree", PS_LOG_INFO, "node %s has %d dependants", node->name, nodes);
+
+    // find out how many children this node has
+    int children = psListLength(node->children);
+    psTrace("pxtree", PS_LOG_INFO, "node %s has %d children", node->name, children);
+
+    if (!children) {
+        // no children
+        return false;
+    }
+
+    if (nodes < children) {
+        psAbort("you can't have fewer children than decendants!");
+    }
+
+    if (nodes == children) {
+        // no grandchildren
+        return false;
+    }
+
+    return true;
+}

trunk/ippTools/src/pxtree.h

@@ -33 +33 @@
 } pxNode;
 
-typedef bool (*pxNodeFunc)(pxNode *node);
+typedef bool (*pxNodeFunc)(void *arg, pxNode *node);
 
 pxNode *pxNodeAlloc(
@@ -47 +47 @@
 bool pxTreeCrawl(
     pxNode  *node,
-    pxNodeFunc func
+    pxNodeFunc func,
+    void    *arg
 );
+
+bool pxNodeFuncCountDependants(void *arg, pxNode *node);
+
+bool pxNodeHasChildren(pxNode *node);
+
+bool pxNodeHasGrandChildren(pxNode *node);
+
 
 /*