summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-01-04 06:15:47 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-01-04 06:15:47 +0000
commit67c34d7b506efe6445a24380b3ad0743e09ef334 (patch)
tree7504f217a3a52df7c9d2157850a28d4b5972750a /src/common
parent7363fb3c4001d1761524ec65f38847c7fe7fb8f2 (diff)
parenta0685fdfba0e6fb210468726ca45ce5dff8672ff (diff)
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1919 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 1dc74b80bb4ad02dd49664f6d703abd4b304e4ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/include/gudhi/random_point_generators.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/common/include/gudhi/random_point_generators.h b/src/common/include/gudhi/random_point_generators.h
index c643a1e3..2ec465ef 100644
--- a/src/common/include/gudhi/random_point_generators.h
+++ b/src/common/include/gudhi/random_point_generators.h
@@ -192,10 +192,9 @@ static void generate_uniform_points_on_torus_d(const Kernel &k, int dim, std::si
double radius_noise_percentage = 0.,
std::vector<typename Kernel::FT> current_point = std::vector<typename Kernel::FT>()) {
CGAL::Random rng;
- if (current_point.size() == 2 * dim) {
- *out++ = k.construct_point_d_object()(
- static_cast<int> (current_point.size()),
- current_point.begin(), current_point.end());
+ int point_size = static_cast<int>(current_point.size());
+ if (point_size == 2 * dim) {
+ *out++ = k.construct_point_d_object()(point_size, current_point.begin(), current_point.end());
} else {
for (std::size_t slice_idx = 0; slice_idx < num_slices; ++slice_idx) {
double radius_noise_ratio = 1.;