diff options
author | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-02-24 14:28:24 +0000 |
---|---|---|
committer | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-02-24 14:28:24 +0000 |
commit | 18a13841ce995148b0c46a35ee9209626f6bf3d5 (patch) | |
tree | 83fa4d5dda86fceabe675b679705b3b8e6bf7d9f /src/Subsampling/test/test_choose_n_farthest_points.cpp | |
parent | b0859ffb8c5d030f3d37ba758a325250f1d1c982 (diff) |
Revert previous commit, was supposed to go to a branch !!!
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@2106 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 59183c46120a19ad0a840dd57b7a4706a4d44bdd
Diffstat (limited to 'src/Subsampling/test/test_choose_n_farthest_points.cpp')
-rw-r--r-- | src/Subsampling/test/test_choose_n_farthest_points.cpp | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/src/Subsampling/test/test_choose_n_farthest_points.cpp b/src/Subsampling/test/test_choose_n_farthest_points.cpp index 6bc5f7b0..0bc0dff4 100644 --- a/src/Subsampling/test/test_choose_n_farthest_points.cpp +++ b/src/Subsampling/test/test_choose_n_farthest_points.cpp @@ -70,45 +70,34 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_choose_farthest_point_limits, Kernel, list_of typedef typename Kernel::FT FT; typedef typename Kernel::Point_d Point_d; std::vector< Point_d > points, landmarks; - std::vector< FT > distances; landmarks.clear(); Kernel k; // Choose -1 farthest points in an empty point cloud - Gudhi::subsampling::choose_n_farthest_points(k, points, -1, -1, std::back_inserter(landmarks), std::back_inserter(distances)); + Gudhi::subsampling::choose_n_farthest_points(k, points, -1, std::back_inserter(landmarks)); BOOST_CHECK(landmarks.size() == 0); - landmarks.clear(); distances.clear(); + landmarks.clear(); // Choose 0 farthest points in an empty point cloud - Gudhi::subsampling::choose_n_farthest_points(k, points, 0, -1, std::back_inserter(landmarks), std::back_inserter(distances)); + Gudhi::subsampling::choose_n_farthest_points(k, points, 0, std::back_inserter(landmarks)); BOOST_CHECK(landmarks.size() == 0); - landmarks.clear(); distances.clear(); + landmarks.clear(); // Choose 1 farthest points in an empty point cloud - Gudhi::subsampling::choose_n_farthest_points(k, points, 1, -1, std::back_inserter(landmarks), std::back_inserter(distances)); + Gudhi::subsampling::choose_n_farthest_points(k, points, 1, std::back_inserter(landmarks)); BOOST_CHECK(landmarks.size() == 0); - landmarks.clear(); distances.clear(); + landmarks.clear(); std::vector<FT> point({0.0, 0.0, 0.0, 0.0}); points.push_back(Point_d(point.begin(), point.end())); - // Choose -1 farthest points in a one point cloud - Gudhi::subsampling::choose_n_farthest_points(k, points, -1, -1, std::back_inserter(landmarks), std::back_inserter(distances)); - BOOST_CHECK(landmarks.size() == 1 && distances.size() == 1); - BOOST_CHECK(distances[0] == std::numeric_limits<FT>::infinity()); - landmarks.clear(); distances.clear(); + // Choose -1 farthest points in an empty point cloud + Gudhi::subsampling::choose_n_farthest_points(k, points, -1, std::back_inserter(landmarks)); + BOOST_CHECK(landmarks.size() == 1); + landmarks.clear(); // Choose 0 farthest points in a one point cloud - Gudhi::subsampling::choose_n_farthest_points(k, points, 0, -1, std::back_inserter(landmarks), std::back_inserter(distances)); - BOOST_CHECK(landmarks.size() == 0 && distances.size() == 0); - landmarks.clear(); distances.clear(); + Gudhi::subsampling::choose_n_farthest_points(k, points, 0, std::back_inserter(landmarks)); + BOOST_CHECK(landmarks.size() == 0); + landmarks.clear(); // Choose 1 farthest points in a one point cloud - Gudhi::subsampling::choose_n_farthest_points(k, points, 1, -1, std::back_inserter(landmarks), std::back_inserter(distances)); - BOOST_CHECK(landmarks.size() == 1 && distances.size() == 1); - BOOST_CHECK(distances[0] == std::numeric_limits<FT>::infinity()); - landmarks.clear(); distances.clear(); + Gudhi::subsampling::choose_n_farthest_points(k, points, 1, std::back_inserter(landmarks)); + BOOST_CHECK(landmarks.size() == 1); + landmarks.clear(); - std::vector<FT> point2({1.0, 0.0, 0.0, 0.0}); - points.push_back(Point_d(point2.begin(), point2.end())); - // Choose all farthest points in a one point cloud - Gudhi::subsampling::choose_n_farthest_points(k, points, -1, -1, std::back_inserter(landmarks), std::back_inserter(distances)); - BOOST_CHECK(landmarks.size() == 2 && distances.size() == 2); - BOOST_CHECK(distances[0] == std::numeric_limits<FT>::infinity()); - BOOST_CHECK(distances[1] == 1); - landmarks.clear(); distances.clear(); } |