From 2b61d380625afef5ceb779e3923b50e7c38fc044 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Wed, 18 Jan 2023 08:24:14 -0800 Subject: [PATCH] mingle nearest_neighbor_graph: fix typo in parameter name --- ci/clang_format.py | 1 - lib/mingle/nearest_neighbor_graph.cpp | 8 ++++---- lib/mingle/nearest_neighbor_graph.h | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/clang_format.py b/ci/clang_format.py index 92ac72b28..ba2e4cdf0 100644 --- a/ci/clang_format.py +++ b/ci/clang_format.py @@ -390,7 +390,6 @@ EXCLUDE = ( "lib/mingle/ink.cpp", "lib/mingle/ink.h", "lib/mingle/nearest_neighbor_graph.cpp", - "lib/mingle/nearest_neighbor_graph.h", "lib/mingle/nearest_neighbor_graph_ann.cpp", "lib/neatogen/adjust.c", "lib/neatogen/adjust.h", diff --git a/lib/mingle/nearest_neighbor_graph.cpp b/lib/mingle/nearest_neighbor_graph.cpp index dd65b8eed..bd1f6ab2a 100644 --- a/lib/mingle/nearest_neighbor_graph.cpp +++ b/lib/mingle/nearest_neighbor_graph.cpp @@ -16,12 +16,12 @@ #include #include -SparseMatrix nearest_neighbor_graph(int nPts, int num_neigbors, double *x, double eps){ +SparseMatrix nearest_neighbor_graph(int nPts, int num_neighbors, double *x, double eps){ /* Gives a nearest neighbor graph of a list of dim-dimendional points. The result is a sparse matrix of nPts x nPts, with num_neigbors entries per row. nPts: number of points - num_neigbors: number of neighbors needed + num_neighbors: number of neighbors needed dim: dimension == 4 eps: error tolerance x: nPts*dim vector. The i-th point is x[i*dim : i*dim + dim - 1] @@ -29,7 +29,7 @@ SparseMatrix nearest_neighbor_graph(int nPts, int num_neigbors, double *x, doubl */ int nz; SparseMatrix A; - int k = num_neigbors; + int k = num_neighbors; #ifdef HAVE_ANN /* need to *2 as we do two sweeps of neighbors, so could have repeats */ @@ -37,7 +37,7 @@ SparseMatrix nearest_neighbor_graph(int nPts, int num_neigbors, double *x, doubl std::vector jcn(nPts * k * 2); std::vector val(nPts * k * 2); - nearest_neighbor_graph_ann(nPts, num_neigbors, eps, x, nz, irn, jcn, val); + nearest_neighbor_graph_ann(nPts, num_neighbors, eps, x, nz, irn, jcn, val); A = SparseMatrix_from_coordinate_arrays(nz, nPts, nPts, irn.data(), jcn.data(), val.data(), diff --git a/lib/mingle/nearest_neighbor_graph.h b/lib/mingle/nearest_neighbor_graph.h index 6d26cb76d..179b18d89 100644 --- a/lib/mingle/nearest_neighbor_graph.h +++ b/lib/mingle/nearest_neighbor_graph.h @@ -10,4 +10,5 @@ #pragma once -SparseMatrix nearest_neighbor_graph(int nPts, int num_neigbors, double *x, double eps); +SparseMatrix nearest_neighbor_graph(int nPts, int num_neighbors, double *x, + double eps); -- 2.40.0