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.

1 files changed, 4 insertions, 2 deletions

diff --git a/geom_matching/wasserstein/include/auction_runner_gs.h b/geom_matching/wasserstein/include/auction_runner_gs.h
index 34a91e8..80aa9f0 100644
--- a/geom_matching/wasserstein/include/auction_runner_gs.h
+++ b/geom_matching/wasserstein/include/auction_runner_gs.h
@@ -76,8 +76,9 @@ public:
                     const double _initialEpsilon,
                     const double _epsFactor);
     void setEpsilon(double newVal) { assert(epsilon > 0.0); epsilon = newVal; };
-    double getEpsilon(void) const { return epsilon; }
-    double getWassersteinDistance(void);
+    double getEpsilon() const { return epsilon; }
+    double getWassersteinDistance();
+    double getWassersteinCost();
     static constexpr int maxIterNum { 25 }; // maximal number of iterations of epsilon-scaling
 private:
     // private data
@@ -94,6 +95,7 @@ private:
     double epsilonCommonRatio; // next epsilon = current epsilon / epsilonCommonRatio
     double weightAdjConst;
     double wassersteinDistance;
+    double wassersteinCost;
     // to get the 2 best items
     std::unique_ptr<AuctionOracle> oracle;
 #ifdef KEEP_UNASSIGNED_ORDERED