diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-20 15:33:53 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-20 15:33:53 +0000 |
| commit | 3f451b963739a595d990be5517d386259ddb487f (patch) | |
| tree | 4e6b8ccbf21c28c103effd9342f75907c89cf42a /src/Subsampling/include/gudhi/pick_n_random_points.h | |
| parent | ad6a64ad5a4f4121410250021eda0904eb9c718c (diff) | |
| parent | cbf1a50068a2c5dea6d732d40dfc66d34460d863 (diff) | |
Merge last trunk modifications in qt5 branch
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/qt5@1976 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 7f8c5b9443bf0996347fe459fe21c42a2fed0cca
Diffstat (limited to 'src/Subsampling/include/gudhi/pick_n_random_points.h')
| -rw-r--r-- | src/Subsampling/include/gudhi/pick_n_random_points.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Subsampling/include/gudhi/pick_n_random_points.h b/src/Subsampling/include/gudhi/pick_n_random_points.h index e89b2b2d..f0e3f1f1 100644 --- a/src/Subsampling/include/gudhi/pick_n_random_points.h +++ b/src/Subsampling/include/gudhi/pick_n_random_points.h @@ -57,7 +57,9 @@ void pick_n_random_points(Point_container const &points, #endif std::size_t nbP = boost::size(points); - assert(nbP >= final_size); + if (final_size > nbP) + final_size = nbP; + std::vector<int> landmarks(nbP); std::iota(landmarks.begin(), landmarks.end(), 0); |