namespace

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

Former-commit-id: 0d15f01525272ec8bea7436fa18dbac213becf0a

2 files changed, 7 insertions, 7 deletions

diff --git a/src/Bottleneck_distance/test/bottleneck_chrono.cpp b/src/Bottleneck_distance/test/bottleneck_chrono.cpp
index 8bd41104..f51714a2 100644
--- a/src/Bottleneck_distance/test/bottleneck_chrono.cpp
+++ b/src/Bottleneck_distance/test/bottleneck_chrono.cpp
@@ -25,7 +25,7 @@
 #include <fstream>
 #include <random>
 
-using namespace Gudhi::bottleneck_distance;
+using namespace Gudhi::persistence_diagram;
 
 
 double upper_bound = 400.; // any real >0
@@ -34,7 +34,7 @@ int main(){
     std::ofstream objetfichier;
     objetfichier.open("results.csv", std::ios::out);
 
-    for(int n = 400; n<=2000; n+=400){
+    for(int n = 1000; n<=4000; n+=1000){
     std::uniform_real_distribution<double> unif1(0.,upper_bound);
     std::uniform_real_distribution<double> unif2(upper_bound/1000.,upper_bound/100.);
     std::default_random_engine re;
@@ -52,7 +52,7 @@ int main(){
             v2.emplace_back(std::max(a,b),std::max(a,b)+y);
     }
     std::chrono::steady_clock::time_point start = std::chrono::steady_clock::now();
-    double b = compute(v1,v2, 0.00001);
+    double b = bottleneck_distance(v1,v2, 0.00001);
     std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();
     typedef std::chrono::duration<int,std::milli> millisecs_t;
     millisecs_t duration(std::chrono::duration_cast<millisecs_t>(end-start));
diff --git a/src/Bottleneck_distance/test/bottleneck_unit_test.cpp b/src/Bottleneck_distance/test/bottleneck_unit_test.cpp
index 2e67d436..fba1d369 100644
--- a/src/Bottleneck_distance/test/bottleneck_unit_test.cpp
+++ b/src/Bottleneck_distance/test/bottleneck_unit_test.cpp
@@ -28,7 +28,7 @@
 #include <random>
 #include <gudhi/Bottleneck.h>
 
-using namespace Gudhi::bottleneck_distance;
+using namespace Gudhi::persistence_diagram;
 
 int n1 = 81; // a natural number >0
 int n2 = 180; // a natural number >0
@@ -161,7 +161,7 @@ BOOST_AUTO_TEST_CASE(global){
         if(i%3==0)
             v2.emplace_back(std::max(a,b),std::max(a,b)+y);
     }
-    BOOST_CHECK(compute(v1, v2) <= upper_bound/100.);
-    BOOST_CHECK(compute(v1, v2, upper_bound/10000.) <= upper_bound/100. + upper_bound/10000.);
-    BOOST_CHECK(std::abs(compute(v1, v2) - compute(v1, v2, upper_bound/10000.)) <=  upper_bound/10000.);
+    BOOST_CHECK(bottleneck_distance(v1, v2, 0.) <= upper_bound/100.);
+    BOOST_CHECK(bottleneck_distance(v1, v2, upper_bound/10000.) <= upper_bound/100. + upper_bound/10000.);
+    BOOST_CHECK(std::abs(bottleneck_distance(v1, v2, 0.) - bottleneck_distance(v1, v2, upper_bound/10000.)) <=  upper_bound/10000.);
 }