Fixed l library typos.

library/NNSearch_experimental.py

@@ -20,8 +20,8 @@ nbhLib = cdll.LoadLibrary("./library/c/libNeighborhood.so")
 nbhLib.Neighborhood.rettype = None
 nbhLib.Neighborhood.argtypes = [c_uint, c_uint, c_uint, array_2d_double, array_2d_uint]
 
-nbhLib.NeighborhoodHeuristic.rettype = None
-nbhLib.NeighborhoodHeuristic.argtypes = [c_uint, c_uint, c_uint, array_2d_double, array_2d_uint]
+#nbhLib.NeighborhoodHeuristic.rettype = None
+#nbhLib.NeighborhoodHeuristic.argtypes = [c_uint, c_uint, c_uint, array_2d_double, array_2d_uint]
 
 
 
@@ -241,19 +241,19 @@ class NNSearch:
         self.neighbourhoods = list(nbh)
         self.timerStop("NN_fit_cLib_list")
 
-    def fit_cLibHeuristic(self, X, nebSize=None):
-        self.timerStart("NN_fit_cLib_init")
-        if nebSize == None:
-            nebSize = self.nebSize
-        
-        nbh = np.array([np.zeros(nebSize, dtype=np.uint) for i in range(X.shape[0])])
-        self.timerStop("NN_fit_cLib_init")
-        self.timerStart("NN_fit_cLib_call")
-        nbhLib.NeighborhoodHeuristic(nebSize, X.shape[0], X.shape[1], X, nbh)
-        self.timerStop("NN_fit_cLib_call")
-        self.timerStart("NN_fit_cLib_list")
-        self.neighbourhoods = list(nbh)
-        self.timerStop("NN_fit_cLib_list")
+    # def fit_cLibHeuristic(self, X, nebSize=None):
+    #     self.timerStart("NN_fit_cLib_init")
+    #     if nebSize == None:
+    #         nebSize = self.nebSize
+    #     
+    #     nbh = np.array([np.zeros(nebSize, dtype=np.uint) for i in range(X.shape[0])])
+    #     self.timerStop("NN_fit_cLib_init")
+    #     self.timerStart("NN_fit_cLib_call")
+    #     nbhLib.NeighborhoodHeuristic(nebSize, X.shape[0], X.shape[1], X, nbh)
+    #     self.timerStop("NN_fit_cLib_call")
+    #     self.timerStart("NN_fit_cLib_list")
+    #     self.neighbourhoods = list(nbh)
+    #     self.timerStop("NN_fit_cLib_list")
         
 
     # ===============================================================

library/c/Makefile

@@ -1,4 +1,4 @@
-c_files = Neighborhood.c Heuristic.c utils.c MaxHeap.c
+c_files = Neighborhood.c utils.c MaxHeap.c
 h_files = Neighborhood.h utils.h MaxHeap.h types.h
 
 

library/c/Neighborhood.c

@@ -3,7 +3,7 @@
 #include "MaxHeap.h"
 #include "utils.h"
 
-#define Point(i)    (&(data[i * nFeatures]))
+#define Point(i)    (&(params->data[i * params->nFeatures]))
 
 
 void nbhSearchBruteForce(SearchParams * params) {
@@ -11,15 +11,15 @@ void nbhSearchBruteForce(SearchParams * params) {
     pyReal d;
 
     // Berechne alle Distanzen
-    for(i = 0; i < nPoints; i ++) {
+    for(i = 0; i < params->nPoints; i ++) {
         const pyReal *x = Point(i);
         
-        for(j = i + 1; j < nPoints; j ++) {
+        for(j = i + 1; j < params->nPoints; j ++) {
             const pyReal * y = Point(j);
-            d = distSquared(x, y, nFeatures);
+            d = distSquared(x, y, params->nFeatures);
             
-            maxHeap_insert(&(params.nbhHeaps.heaps[i]), j, d);
-            maxHeap_insert(&(params.nbhHeaps.heaps[j]), i, d);
+            maxHeap_insert(&(params->nbhHeaps.heaps[i]), j, d);
+            maxHeap_insert(&(params->nbhHeaps.heaps[j]), i, d);
         }
     }
 }
@@ -38,7 +38,7 @@ void Neighborhood(const pyWord nbhSize, const pyWord nPoints, const pyWord nFeat
         return;
     }
 
-    nbhSearchBruteForce(params);
+    nbhSearchBruteForce(&params);
     
     freeNbhHeaps(&params);
 }