Changeset c9fda30 in tol

Timestamp:

Oct 5, 2012, 7:23:31 AM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

b27f505

Parents:

2113aeb

Message:

Fixes #1604
The true number of reference points is tree->size, that is a private member of tol_kdtree. So a new method tol_kdtree::get_size() is created to access it

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@5213 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/contrib/ANN/tolANN.cpp (modified) (2 diffs)

tol/contrib/ANN/tolANN.cpp

@@ -64 +64 @@
   
   int get_dim( ) { return tree->theDim( ); }
+  int get_size( ) { return size; }
   
   static double code_addr( tol_kdtree* ptr )
@@ -184 +185 @@
   if ( dK.IsUnknown( ) || 
       (dK.Value() <= 0) || 
-      (dK.Value() > qpoints.Rows()) ) {
+      (dK.Value() > tree->get_size()) ) {
     Error( I2( "Invalid k argument: must be positive and lesser or equal than "
                "number of reference points.",
                "Argumento k es invalido: debe ser positivo y menor o igual que "
-               "el número de puntos de referencia." ) );
+               "el número de puntos de referencia." )+"\n"+
+           "(0<(k="+dK+")<="+tree->get_size()+")==False" );
     return;
   }
+
   int k = int( round( dK.Value( ) ) );
   ANNpoint pt = annAllocPt( tree->get_dim(), 0.0 );