count leaves

[germs.git] / src / componenttree.h

diff --git a/src/componenttree.h b/src/componenttree.h
index 7a99c91614f6baa6f1f65b0642e923965e6d24b8..aad4ddbdd076cc4c6c5cbb42437f1c61199696fd 100644 (file)
--- a/src/componenttree.h
+++ b/src/componenttree.h
@@ -24,8 +24,6 @@
 #include <vector>
 #include "misc.h"
 
-class ComponentTreeTest;
-
 class ComponentTree {
        public:
                struct Node {
@@ -36,16 +34,32 @@ class ComponentTree {
                        Component _comp;
                        std::vector<Node*> _children;
                };
+
+               /**
+                * Creates a component tree from a list of components.
+                */
                ComponentTree(const std::vector<Component>& components);
 
                ~ComponentTree();
 
+               /**
+                * Transforms the tree into the minimal tree containing all unoriented componentes.
+                * \todo come up with a better name
+                */
+               void makeUnoriented();
+
+               size_t countLeaves();
+
        private:
                //Disable these, at least for now.
                void operator=(const ComponentTree&){};
-               ComponentTree(const ComponentTree&): _root(0,Component()){};
+               ComponentTree(const ComponentTree&): _root(0){};
+
+               void removeOriented(Node* n);
+               size_t countLeaves(Node* n);
+
+               Node* _root;
 
-               Node _root;
        friend class ComponentTreeTest;
 };