From 9f799012e531d4ea7cd85b815911d6271031c0e9 Mon Sep 17 00:00:00 2001 From: mcarrier Date: Mon, 3 Jul 2017 18:25:45 +0000 Subject: git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Nerve_GIC@2579 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 697cb9e3146f0b068c6df4e74d972958e793d94b --- src/Nerve_GIC/test/test_GIC.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'src/Nerve_GIC/test') diff --git a/src/Nerve_GIC/test/test_GIC.cpp b/src/Nerve_GIC/test/test_GIC.cpp index 6b6621fd..cff49372 100644 --- a/src/Nerve_GIC/test/test_GIC.cpp +++ b/src/Nerve_GIC/test/test_GIC.cpp @@ -35,12 +35,13 @@ BOOST_AUTO_TEST_CASE(check_nerve) { - Gudhi::graph_induced_complex::Graph_induced_complex GIC; + using Point = std::vector; + Gudhi::graph_induced_complex::Graph_induced_complex GIC; std::string cloud_file_name("data/cloud"); GIC.read_point_cloud(cloud_file_name); std::string graph_file_name("data/graph"); GIC.set_graph_from_file(graph_file_name); std::string cover_file_name("data/cover"); GIC.set_cover_from_file(cover_file_name); GIC.set_color_from_coordinate(); - GIC.find_Nerve_simplices(); Simplex_tree stree; GIC.create_complex(stree); + GIC.find_Nerve_simplices(); Gudhi::graph_induced_complex::Simplex_tree stree; GIC.create_complex(stree); BOOST_CHECK(stree.num_vertices() == 3); BOOST_CHECK((stree.num_simplices()-stree.num_vertices()) == 0); @@ -49,11 +50,12 @@ BOOST_AUTO_TEST_CASE(check_nerve) { BOOST_AUTO_TEST_CASE(check_GICMAP) { - Gudhi::graph_induced_complex::Graph_induced_complex GIC; + using Point = std::vector; + Gudhi::graph_induced_complex::Graph_induced_complex GIC; std::string cloud_file_name("data/cloud"); GIC.read_point_cloud(cloud_file_name); GIC.set_color_from_coordinate(); std::string graph_file_name("data/graph"); GIC.set_graph_from_file(graph_file_name); std::string cover_file_name("data/cover"); GIC.set_cover_from_file(cover_file_name); - GIC.find_GICMAP_simplices_with_functional_minimal_cover(); Simplex_tree stree; GIC.create_complex(stree); + GIC.find_GICMAP_simplices_with_functional_minimal_cover(); Gudhi::graph_induced_complex::Simplex_tree stree; GIC.create_complex(stree); BOOST_CHECK(stree.num_vertices() == 3); BOOST_CHECK((stree.num_simplices()-stree.num_vertices()) == 2); @@ -62,11 +64,12 @@ BOOST_AUTO_TEST_CASE(check_GICMAP) { BOOST_AUTO_TEST_CASE(check_GICcover) { - Gudhi::graph_induced_complex::Graph_induced_complex GIC; + using Point = std::vector; + Gudhi::graph_induced_complex::Graph_induced_complex GIC; std::string cloud_file_name("data/cloud"); GIC.read_point_cloud(cloud_file_name); GIC.set_color_from_coordinate(); std::string graph_file_name("data/graph"); GIC.set_graph_from_file(graph_file_name); std::string cover_file_name("data/cover"); GIC.set_cover_from_file(cover_file_name); - GIC.find_GIC_simplices(); Simplex_tree stree; GIC.create_complex(stree); + GIC.find_GIC_simplices(); Gudhi::graph_induced_complex::Simplex_tree stree; GIC.create_complex(stree); BOOST_CHECK(stree.num_vertices() == 3); BOOST_CHECK((stree.num_simplices()-stree.num_vertices()) == 4); @@ -76,11 +79,12 @@ BOOST_AUTO_TEST_CASE(check_GICcover) { BOOST_AUTO_TEST_CASE(check_GICvoronoi) { - Gudhi::graph_induced_complex::Graph_induced_complex GIC; + using Point = std::vector; + Gudhi::graph_induced_complex::Graph_induced_complex GIC; std::string cloud_file_name("data/cloud"); GIC.read_point_cloud(cloud_file_name); GIC.set_color_from_coordinate(); std::string graph_file_name("data/graph"); GIC.set_graph_from_file(graph_file_name); - GIC.set_cover_from_Voronoi(2); - GIC.find_GIC_simplices(); Simplex_tree stree; GIC.create_complex(stree); + GIC.set_cover_from_Voronoi(Gudhi::Euclidean_distance(),2); + GIC.find_GIC_simplices(); Gudhi::graph_induced_complex::Simplex_tree stree; GIC.create_complex(stree); BOOST_CHECK(stree.num_vertices() == 2); BOOST_CHECK((stree.num_simplices()-stree.num_vertices()) == 1); -- cgit v1.2.3