From c64433834bdf168975aa7785b03cdcfdd67c6915 Mon Sep 17 00:00:00 2001
From: pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Sun, 7 Jan 2018 08:09:22 +0000
Subject: reading ug fixed.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/persistence_representations_fix_reading@3114 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: b1476d1db101bc4c7377d9e5e34445ee6cd7cf9a
---
 .../include/gudhi/Persistence_heat_maps.h                            | 4 ++--
 .../include/gudhi/Persistence_landscape.h                            | 3 ++-
 src/Persistence_representations/include/gudhi/Persistence_vectors.h  | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/Persistence_representations/include')

diff --git a/src/Persistence_representations/include/gudhi/Persistence_heat_maps.h b/src/Persistence_representations/include/gudhi/Persistence_heat_maps.h
index 04dd78ad..2d4221c0 100644
--- a/src/Persistence_representations/include/gudhi/Persistence_heat_maps.h
+++ b/src/Persistence_representations/include/gudhi/Persistence_heat_maps.h
@@ -797,8 +797,8 @@ void Persistence_heat_maps<Scalling_of_kernels>::load_from_file(const char* file
 
   std::string temp;
   std::getline(in, temp);
-
-  while (!in.eof()) {
+  //change 
+  while (in.good()) {
     std::getline(in, temp);
     std::stringstream lineSS;
     lineSS << temp;
diff --git a/src/Persistence_representations/include/gudhi/Persistence_landscape.h b/src/Persistence_representations/include/gudhi/Persistence_landscape.h
index 5c300112..e8d53cb4 100644
--- a/src/Persistence_representations/include/gudhi/Persistence_landscape.h
+++ b/src/Persistence_representations/include/gudhi/Persistence_landscape.h
@@ -954,7 +954,8 @@ void Persistence_landscape::load_landscape_from_file(const char* filename) {
   std::vector<std::pair<double, double> > landscapeAtThisLevel;
 
   bool isThisAFirsLine = true;
-  while (!in.eof()) {
+  //change
+  while (in.good()) {
     getline(in, line);
     if (!(line.length() == 0 || line[0] == '#')) {
       std::stringstream lineSS;
diff --git a/src/Persistence_representations/include/gudhi/Persistence_vectors.h b/src/Persistence_representations/include/gudhi/Persistence_vectors.h
index 0fb49eee..efa61d95 100644
--- a/src/Persistence_representations/include/gudhi/Persistence_vectors.h
+++ b/src/Persistence_representations/include/gudhi/Persistence_vectors.h
@@ -617,9 +617,8 @@ void Vector_distances_in_diagram<F>::load_from_file(const char* filename) {
   }
 
   double number;
-  while (true) {
-    in >> number;
-    if (in.eof()) break;
+  //change
+  while (in >> number) {    
     this->sorted_vector_of_distances.push_back(number);
   }
   in.close();
-- 
cgit v1.2.3