diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Spatial_searching/example/example_spatial_searching.cpp | 17 | ||||
-rw-r--r-- | src/Spatial_searching/test/test_Kd_tree_search.cpp | 37 |
2 files changed, 24 insertions, 30 deletions
diff --git a/src/Spatial_searching/example/example_spatial_searching.cpp b/src/Spatial_searching/example/example_spatial_searching.cpp index 528ec029..14b324ae 100644 --- a/src/Spatial_searching/example/example_spatial_searching.cpp +++ b/src/Spatial_searching/example/example_spatial_searching.cpp @@ -7,11 +7,10 @@ namespace gss = Gudhi::spatial_searching; -int main (void) -{ - typedef CGAL::Epick_d<CGAL::Dimension_tag<4> > K; - typedef typename K::Point_d Point; - typedef std::vector<Point> Points; +int main(void) { + typedef CGAL::Epick_d<CGAL::Dimension_tag<4> > K; + typedef typename K::Point_d Point; + typedef std::vector<Point> Points; typedef gss::Kd_tree_search<K, Points> Points_ds; @@ -19,7 +18,7 @@ int main (void) Points points; for (int i = 0; i < 500; ++i) - points.push_back(Point(rd.get_double(-1.,1), rd.get_double(-1.,1), rd.get_double(-1.,1), rd.get_double(-1.,1))); + points.push_back(Point(rd.get_double(-1., 1), rd.get_double(-1., 1), rd.get_double(-1., 1), rd.get_double(-1., 1))); Points_ds points_ds(points); @@ -33,7 +32,7 @@ int main (void) std::cout << "Incremental nearest neighbors:\n"; auto inn_range = points_ds.query_incremental_nearest_neighbors(points[45]); // Get the neighbors in distance order until we hit the first point - for (auto ins_iterator = inn_range.begin(); ins_iterator->first != 0 ; ++ins_iterator) + for (auto ins_iterator = inn_range.begin(); ins_iterator->first != 0; ++ins_iterator) std::cout << ins_iterator->first << " (sq. dist. = " << ins_iterator->second << ")\n"; // 10-farthest neighbor query @@ -46,8 +45,8 @@ int main (void) std::cout << "Incremental farthest neighbors:\n"; auto ifn_range = points_ds.query_incremental_farthest_neighbors(points[45]); // Get the neighbors in distance reverse order until we hit the first point - for (auto ifs_iterator = ifn_range.begin(); ifs_iterator->first != 0 ; ++ifs_iterator) + for (auto ifs_iterator = ifn_range.begin(); ifs_iterator->first != 0; ++ifs_iterator) std::cout << ifs_iterator->first << " (sq. dist. = " << ifs_iterator->second << ")\n"; - + return 0; } diff --git a/src/Spatial_searching/test/test_Kd_tree_search.cpp b/src/Spatial_searching/test/test_Kd_tree_search.cpp index 16b72c68..0ef22023 100644 --- a/src/Spatial_searching/test/test_Kd_tree_search.cpp +++ b/src/Spatial_searching/test/test_Kd_tree_search.cpp @@ -4,7 +4,7 @@ * * Author(s): Clement Jamin * - * Copyright (C) 2016 INRIA Sophia-Antipolis (France) + * Copyright (C) 2016 INRIA * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,35 +31,33 @@ #include <vector> -BOOST_AUTO_TEST_CASE(test_Kd_tree_search) -{ - typedef CGAL::Epick_d<CGAL::Dimension_tag<4> > K; - typedef K::FT FT; - typedef K::Point_d Point; - typedef std::vector<Point> Points; +BOOST_AUTO_TEST_CASE(test_Kd_tree_search) { + typedef CGAL::Epick_d<CGAL::Dimension_tag<4> > K; + typedef K::FT FT; + typedef K::Point_d Point; + typedef std::vector<Point> Points; typedef Gudhi::spatial_searching::Kd_tree_search< - K, Points> Points_ds; - + K, Points> Points_ds; + CGAL::Random rd; Points points; - for (int i = 0 ; i < 500 ; ++i) - points.push_back(Point(rd.get_double(-1.,1), rd.get_double(-1.,1), rd.get_double(-1.,1), rd.get_double(-1.,1))); + for (int i = 0; i < 500; ++i) + points.push_back(Point(rd.get_double(-1., 1), rd.get_double(-1., 1), rd.get_double(-1., 1), rd.get_double(-1., 1))); Points_ds points_ds(points); // Test query_k_nearest_neighbors std::size_t closest_pt_index = - points_ds.query_k_nearest_neighbors(points[10], 1, false).begin()->first; + points_ds.query_k_nearest_neighbors(points[10], 1, false).begin()->first; BOOST_CHECK(closest_pt_index == 10); auto kns_range = points_ds.query_k_nearest_neighbors(points[20], 10, true); std::vector<std::size_t> knn_result; FT last_dist = -1.; - for (auto const& nghb : kns_range) - { + for (auto const& nghb : kns_range) { BOOST_CHECK(nghb.second > last_dist); knn_result.push_back(nghb.second); last_dist = nghb.second; @@ -67,7 +65,7 @@ BOOST_AUTO_TEST_CASE(test_Kd_tree_search) // Test query_incremental_nearest_neighbors closest_pt_index = - points_ds.query_incremental_nearest_neighbors(points[10]).begin()->first; + points_ds.query_incremental_nearest_neighbors(points[10]).begin()->first; BOOST_CHECK(closest_pt_index == 10); auto inn_range = points_ds.query_incremental_nearest_neighbors(points[20]); @@ -75,8 +73,7 @@ BOOST_AUTO_TEST_CASE(test_Kd_tree_search) std::vector<std::size_t> inn_result; last_dist = -1.; auto inn_it = inn_range.begin(); - for (int i = 0 ; i < 10 ; ++inn_it, ++i) - { + for (int i = 0; i < 10; ++inn_it, ++i) { auto const& nghb = *inn_it; BOOST_CHECK(nghb.second > last_dist); inn_result.push_back(nghb.second); @@ -91,8 +88,7 @@ BOOST_AUTO_TEST_CASE(test_Kd_tree_search) std::vector<std::size_t> kfn_result; last_dist = kfn_range.begin()->second; - for (auto const& nghb : kfn_range) - { + for (auto const& nghb : kfn_range) { BOOST_CHECK(nghb.second <= last_dist); kfn_result.push_back(nghb.second); last_dist = nghb.second; @@ -104,8 +100,7 @@ BOOST_AUTO_TEST_CASE(test_Kd_tree_search) std::vector<std::size_t> ifn_result; last_dist = ifn_range.begin()->second; auto ifn_it = ifn_range.begin(); - for (int i = 0; i < 10; ++ifn_it, ++i) - { + for (int i = 0; i < 10; ++ifn_it, ++i) { auto const& nghb = *ifn_it; BOOST_CHECK(nghb.second <= last_dist); ifn_result.push_back(nghb.second); |