diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/include/gudhi/distance_functions.h | 4 | ||||
| -rw-r--r-- | src/common/include/gudhi/reader_utils.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/common/include/gudhi/distance_functions.h b/src/common/include/gudhi/distance_functions.h index ed2c1f5d..58a513e7 100644 --- a/src/common/include/gudhi/distance_functions.h +++ b/src/common/include/gudhi/distance_functions.h @@ -32,12 +32,12 @@ /** @brief Compute the Euclidean distance between two Points given by a range of coordinates. The points are assumed to * have the same dimension. */ template< typename Filtration_value, typename Point > -Filtration_value euclidean_distance(const Point &p1,const Point &p2) { +Filtration_value euclidean_distance(const Point &p1, const Point &p2) { Filtration_value dist = 0.; auto it1 = p1.begin(); auto it2 = p2.begin(); for (; it1 != p1.end(); ++it1, ++it2) { - Filtration_value tmp = (double)(*it1) - (double)(*it2); + Filtration_value tmp = static_cast<double>(*it1) - static_cast<double>(*it2); dist += tmp*tmp; } return std::sqrt(dist); diff --git a/src/common/include/gudhi/reader_utils.h b/src/common/include/gudhi/reader_utils.h index ddec5ba7..2d774d4d 100644 --- a/src/common/include/gudhi/reader_utils.h +++ b/src/common/include/gudhi/reader_utils.h @@ -222,7 +222,7 @@ bool read_hasse_simplex(std::istream & in_, std::vector< Simplex_key > & boundar **/ template< typename Filtration_value > std::vector< std::vector< Filtration_value > > read_lower_triangular_matrix_from_csv_file(const std::string& filename, - const char separator=';') { + const char separator = ';') { #ifdef DEBUG_TRACES std::cout << "Using procedure read_lower_triangular_matrix_from_csv_file \n"; #endif // DEBUG_TRACES @@ -273,7 +273,6 @@ std::vector< std::vector< Filtration_value > > read_lower_triangular_matrix_from } if (!values_in_this_line.empty())result.push_back(values_in_this_line); ++number_of_line; - } in.close(); |