Merge branch 'dev' into alpha

larc · Sep 21, 2023 · 8476f9f · 8476f9f
2 parents 8a93e54 + 89edb18
commit 8476f9f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,6 @@ jobs:
         sudo apt update
         sudo apt install \
                           libarmadillo-dev \
-                          libflann-dev \
                           libeigen3-dev \
                           libcgal-dev \
                           libsuitesparse-dev \
@@ -36,6 +35,11 @@ jobs:
                           libglfw3-dev \
                           cimg-dev \
                           wget
+        wget http://mirrors.kernel.org/ubuntu/pool/universe/f/flann/libflann-dev_1.9.2+dfsg-1_amd64.deb
+        wget http://mirrors.kernel.org/ubuntu/pool/universe/f/flann/libflann1.9_1.9.2+dfsg-1_amd64.deb
+        sudo dpkg -i libflann1.9_1.9.2+dfsg-1_amd64.deb
+        sudo dpkg -i libflann-dev_1.9.2+dfsg-1_amd64.deb
+        sudo apt install -f
 
     - name: Install Cuda
       if: matrix.cuda == 'cuda'

diff --git a/include/gproshan/pointcloud/knn.h b/include/gproshan/pointcloud/knn.h
@@ -58,7 +58,9 @@ class k3tree
 		k3tree(const point * pc, const size_t & n_points, const size_t & k = 8, const std::vector<point> & query = {});
 		~k3tree();
 
-		int * operator () (const index_t & i) const;
+		const int * operator [] (const index_t & i) const;
+		const int * operator () (const index_t & i) const;
+		const int & operator () (const index_t & i, const index_t & j) const;
 };
 
 

diff --git a/src/gproshan/app_viewer.cpp b/src/gproshan/app_viewer.cpp
@@ -161,7 +161,7 @@ bool app_viewer::process_knn(viewer * p_view)
 				for(const index_t & p: query)
 				{
 					const int * result = k3tree(p);
-					for(index_t i = 0; i < 8; ++i)
+					for(int i = 0; i < k; ++i)
 						mesh.selected.push_back(result[i]);
 				}
 			}

diff --git a/src/gproshan/pointcloud/knn.cpp b/src/gproshan/pointcloud/knn.cpp
@@ -108,11 +108,21 @@ k3tree::~k3tree()
 	delete [] indices.ptr();
 }
 
-int * k3tree::operator () (const index_t & i) const
+const int * k3tree::operator [] (const index_t & i) const
 {
 	return indices[i];
 }
 
+const int * k3tree::operator () (const index_t & i) const
+{
+	return indices[i];
+}
+
+const int & k3tree::operator () (const index_t & i, const index_t & j) const
+{
+	return indices[i][j];
+}
+
 
 } // namespace gproshan