diff options
-rw-r--r-- | src/Subsampling/doc/Intro_subsampling.h | 4 | ||||
-rw-r--r-- | src/Subsampling/example/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/Subsampling/example/example_pick_n_random_points.cpp (renamed from src/Subsampling/example/example_pick_random_points.cpp) | 4 | ||||
-rw-r--r-- | src/Subsampling/include/gudhi/pick_n_random_points.h (renamed from src/Subsampling/include/gudhi/pick_random_points.h) | 2 | ||||
-rw-r--r-- | src/Subsampling/test/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/Subsampling/test/test_pick_n_random_points.cpp (renamed from src/Subsampling/test/test_pick_random_points.cpp) | 8 | ||||
-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 |
9 files changed, 18 insertions, 18 deletions
diff --git a/src/Subsampling/doc/Intro_subsampling.h b/src/Subsampling/doc/Intro_subsampling.h index aed41430..06aee2fc 100644 --- a/src/Subsampling/doc/Intro_subsampling.h +++ b/src/Subsampling/doc/Intro_subsampling.h @@ -53,11 +53,11 @@ namespace subsampling { * * \include Subsampling/example_choose_by_farthest_point.cpp * - * \section randompointexamples Example: pick_random_points + * \section randompointexamples Example: pick_n_random_points * * This example outputs a subset of 100 points picked randomly. * - * \include Subsampling/example_pick_random_points.cpp + * \include Subsampling/example_pick_n_random_points.cpp * \copyright GNU General Public License v3. * \verbatim Contact: gudhi-users@lists.gforge.inria.fr \endverbatim */ diff --git a/src/Subsampling/example/CMakeLists.txt b/src/Subsampling/example/CMakeLists.txt index b6d71dac..4710cf00 100644 --- a/src/Subsampling/example/CMakeLists.txt +++ b/src/Subsampling/example/CMakeLists.txt @@ -11,7 +11,7 @@ if(CGAL_FOUND) include( ${EIGEN3_USE_FILE} ) include_directories (BEFORE "../../include") - add_executable( Subsampling_example_pick_random_points example_pick_random_points.cpp ) + add_executable( Subsampling_example_pick_n_random_points example_pick_n_random_points.cpp ) add_executable( Subsampling_example_choose_n_farthest_points example_choose_n_farthest_points.cpp ) #target_link_libraries(Subsampling_example_choose_n_farthest_points ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) diff --git a/src/Subsampling/example/example_pick_random_points.cpp b/src/Subsampling/example/example_pick_n_random_points.cpp index 348b1b81..d2f063ba 100644 --- a/src/Subsampling/example/example_pick_random_points.cpp +++ b/src/Subsampling/example/example_pick_n_random_points.cpp @@ -1,4 +1,4 @@ -#include <gudhi/pick_random_points.h> +#include <gudhi/pick_n_random_points.h> #include <CGAL/Epick_d.h> #include <CGAL/Random.h> @@ -21,7 +21,7 @@ int main (void) K k; std::vector<Point_d> results; - Gudhi::subsampling::pick_random_points(points, 100, std::back_inserter(results)); + Gudhi::subsampling::pick_n_random_points(points, 100, std::back_inserter(results)); std::cout << "Before sparsification: " << points.size() << " points.\n"; std::cout << "After sparsification: " << results.size() << " points.\n"; diff --git a/src/Subsampling/include/gudhi/pick_random_points.h b/src/Subsampling/include/gudhi/pick_n_random_points.h index 732ae3f7..4ca1fafc 100644 --- a/src/Subsampling/include/gudhi/pick_random_points.h +++ b/src/Subsampling/include/gudhi/pick_n_random_points.h @@ -47,7 +47,7 @@ namespace subsampling { template <typename Point_container, typename OutputIterator> - void pick_random_points(Point_container const &points, + void pick_n_random_points(Point_container const &points, unsigned final_size, OutputIterator output_it) { #ifdef GUDHI_SUBS_PROFILING diff --git a/src/Subsampling/test/CMakeLists.txt b/src/Subsampling/test/CMakeLists.txt index 95241cd2..c9e48416 100644 --- a/src/Subsampling/test/CMakeLists.txt +++ b/src/Subsampling/test/CMakeLists.txt @@ -20,8 +20,8 @@ if(CGAL_FOUND) include( ${EIGEN3_USE_FILE} ) include_directories (BEFORE "../../include") - add_executable( Subsampling_test_pick_random_points test_pick_random_points.cpp ) - target_link_libraries(Subsampling_test_pick_random_points ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) + add_executable( Subsampling_test_pick_n_random_points test_pick_n_random_points.cpp ) + target_link_libraries(Subsampling_test_pick_n_random_points ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) add_executable( Subsampling_test_choose_n_farthest_points test_choose_n_farthest_points.cpp ) target_link_libraries(Subsampling_test_choose_n_farthest_points ${CGAL_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) diff --git a/src/Subsampling/test/test_pick_random_points.cpp b/src/Subsampling/test/test_pick_n_random_points.cpp index 16841eff..6c8dbea2 100644 --- a/src/Subsampling/test/test_pick_random_points.cpp +++ b/src/Subsampling/test/test_pick_n_random_points.cpp @@ -25,17 +25,17 @@ // #endif #define BOOST_TEST_DYN_LINK -#define BOOST_TEST_MODULE Subsampling - test pick_random_points +#define BOOST_TEST_MODULE Subsampling - test pick_n_random_points #include <boost/test/unit_test.hpp> -#include <gudhi/pick_random_points.h> +#include <gudhi/pick_n_random_points.h> #include <vector> #include <iterator> #include <CGAL/Epick_d.h> -BOOST_AUTO_TEST_CASE(test_pick_random_points) +BOOST_AUTO_TEST_CASE(test_pick_n_random_points) { typedef CGAL::Epick_d<CGAL::Dynamic_dimension_tag> K; typedef typename K::FT FT; @@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(test_pick_random_points) vect.push_back(Point_d(std::vector<FT>({1,1,1,1}))); std::vector<Point_d> results; - Gudhi::subsampling::pick_random_points(vect, 5, std::back_inserter(results)); + Gudhi::subsampling::pick_n_random_points(vect, 5, std::back_inserter(results)); std::cout << "landmark vector contains: "; for (auto l: results) std::cout << l << "\n"; 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); |