summaryrefslogtreecommitdiff
path: root/geom_bottleneck/bottleneck/src/neighb_oracle.cpp
diff options
context:
space:
mode:
authorArnur Nigmetov <a.nigmetov@gmail.com>2016-09-05 13:32:05 +0200
committerArnur Nigmetov <a.nigmetov@gmail.com>2016-09-05 13:32:05 +0200
commit7b850b8ee43fb7f8a0b2a1565ed01102d40b0a14 (patch)
tree171852c6acd2c8be4390c53a52debf70ca4930b3 /geom_bottleneck/bottleneck/src/neighb_oracle.cpp
parentd1cf630f193cff61c83999600550634032ed1739 (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/src/neighb_oracle.cpp')
-rw-r--r--geom_bottleneck/bottleneck/src/neighb_oracle.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/geom_bottleneck/bottleneck/src/neighb_oracle.cpp b/geom_bottleneck/bottleneck/src/neighb_oracle.cpp
index 40d043f..5005bc4 100644
--- a/geom_bottleneck/bottleneck/src/neighb_oracle.cpp
+++ b/geom_bottleneck/bottleneck/src/neighb_oracle.cpp
@@ -184,8 +184,10 @@ void NeighbOracleAnn::deletePoint(const DiagramPoint& p)
diagonalPoints.erase(p, false);
kdTree->delete_point(pointIdx);
#ifdef DEBUG_NEIGHBOUR_ORACLE
+#ifndef FOR_R_TDA
kdTree->Print(ANNtrue, std::cout);
#endif
+#endif
}
bool NeighbOracleAnn::getNeighbour(const DiagramPoint& q, DiagramPoint& result) const