diff options
| author | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-03-28 09:41:38 +0000 |
|---|---|---|
| committer | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-03-28 09:41:38 +0000 |
| commit | 2e60e1e4737729a1f772a9cbdb83583fbb166f71 (patch) | |
| tree | da88f5e2f506b85821059a61b408adda2a9208db /src/Nerve_GIC | |
| parent | 6141868f2336a2650e0f9ac755735aee30d56356 (diff) | |
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Nerve_GIC@3309 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 1af850057913b691b237bde016ef11de9d65b91b
Diffstat (limited to 'src/Nerve_GIC')
| -rw-r--r-- | src/Nerve_GIC/include/gudhi/GIC.h | 1 | ||||
| -rw-r--r-- | src/Nerve_GIC/test/test_GIC.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Nerve_GIC/include/gudhi/GIC.h b/src/Nerve_GIC/include/gudhi/GIC.h index 1805959b..80d4c024 100644 --- a/src/Nerve_GIC/include/gudhi/GIC.h +++ b/src/Nerve_GIC/include/gudhi/GIC.h @@ -732,7 +732,6 @@ class Cover_complex { } #ifdef GUDHI_USE_TBB - tbb::task_scheduler_init init(4); if (verbose) std::cout << "Computing connected components (parallelized)..." << std::endl; tbb::parallel_for(0, res, [&](int i){ // Compute connected components diff --git a/src/Nerve_GIC/test/test_GIC.cpp b/src/Nerve_GIC/test/test_GIC.cpp index d633753c..e3067d35 100644 --- a/src/Nerve_GIC/test/test_GIC.cpp +++ b/src/Nerve_GIC/test/test_GIC.cpp @@ -39,6 +39,7 @@ BOOST_AUTO_TEST_CASE(check_nerve) { N.set_type("Nerve"); std::string cloud_file_name("data/cloud"); N.read_point_cloud(cloud_file_name); + N.set_color_from_coordinate(); std::string graph_file_name("data/graph"); N.set_graph_from_file(graph_file_name); std::string cover_file_name("data/cover"); @@ -58,6 +59,7 @@ BOOST_AUTO_TEST_CASE(check_GIC) { GIC.set_type("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"); @@ -77,6 +79,7 @@ BOOST_AUTO_TEST_CASE(check_voronoiGIC) { GIC.set_type("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(Gudhi::Euclidean_distance(), 2); |