graph no longer static

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

Former-commit-id: 6bbb8dfaffd09a81ccafac6919e073ed74b9c7e6

1 files changed, 49 insertions, 43 deletions

diff --git a/src/Bottleneck_distance/test/bottleneck_unit_test.cpp b/src/Bottleneck_distance/test/bottleneck_unit_test.cpp
index 7edfa062..2237b073 100644
--- a/src/Bottleneck_distance/test/bottleneck_unit_test.cpp
+++ b/src/Bottleneck_distance/test/bottleneck_unit_test.cpp
@@ -34,11 +34,13 @@ int n1 = 81; // a natural number >0
 int n2 = 180; // a natural number >0
 double upper_bound = 406.43; // any real >0
 
+
+std::uniform_real_distribution<double> unif(0.,upper_bound);
+std::default_random_engine re;
+std::vector< std::pair<double, double> > v1, v2;
+
 BOOST_AUTO_TEST_CASE(persistence_diagrams_graph){
     // Random construction
-    std::uniform_real_distribution<double> unif(0.,upper_bound);
-    std::default_random_engine re;
-    std::vector< std::pair<double, double> > v1, v2;
     for (int i = 0; i < n1; i++) {
         double a = unif(re);
         double b = unif(re);
@@ -49,83 +51,87 @@ BOOST_AUTO_TEST_CASE(persistence_diagrams_graph){
         double b = unif(re);
         v2.emplace_back(std::min(a,b), std::max(a,b));
     }
-    G::initialize(v1, v2, 0.);
-    std::vector<double> d(G::sorted_distances());
+    Persistence_graph g(v1, v2, 0.);
+    std::vector<double> d(g.sorted_distances());
     //
-    BOOST_CHECK(!G::on_the_u_diagonal(n1-1));
-    BOOST_CHECK(!G::on_the_u_diagonal(n1));
-    BOOST_CHECK(!G::on_the_u_diagonal(n2-1));
-    BOOST_CHECK(G::on_the_u_diagonal(n2));
-    BOOST_CHECK(!G::on_the_v_diagonal(n1-1));
-    BOOST_CHECK(G::on_the_v_diagonal(n1));
-    BOOST_CHECK(G::on_the_v_diagonal(n2-1));
-    BOOST_CHECK(G::on_the_v_diagonal(n2));
+    BOOST_CHECK(!g.on_the_u_diagonal(n1-1));
+    BOOST_CHECK(!g.on_the_u_diagonal(n1));
+    BOOST_CHECK(!g.on_the_u_diagonal(n2-1));
+    BOOST_CHECK(g.on_the_u_diagonal(n2));
+    BOOST_CHECK(!g.on_the_v_diagonal(n1-1));
+    BOOST_CHECK(g.on_the_v_diagonal(n1));
+    BOOST_CHECK(g.on_the_v_diagonal(n2-1));
+    BOOST_CHECK(g.on_the_v_diagonal(n2));
     //
-    BOOST_CHECK(G::corresponding_point_in_u(0)==n2);
-    BOOST_CHECK(G::corresponding_point_in_u(n1)==0);
-    BOOST_CHECK(G::corresponding_point_in_v(0)==n1);
-    BOOST_CHECK(G::corresponding_point_in_v(n2)==0);
+    BOOST_CHECK(g.corresponding_point_in_u(0)==n2);
+    BOOST_CHECK(g.corresponding_point_in_u(n1)==0);
+    BOOST_CHECK(g.corresponding_point_in_v(0)==n1);
+    BOOST_CHECK(g.corresponding_point_in_v(n2)==0);
     //
-    BOOST_CHECK(G::size()==(n1+n2));
+    BOOST_CHECK(g.size()==(n1+n2));
     //
     BOOST_CHECK((int) d.size() <= (n1+n2)*(n1+n2) - n1*n2 + 1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance(0,0))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance(0,n1-1))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance(0,n1))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance(0,n2-1))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance(0,n2))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance(0,(n1+n2)-1))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance(n1,0))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance(n1,n1-1))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance(n1,n1))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance(n1,n2-1))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance(n1,n2))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance(n1,(n1+n2)-1))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance((n1+n2)-1,0))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance((n1+n2)-1,n1-1))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance((n1+n2)-1,n1))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance((n1+n2)-1,n2-1))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance((n1+n2)-1,n2))==1);
