Remove debugging and add doc

kdtree/kdtree.pyx

@@ -96,7 +96,6 @@ cdef cypclass Node activable:
         self.n_dims = n_dims
 
         if (depth < 0) or (end - start <= 1):
-            printf("build_node: Adding %d\n", end - start)
             self.counter.add(NULL, end - start)
             return
 
@@ -116,6 +115,10 @@ cdef cypclass Node activable:
                               mid, end)
 
 cdef cypclass Counter activable:
+    """ A simple Counter.
+    
+    Useful for synchronisation, as it can be used as a barrier.
+    """
 
     I_t n
 
@@ -125,12 +128,12 @@ cdef cypclass Counter activable:
         self._active_queue_class = consume BatchMailBox(scheduler)
 
     void add(self, I_t value):
-        printf("Counter: Adding %d\n", value)
         self.n += value
-        printf("Counter: Current val: %d\n", self.n)
+
+    void reset(self):
+        self.n = 0
 
     I_t value(self):
-        printf("Counter: Getting %d\n", self.n)
         return self.n
 
 cdef cypclass KDTree:
@@ -185,7 +188,7 @@ cdef cypclass KDTree:
         global scheduler
         scheduler = Scheduler()
 
-        self.initialised_vec_counter = active Counter()
+        self.initialised_vec_counter = consume Counter()
         self.root = consume Node(self.initialised_vec_counter)
         if self.root is NULL:
             printf("Error consuming node\n")
@@ -201,12 +204,9 @@ cdef cypclass KDTree:
 
 
         initialised = self.initialised_vec_counter.value(NULL).getIntResult()
-        printf("Updated: %d / %d\n", initialised, self.n)
         while(initialised < self.n):
             initialised = self.initialised_vec_counter.value(NULL).getIntResult()
-            printf("Updated: %d / %d\n", initialised, self.n)
 
-        printf("!Updated: %d / %d\n", initialised, self.n)
         scheduler.finish()
 
 

kdtree/main.py

@@ -2,11 +2,11 @@ import numpy as np
 import kdtree
 
 if __name__ == "__main__":
-    n, d = 1000000, 2
+    n, d = 1000000, 10
     golden_ratio = (1 + 5 ** 0.5) / 2
     X = np.zeros((n, d))
     for i in range(n):
         X[i, 0] = (i / golden_ratio) % 1
         X[i, 1] = i / n
-    tree = kdtree.KDTree(X, depth=10)
+    tree = kdtree.KDTree(X, depth=2)
     del tree