Merge last trunk modifications

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/rips_complex_from_correlation_matrix@2725 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 78f35b92214c207f00b26ea87ca88d20abeea53d

2 files changed, 10 insertions, 10 deletions

diff --git a/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp b/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp
index 1408681a..24d73c57 100644
--- a/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp
+++ b/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp
@@ -25,21 +25,21 @@
 #include <iostream>
 #include <vector>
 #include <utility>  // for pair
-#include <fstream>
-#include <sstream>
 #include <string>
+#include <limits>  // for numeric_limits
 
 int main(int argc, char** argv) {
   if (argc < 3) {
-    std::cout << "To run this program please provide as an input two files with persistence diagrams. Each file " <<
-        "should contain a birth-death pair per line. Third, optional parameter is an error bound on a bottleneck" <<
-        " distance (set by default to zero). The program will now terminate \n";
+    std::cout << "To run this program please provide as an input two files with persistence diagrams. Each file" <<
+        " should contain a birth-death pair per line. Third, optional parameter is an error bound on a bottleneck" <<
+        " distance (set by default to the smallest positive double value). If you set the error bound to 0, be" <<
+        " aware this version is exact but expensive. The program will now terminate \n";
     return -1;
   }
   std::vector<std::pair<double, double>> diag1 = Gudhi::read_persistence_intervals_in_dimension(argv[1]);
   std::vector<std::pair<double, double>> diag2 = Gudhi::read_persistence_intervals_in_dimension(argv[2]);
 
-  double tolerance = 0.;
+  double tolerance = std::numeric_limits<double>::min();
   if (argc == 4) {
     tolerance = atof(argv[3]);
   }
diff --git a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h
index bdc47578..a6b9b021 100644
--- a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h
+++ b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h
@@ -44,16 +44,16 @@ struct Square_query {
   typedef Internal_point Point_d;
   typedef double FT;
   bool contains(Point_d p) const {
-    return std::abs(p.x()-c.x())<=size && std::abs(p.y()-c.y())<=size;
+    return std::abs(p.x()-c.x()) <= size && std::abs(p.y()-c.y()) <= size;
   }
-  bool inner_range_intersects(CGAL::Kd_tree_rectangle<FT,D> const&r) const {
+  bool inner_range_intersects(CGAL::Kd_tree_rectangle<FT, D> const&r) const {
     return
       r.max_coord(0) >= c.x() - size &&
       r.min_coord(0) <= c.x() + size &&
       r.max_coord(1) >= c.y() - size &&
       r.min_coord(1) <= c.y() + size;
   }
-  bool outer_range_contains(CGAL::Kd_tree_rectangle<FT,D> const&r) const {
+  bool outer_range_contains(CGAL::Kd_tree_rectangle<FT, D> const&r) const {
     return
       r.min_coord(0) >= c.x() - size &&
       r.max_coord(0) <= c.x() + size &&
@@ -146,7 +146,7 @@ inline int Neighbors_finder::pull_near(int u_point_index) {
     // Is the query point near to a V point in the plane ?
     Internal_point u_point = g.get_u_point(u_point_index);
     auto neighbor = kd_t.search_any_point(Square_query{u_point, r});
-    if(!neighbor)
+    if (!neighbor)
       return null_point_index();
     tmp = neighbor->point_index;
     auto point = g.get_v_point(tmp);