diff options
Diffstat (limited to 'geom_bottleneck/bottleneck/include/ANN')
| -rw-r--r-- | geom_bottleneck/bottleneck/include/ANN/ANN.h | 13 | ||||
| -rw-r--r-- | geom_bottleneck/bottleneck/include/ANN/bd_tree.h | 3 | ||||
| -rw-r--r-- | geom_bottleneck/bottleneck/include/ANN/kd_tree.h | 7 |
3 files changed, 22 insertions, 1 deletions
diff --git a/geom_bottleneck/bottleneck/include/ANN/ANN.h b/geom_bottleneck/bottleneck/include/ANN/ANN.h index cd48d8e..004dfe2 100644 --- a/geom_bottleneck/bottleneck/include/ANN/ANN.h +++ b/geom_bottleneck/bottleneck/include/ANN/ANN.h @@ -96,7 +96,6 @@ #include <cstdlib> // standard lib includes #include <cmath> // math includes -#include <iostream> // I/O streams #include <cstring> // C-style strings #include <vector> #include <assert.h> @@ -130,6 +129,12 @@ #define ANNcopyright "David M. Mount and Sunil Arya" #define ANNlatestRev "Jan 27, 2010" +#include "def_debug_bt.h" + +#ifndef FOR_R_TDA +#include <iostream> // I/O streams +#endif + namespace geom_bt { //---------------------------------------------------------------------- // ANNbool @@ -798,8 +803,10 @@ public: int bs = 1, // bucket size ANNsplitRule split = ANN_KD_SUGGEST); // splitting method +#ifndef FOR_R_TDA ANNkd_tree( // build from dump file std::istream& in); // input stream for dump file +#endif ~ANNkd_tree(); // tree destructor @@ -834,6 +841,7 @@ public: ANNpointArray thePoints() // return pointer to points { return pts; } +#ifndef FOR_R_TDA virtual void Print( // print the tree (for debugging) ANNbool with_pts, // print points as well? std::ostream& out); // output stream @@ -841,6 +849,7 @@ public: virtual void Dump( // dump entire tree ANNbool with_pts, // print points as well? std::ostream& out); // output stream +#endif virtual void getStats( // compute tree statistics ANNkdStats& st); // the statistics (modified) @@ -885,8 +894,10 @@ public: ANNsplitRule split = ANN_KD_SUGGEST, // splitting rule ANNshrinkRule shrink = ANN_BD_SUGGEST); // shrinking rule +#ifndef FOR_R_TDA ANNbd_tree( // build from dump file std::istream& in); // input stream for dump file +#endif }; //---------------------------------------------------------------------- diff --git a/geom_bottleneck/bottleneck/include/ANN/bd_tree.h b/geom_bottleneck/bottleneck/include/ANN/bd_tree.h index 0791429..38cecb7 100644 --- a/geom_bottleneck/bottleneck/include/ANN/bd_tree.h +++ b/geom_bottleneck/bottleneck/include/ANN/bd_tree.h @@ -29,6 +29,7 @@ #include <ANN/ANNx.h> // all ANN includes #include "kd_tree.h" // kd-tree includes +#include "def_debug_bt.h" namespace geom_bt { //---------------------------------------------------------------------- @@ -91,7 +92,9 @@ public: ANNkdStats &st, // statistics ANNorthRect &bnd_box); // bounding box virtual void print(int level, ostream &out);// print node +#ifndef FOR_R_TDA virtual void dump(ostream &out); // dump node +#endif virtual void ann_search(ANNdist); // standard search virtual void ann_pri_search(ANNdist); // priority search diff --git a/geom_bottleneck/bottleneck/include/ANN/kd_tree.h b/geom_bottleneck/bottleneck/include/ANN/kd_tree.h index 5fb362d..a1e53e5 100644 --- a/geom_bottleneck/bottleneck/include/ANN/kd_tree.h +++ b/geom_bottleneck/bottleneck/include/ANN/kd_tree.h @@ -31,6 +31,7 @@ #include <utility> // for std::pair #include <ANN/ANNx.h> // all ANN includes +#include "def_debug_bt.h" using namespace std; // make std:: available @@ -73,7 +74,9 @@ public: ANNorthRect &bnd_box) = 0; // bounding box // print node virtual void print(int level, ostream &out) = 0; +#ifndef FOR_R_TDA virtual void dump(ostream &out) = 0; // dump node +#endif friend class ANNkd_tree; // allow kd-tree to access us @@ -139,7 +142,9 @@ public: ANNkdStats &st, // statistics ANNorthRect &bnd_box); // bounding box virtual void print(int level, ostream &out);// print node +#ifndef FOR_R_TDA virtual void dump(ostream &out); // dump node +#endif virtual void ann_search(ANNdist); // standard search virtual void ann_pri_search(ANNdist); // priority search @@ -217,7 +222,9 @@ public: ANNkdStats &st, // statistics ANNorthRect &bnd_box); // bounding box virtual void print(int level, ostream &out);// print node +#ifndef FOR_R_TDA virtual void dump(ostream &out); // dump node +#endif virtual void ann_search(ANNdist); // standard search virtual void ann_pri_search(ANNdist); // priority search |