nearest_neighbor_graph_ann: remove a level of indirection on array parameters

None of these parameters are updated during `nearest_neighbor_graph_ann`, so
taking them by pointer is irrelevant.

diff --git a/lib/mingle/nearest_neighbor_graph.cpp b/lib/mingle/nearest_neighbor_graph.cpp
index b74e3dbdfe5773dfd6ca7fd1e25b3e39212cc2d1..d1b9df67ec20fe8ef21e00b234d8a367f08e5775 100644 (file)
--- a/lib/mingle/nearest_neighbor_graph.cpp
+++ b/lib/mingle/nearest_neighbor_graph.cpp
@@ -37,7 +37,7 @@ SparseMatrix nearest_neighbor_graph(int nPts, int num_neigbors, double *x, doubl
   val =  (double*)MALLOC(sizeof(double)*nPts*k*2);
 
 #ifdef HAVE_ANN
-  nearest_neighbor_graph_ann(nPts, num_neigbors, eps, x, &nz, &irn, &jcn, &val);
+  nearest_neighbor_graph_ann(nPts, num_neigbors, eps, x, &nz, irn, jcn, val);
 
   A = SparseMatrix_from_coordinate_arrays(nz, nPts, nPts, irn, jcn, val, MATRIX_TYPE_REAL, sizeof(double));
 #else

diff --git a/lib/mingle/nearest_neighbor_graph_ann.cpp b/lib/mingle/nearest_neighbor_graph_ann.cpp
index 26dc7a5706355a2c7dec51c580dc108374dfcdfc..eb892d689b631ef4ecf18b05dccdf333f9cdc9f6 100644 (file)
--- a/lib/mingle/nearest_neighbor_graph_ann.cpp
+++ b/lib/mingle/nearest_neighbor_graph_ann.cpp
@@ -50,7 +50,7 @@ static void sortPtsY(int n, ANNpointArray pts){
   }
 }
 
-void nearest_neighbor_graph_ann(int nPts, int k, double eps, double *x, int *nz0, int **irn0, int **jcn0, double **val0){
+void nearest_neighbor_graph_ann(int nPts, int k, double eps, double *x, int *nz0, int *irn0, int *jcn0, double *val0){
 
   /* Gives a nearest neighbor graph is a list of dim-dimendional points. The connectivity is in irn/jcn, and the distance in val.
      
@@ -66,9 +66,9 @@ void nearest_neighbor_graph_ann(int nPts, int k, double eps, double *x, int *nz0
     note that there could be repeates
   */
 
-  int *irn = *irn0;
-  int *jcn = *jcn0;
-  double *val = *val0;
+  int *irn = irn0;
+  int *jcn = jcn0;
+  double *val = val0;
 
 
   ANNpointArray dataPts = annAllocPts(nPts, dim);                      // allocate data points

diff --git a/lib/mingle/nearest_neighbor_graph_ann.h b/lib/mingle/nearest_neighbor_graph_ann.h
index 2a344dc0df76a95897d4e576e6827834df165fe6..d02affcd9c5b8f56e37a7991c95097c1b7f475e9 100644 (file)
--- a/lib/mingle/nearest_neighbor_graph_ann.h
+++ b/lib/mingle/nearest_neighbor_graph_ann.h
@@ -14,7 +14,7 @@
 extern "C" {
 #endif
 
-void nearest_neighbor_graph_ann(int nPts, int k, double eps, double *x, int *nz0, int **irn0, int **jcn0, double **val0);
+void nearest_neighbor_graph_ann(int nPts, int k, double eps, double *x, int *nz0, int *irn0, int *jcn0, double *val0);
 
 #ifdef __cplusplus
 }