From 4ffac47ea18e63f40e6175055166d6bf3d08cff9 Mon Sep 17 00:00:00 2001 From: fgodi Date: Mon, 29 Jun 2015 10:01:45 +0000 Subject: persistence_diagrams_graph static + others things git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneckDistance@659 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 2562cbd49534373dae6d6d23ec52ba5984080729 --- src/Bottleneck/test/bottleneck_unit_test.cpp | 134 +++++++++++++-------------- 1 file changed, 63 insertions(+), 71 deletions(-) (limited to 'src/Bottleneck/test/bottleneck_unit_test.cpp') diff --git a/src/Bottleneck/test/bottleneck_unit_test.cpp b/src/Bottleneck/test/bottleneck_unit_test.cpp index 77f45867..926c8430 100644 --- a/src/Bottleneck/test/bottleneck_unit_test.cpp +++ b/src/Bottleneck/test/bottleneck_unit_test.cpp @@ -10,25 +10,6 @@ int n1 = 81; // a natural number >0 int n2 = 180; // a natural number >0 double upper_bound = 400.5; // any real >0 -std::unique_ptr random_graph_generator(){ - // Random construction - std::uniform_real_distribution unif(0.,upper_bound); - std::default_random_engine re; - std::vector< std::pair > v1, v2; - for (int i = 0; i < n1; i++) { - double a = unif(re); - double b = unif(re); - v1.emplace_back(std::min(a,b), std::max(a,b)); - } - for (int i = 0; i < n2; i++) { - double a = unif(re); - double b = unif(re); - v2.emplace_back(std::min(a,b), std::max(a,b)); - } - return std::unique_ptr(new Persistence_diagrams_graph(v1, v2, 0.)); -} - - BOOST_AUTO_TEST_CASE(global){ std::uniform_real_distribution unif1(0.,upper_bound); std::uniform_real_distribution unif2(upper_bound/1000.,upper_bound/100.); @@ -49,51 +30,64 @@ BOOST_AUTO_TEST_CASE(global){ BOOST_CHECK(bottleneck_distance(v1, v2) <= upper_bound/100.); } - -BOOST_AUTO_TEST_CASE(persistence_diagrams_graph) { - std::unique_ptr g = std::move(random_graph_generator()); - std::unique_ptr< std::vector > d = std::move(g->sorted_distances()); +BOOST_AUTO_TEST_CASE(persistence_diagrams_graph){ + // Random construction + std::uniform_real_distribution unif(0.,upper_bound); + std::default_random_engine re; + std::vector< std::pair > v1, v2; + for (int i = 0; i < n1; i++) { + double a = unif(re); + double b = unif(re); + v1.emplace_back(std::min(a,b), std::max(a,b)); + } + for (int i = 0; i < n2; i++) { + double a = unif(re); + double b = unif(re); + v2.emplace_back(std::min(a,b), std::max(a,b)); + } + G::initialize(v1, v2, 0.); + std::unique_ptr< std::vector > d = std::move(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(planar_neighbors_finder) { - std::unique_ptr g = std::move(random_graph_generator()); - Planar_neighbors_finder pnf = Planar_neighbors_finder(*g,1.); + Planar_neighbors_finder pnf = Planar_neighbors_finder(1.); for(int v_point_index=0; v_point_indexdistance(n2/2,v_point_index_1)<=1.)); + BOOST_CHECK((v_point_index_1 == -1) || (G::distance(n2/2,v_point_index_1)<=1.)); BOOST_CHECK(!pnf.contains(v_point_index_1)); std::list l = *pnf.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 = pnf.pull_near(n2/2); BOOST_CHECK(v_point_index_2 == -1); - pnf.add(v_point_index_1); - BOOST_CHECK(pnf.contains(v_point_index_1)); } BOOST_AUTO_TEST_CASE(neighbors_finder) { - std::unique_ptr g = std::move(random_graph_generator()); - Neighbors_finder nf = Neighbors_finder(*g,1.); + Neighbors_finder nf = Neighbors_finder(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::list 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) { - std::unique_ptr g = std::move(random_graph_generator()); - Layered_neighbors_finder lnf = Layered_neighbors_finder(*g,1.); + Layered_neighbors_finder lnf = Layered_neighbors_finder(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) { - std::unique_ptr g = std::move(random_graph_generator()); - Graph_matching m1(*g); + Graph_matching m1; m1.set_r(0.); int e = 0; while (m1.multi_augment()) @@ -177,3 +165,7 @@ BOOST_AUTO_TEST_CASE(graph_matching) { BOOST_CHECK(m2.perfect()); BOOST_CHECK(!m1.perfect()); } + +BOOST_AUTO_TEST_CASE(grid_cell) { + +} -- cgit v1.2.3