Merge last trunk modifications

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

Former-commit-id: 8af39a00b9134dbcc77883412c29d7184479979b

1 files changed, 0 insertions, 26 deletions

diff --git a/src/Bottleneck/test/bottleneck_unit_test.cpp b/src/Bottleneck/test/bottleneck_unit_test.cpp
deleted file mode 100644
index c60f5d8a..00000000
--- a/src/Bottleneck/test/bottleneck_unit_test.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE "bottleneck"
-#include <boost/test/unit_test.hpp>
-
-#include "gudhi/Graph_matching.h"
-#include <iostream>
-
-using namespace Gudhi::bottleneck;
-
-BOOST_AUTO_TEST_CASE(random_diagrams) {
-  int n = 100;
-  // Random construction
-  std::vector< std::pair<double, double> > v1, v2;
-  for (int i = 0; i < n; i++) {
-    int a = rand() % n;
-    v1.emplace_back(a, a + rand() % (n - a));
-    int b = rand() % n;
-    v2.emplace_back(b, b + rand() % (n - b));
-  }
-  // v1 and v2 are persistence diagrams containing each 100 randoms points.
-  double b = bottleneck_distance(v1, v2, 0);
-  //
-  std::cout << b << std::endl;
-  const double EXPECTED_DISTANCE = 98.5;
-  BOOST_CHECK(b == EXPECTED_DISTANCE);
-}