-    BOOST_CHECK(std::count(d.begin(), d.end(), G::distance((n1+n2)-1,(n1+n2)-1))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance(0,0))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance(0,n1-1))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance(0,n1))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance(0,n2-1))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance(0,n2))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance(0,(n1+n2)-1))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance(n1,0))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance(n1,n1-1))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance(n1,n1))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance(n1,n2-1))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance(n1,n2))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance(n1,(n1+n2)-1))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance((n1+n2)-1,0))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance((n1+n2)-1,n1-1))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance((n1+n2)-1,n1))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance((n1+n2)-1,n2-1))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance((n1+n2)-1,n2))==1);
+    BOOST_CHECK(std::count(d.begin(), d.end(), g.distance((n1+n2)-1,(n1+n2)-1))==1);
 }
 
 BOOST_AUTO_TEST_CASE(neighbors_finder) {
-    Neighbors_finder nf(1.);
+    Persistence_graph g(v1, v2, 0.);
+    Neighbors_finder nf(g, 1.);
     for(int v_point_index=1; v_point_index<((n2+n1)*9/10); v_point_index+=2)
         nf.add(v_point_index);
     //
     int v_point_index_1 = nf.pull_near(n2/2);
-    BOOST_CHECK((v_point_index_1 == -1) || (G::distance(n2/2,v_point_index_1)<=1.));
+    BOOST_CHECK((v_point_index_1 == -1) || (g.distance(n2/2,v_point_index_1)<=1.));
     std::vector<int> l = nf.pull_all_near(n2/2);
     bool v = true;
     for(auto it = l.cbegin(); it != l.cend(); ++it)
-        v = v && (G::distance(n2/2,*it)>1.);
+        v = v && (g.distance(n2/2,*it)>1.);
     BOOST_CHECK(v);
     int v_point_index_2 = nf.pull_near(n2/2);
     BOOST_CHECK(v_point_index_2 == -1);
 }
 
 BOOST_AUTO_TEST_CASE(layered_neighbors_finder) {
-    Layered_neighbors_finder lnf(1.);
+    Persistence_graph g(v1, v2, 0.);
+    Layered_neighbors_finder lnf(g, 1.);
     for(int v_point_index=1; v_point_index<((n2+n1)*9/10); v_point_index+=2)
         lnf.add(v_point_index, v_point_index % 7);
     //
     int v_point_index_1 = lnf.pull_near(n2/2,6);
-    BOOST_CHECK((v_point_index_1 == -1) || (G::distance(n2/2,v_point_index_1)<=1.));
+    BOOST_CHECK((v_point_index_1 == -1) || (g.distance(n2/2,v_point_index_1)<=1.));
     int v_point_index_2 = lnf.pull_near(n2/2,6);
     BOOST_CHECK(v_point_index_2 == -1);
     v_point_index_1 = lnf.pull_near(n2/2,0);
-    BOOST_CHECK((v_point_index_1 == -1) || (G::distance(n2/2,v_point_index_1)<=1.));
+    BOOST_CHECK((v_point_index_1 == -1) || (g.distance(n2/2,v_point_index_1)<=1.));
     v_point_index_2 = lnf.pull_near(n2/2,0);
     BOOST_CHECK(v_point_index_2 == -1);
 }
 
 BOOST_AUTO_TEST_CASE(graph_matching) {
-    Graph_matching m1;
+    Persistence_graph g(v1, v2, 0.);
+    Graph_matching m1(g);
     m1.set_r(0.);
     int e  = 0;
     while (m1.multi_augment())
         ++e;
+    BOOST_CHECK(e > 0);
     BOOST_CHECK(e <= 2*sqrt(2*(n1+n2)));
     Graph_matching m2 = m1;
     BOOST_CHECK(!m2.multi_augment());