diff options
author | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-22 09:42:57 +0000 |
---|---|---|
committer | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-22 09:42:57 +0000 |
commit | 83dd60a38920cdf85e4c1108404cfa7c294f98e2 (patch) | |
tree | f838d233a7039e85251f22ab0788af313b2bae47 /src/Subsampling/test | |
parent | 4ef423a7a1140f1fe1a2ce1f1bbee03990638be1 (diff) |
Took into account Clément's remarks
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1328 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 6f1db13d0e8cec8e64c5bb30da53b72b00446de3
Diffstat (limited to 'src/Subsampling/test')
-rw-r--r-- | src/Subsampling/test/test_choose_farthest_point.cpp | 8 | ||||
-rw-r--r-- | src/Subsampling/test/test_pick_random_points.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/Subsampling/test/test_choose_farthest_point.cpp b/src/Subsampling/test/test_choose_farthest_point.cpp index 991fcbfe..87c2c38d 100644 --- a/src/Subsampling/test/test_choose_farthest_point.cpp +++ b/src/Subsampling/test/test_choose_farthest_point.cpp @@ -41,7 +41,7 @@ typedef typename K::Point_d Point_d; BOOST_AUTO_TEST_CASE(test_choose_farthest_point) { - std::vector< Point_d > points, landmarks; + std::vector< Point_d > points, results; // Add grid points (625 points) for (FT i = 0; i < 5; i += 1.0) for (FT j = 0; j < 5; j += 1.0) @@ -49,9 +49,9 @@ BOOST_AUTO_TEST_CASE(test_choose_farthest_point) { for (FT l = 0; l < 5; l += 1.0) points.push_back(Point_d(std::vector<FT>({i, j, k, l}))); - landmarks.clear(); + results.clear(); K k; - Gudhi::choose_by_farthest_point(k, points, 100, std::back_inserter(landmarks)); + Gudhi::subsampling::choose_by_farthest_point(k, points, 100, std::back_inserter(results)); - assert(landmarks.size() == 100); + assert(results.size() == 100); } diff --git a/src/Subsampling/test/test_pick_random_points.cpp b/src/Subsampling/test/test_pick_random_points.cpp index 81c7ffdb..8156160e 100644 --- a/src/Subsampling/test/test_pick_random_points.cpp +++ b/src/Subsampling/test/test_pick_random_points.cpp @@ -24,7 +24,7 @@ // # define TBB_USE_THREADING_TOOL // #endif -#include <gudhi/Pick_random_points.h> +#include <gudhi/pick_random_points.h> #include <vector> #include <iterator> @@ -55,11 +55,11 @@ int main() { vect.push_back(Point_d(std::vector<FT>({1,1,1,1}))); - std::vector<Point_d> landmarks; - Gudhi::pick_random_points(vect, 5, std::back_inserter(landmarks)); + std::vector<Point_d> results; + Gudhi::subsampling::pick_random_points(vect, 5, std::back_inserter(results)); std::cout << "landmark vector contains: "; - for (auto l: landmarks) + for (auto l: results) std::cout << l << "\n"; - assert(landmarks_size() == 5); + assert(results.size() == 5); } |