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/bd_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/bd_tree.h')
-rw-r--r-- | geom_bottleneck/bottleneck/include/ANN/bd_tree.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 |