From 69907a03283337e76d7763f82250b4e2a6b8f631 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Wed, 23 Nov 2016 07:35:46 +0000 Subject: Fix cpplint git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/distance_matrix_in_rips_module@1771 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 994e3bf769d236d230ac2f7e751aa310dabb74bb --- src/common/include/gudhi/distance_functions.h | 4 ++-- src/common/include/gudhi/reader_utils.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/common/include/gudhi') 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(*it1) - static_cast(*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(); -- cgit v1.2.3