diff options
| author | cjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-28 16:23:14 +0000 |
|---|---|---|
| committer | cjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-28 16:23:14 +0000 |
| commit | e42f150700da50741b1e0d616a24a35574c1f76a (patch) | |
| tree | 68ef050d31da2dd15f53b98fdf4a13d31f08a9ad /src/Spatial_searching | |
| parent | 9eaeb5892014e6c516a90a17016cf135123fcbb3 (diff) | |
Improve test
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1350 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: e1274b2283f270b10d6ee261ffe6a48f098fa7c9
Diffstat (limited to 'src/Spatial_searching')
| -rw-r--r-- | src/Spatial_searching/test/test_Spatial_tree_data_structure.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/Spatial_searching/test/test_Spatial_tree_data_structure.cpp b/src/Spatial_searching/test/test_Spatial_tree_data_structure.cpp index e2bb1f87..916710ef 100644 --- a/src/Spatial_searching/test/test_Spatial_tree_data_structure.cpp +++ b/src/Spatial_searching/test/test_Spatial_tree_data_structure.cpp @@ -31,27 +31,22 @@ #include <array> #include <vector> -#include <iterator> BOOST_AUTO_TEST_CASE(test_Spatial_tree_data_structure) { typedef CGAL::Epick_d<CGAL::Dimension_tag<4> > K; typedef K::FT FT; - typedef K::Point_d Point_d; - typedef std::vector<Point_d> Point_container; + typedef K::Point_d Point; + typedef std::vector<Point> Points; typedef Gudhi::spatial_searching::Spatial_tree_data_structure< - K, Point_container> Points_ds; - typedef typename Points_ds::KNS_range KNS_range; - typedef typename Points_ds::KNS_iterator KNS_iterator; - typedef typename Points_ds::INS_range INS_range; - typedef typename Points_ds::INS_iterator INS_iterator; + K, Points> Points_ds; CGAL::Random rd; - std::vector<Point_d> points; + Points points; for (int i = 0 ; i < 500 ; ++i) - points.push_back(Point_d(std::array<FT,4>({rd.get_double(-1.,1),rd.get_double(-1.,1),rd.get_double(-1.,1),rd.get_double(-1.,1)}))); + points.push_back(Point(std::array<FT,4>({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); @@ -59,9 +54,8 @@ BOOST_AUTO_TEST_CASE(test_Spatial_tree_data_structure) points_ds.query_ANN(points[10], 1, false).begin()->first; BOOST_CHECK(closest_pt_index == 10); - KNS_range kns_range = points_ds.query_ANN(points[20], 10, true); + auto kns_range = points_ds.query_ANN(points[20], 10, true); - KNS_iterator nn_it = kns_range.begin(); FT last_dist = -1.; for (auto const& nghb : kns_range) { |