summaryrefslogtreecommitdiff
path: root/include/gudhi/Bitmap_cubical_complex_base.h
diff options
context:
space:
mode:
authorGard Spreemann <gspreemann@gmail.com>2018-06-15 12:42:55 +0200
committerGard Spreemann <gspreemann@gmail.com>2018-06-15 12:42:55 +0200
commitc31bac6af57af917b8f799d0c21eb6af34ee1f6e (patch)
tree5a9603a4ec016f1aa09c7da52510790680c790c3 /include/gudhi/Bitmap_cubical_complex_base.h
parent02de1136cf9850803cb1e1ac1141f11b50be2992 (diff)
parent41482b4260b4aff3d6803e340d5c94fbefb9af67 (diff)
Merge branch 'dfsg/latest' into debian/sid
Diffstat (limited to 'include/gudhi/Bitmap_cubical_complex_base.h')
-rw-r--r--include/gudhi/Bitmap_cubical_complex_base.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/gudhi/Bitmap_cubical_complex_base.h b/include/gudhi/Bitmap_cubical_complex_base.h
index bf257be1..9b74e267 100644
--- a/include/gudhi/Bitmap_cubical_complex_base.h
+++ b/include/gudhi/Bitmap_cubical_complex_base.h
@@ -4,7 +4,7 @@
*
* Author(s): Pawel Dlotko
*
- * Copyright (C) 2015 INRIA Sophia-Saclay (France)
+ * Copyright (C) 2015 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
@@ -492,7 +492,7 @@ class Bitmap_cubical_complex_base {
this->multipliers.push_back(multiplier);
multiplier *= 2 * sizes[i] + 1;
}
- this->data = std::vector<T>(multiplier, std::numeric_limits<T>::max());
+ this->data = std::vector<T>(multiplier, std::numeric_limits<T>::infinity());
this->total_number_of_cells = multiplier;
}
@@ -562,7 +562,7 @@ void Bitmap_cubical_complex_base<T>::put_data_to_bins(T diameter_of_bin) {
template <typename T>
std::pair<T, T> Bitmap_cubical_complex_base<T>::min_max_filtration() {
- std::pair<T, T> min_max(std::numeric_limits<T>::max(), std::numeric_limits<T>::min());
+ std::pair<T, T> min_max(std::numeric_limits<T>::infinity(), -std::numeric_limits<T>::infinity());
for (std::size_t i = 0; i != this->data.size(); ++i) {
if (this->data[i] < min_max.first) min_max.first = this->data[i];
if (this->data[i] > min_max.second) min_max.second = this->data[i];