diff options
author | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-09-20 16:14:38 +0000 |
---|---|---|
committer | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-09-20 16:14:38 +0000 |
commit | 6ad5ac6794ebc46638cd1f0862a553f40d2557d7 (patch) | |
tree | b00d85803303ea9d9a8c5fa381a04760dc65ad06 /src/Witness_complex | |
parent | e8183d76c99eac5458d8f72cb4479cc680c6a6c4 (diff) |
Renamed pick_random_points -> pick_n_random_points
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1516 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 45cc8cca9debf56dd0d21762e537649dd92d9a4d
Diffstat (limited to 'src/Witness_complex')
-rw-r--r-- | src/Witness_complex/example/witness_complex_from_file.cpp | 4 | ||||
-rw-r--r-- | src/Witness_complex/example/witness_complex_sphere.cpp | 4 | ||||
-rw-r--r-- | src/Witness_complex/test/witness_complex_points.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Witness_complex/example/witness_complex_from_file.cpp b/src/Witness_complex/example/witness_complex_from_file.cpp index 0d82ee38..5e9f0e81 100644 --- a/src/Witness_complex/example/witness_complex_from_file.cpp +++ b/src/Witness_complex/example/witness_complex_from_file.cpp @@ -26,7 +26,7 @@ #include <gudhi/Simplex_tree.h> #include <gudhi/Witness_complex.h> #include <gudhi/Construct_closest_landmark_table.h> -#include <gudhi/pick_random_points.h> +#include <gudhi/pick_n_random_points.h> #include <gudhi/reader_utils.h> #include <iostream> @@ -87,7 +87,7 @@ int main(int argc, char * const argv[]) { // Choose landmarks start = clock(); std::vector<std::vector< int > > knn; - Gudhi::subsampling::pick_random_points(point_vector, 100, std::back_inserter(landmarks)); + Gudhi::subsampling::pick_n_random_points(point_vector, 100, std::back_inserter(landmarks)); Gudhi::witness_complex::construct_closest_landmark_table(point_vector, landmarks, knn); end = clock(); std::cout << "Landmark choice for " << nbL << " landmarks took " diff --git a/src/Witness_complex/example/witness_complex_sphere.cpp b/src/Witness_complex/example/witness_complex_sphere.cpp index d0c4b4c4..e6f88274 100644 --- a/src/Witness_complex/example/witness_complex_sphere.cpp +++ b/src/Witness_complex/example/witness_complex_sphere.cpp @@ -28,7 +28,7 @@ #include <gudhi/Simplex_tree.h> #include <gudhi/Witness_complex.h> #include <gudhi/Construct_closest_landmark_table.h> -#include <gudhi/pick_random_points.h> +#include <gudhi/pick_n_random_points.h> #include <gudhi/reader_utils.h> #include <iostream> @@ -76,7 +76,7 @@ int main(int argc, char * const argv[]) { // Choose landmarks start = clock(); std::vector<std::vector< int > > knn; - Gudhi::subsampling::pick_random_points(point_vector, 100, std::back_inserter(landmarks)); + Gudhi::subsampling::pick_n_random_points(point_vector, 100, std::back_inserter(landmarks)); Gudhi::witness_complex::construct_closest_landmark_table(point_vector, landmarks, knn); // Compute witness complex diff --git a/src/Witness_complex/test/witness_complex_points.cpp b/src/Witness_complex/test/witness_complex_points.cpp index 596152f4..d40bbf14 100644 --- a/src/Witness_complex/test/witness_complex_points.cpp +++ b/src/Witness_complex/test/witness_complex_points.cpp @@ -28,7 +28,7 @@ #include <gudhi/Simplex_tree.h> #include <gudhi/Witness_complex.h> #include <gudhi/Construct_closest_landmark_table.h> -#include <gudhi/pick_random_points.h> +#include <gudhi/pick_n_random_points.h> #include <iostream> #include <vector> @@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE(witness_complex_points) { bool b_print_output = false; // First test: random choice Simplex_tree complex1; - Gudhi::pick_random_points(points, 100, std::back_inserter(landmarks)); + Gudhi::subsampling::pick_n_random_points(points, 100, std::back_inserter(landmarks)); Gudhi::witness_complex::construct_closest_landmark_table(points, landmarks, knn); assert(!knn.empty()); WitnessComplex witnessComplex1(knn, 100, 3, complex1); |