diff options
| author | Arnur Nigmetov <a.nigmetov@gmail.com> | 2016-09-05 13:32:05 +0200 |
|---|---|---|
| committer | Arnur Nigmetov <a.nigmetov@gmail.com> | 2016-09-05 13:32:05 +0200 |
| commit | 7b850b8ee43fb7f8a0b2a1565ed01102d40b0a14 (patch) | |
| tree | 171852c6acd2c8be4390c53a52debf70ca4930b3 /geom_bottleneck/bottleneck/include/ANN/kd_tree.h | |
| parent | d1cf630f193cff61c83999600550634032ed1739 (diff) | |
Technical changes for R integration
Avoid including iostream (R complains about that). All output protected by
preprocessor directive (R checker should not see an instance of std::cout << in
your code). Also added getWassersteinCost to be in line with the Dionysus
implementation used in TDA.
Diffstat (limited to 'geom_bottleneck/bottleneck/include/ANN/kd_tree.h')
| -rw-r--r-- | geom_bottleneck/bottleneck/include/ANN/kd_tree.h | 7 |
1 files changed, 7 insertions, 0 deletions
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 |