From 753ab8e366bb7d44b6cbe5e26d95c13317fc48c9 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Tue, 13 Feb 2018 16:55:41 +0000
Subject: Add documentation tests for example_vector_double_points_off_reader
 Fix Marc's comments about reader

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

Former-commit-id: 7dfb928c064c1286c1903cb91600ebace7a8fd47
---
 src/common/include/gudhi/Off_reader.h    | 29 ++++++++++++++++-------------
 src/common/include/gudhi/Points_off_io.h |  4 ++--
 2 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'src/common/include')

diff --git a/src/common/include/gudhi/Off_reader.h b/src/common/include/gudhi/Off_reader.h
index 4fcd2af2..32320e4d 100644
--- a/src/common/include/gudhi/Off_reader.h
+++ b/src/common/include/gudhi/Off_reader.h
@@ -105,25 +105,26 @@ class Off_reader {
     bool is_off_file = (line.find("OFF") != std::string::npos);
     bool is_noff_file = (line.find("nOFF") != std::string::npos);
 
+
+
     if (!is_off_file && !is_noff_file) {
       std::cerr << line << std::endl;
       std::cerr << "missing off header\n";
       return false;
     }
 
+    if (is_noff_file) {
+      // Should be on a separate line, but we accept it on the same line as the number of vertices
+      stream_ >> off_info_.dim;
+    } else {
+      off_info_.dim = 3;
+    }
+
     if (!goto_next_uncomment_line(line)) return false;
     std::istringstream iss(line);
-    if ((is_off_file) && (!is_noff_file)) {
-      off_info_.dim = 3;
-      if (!(iss >> off_info_.num_vertices >> off_info_.num_faces >> off_info_.num_edges)) {
-        std::cerr << "incorrect number of vertices/faces/edges\n";
-        return false;
-      }
-    } else {
-      if (!(iss >> off_info_.dim >> off_info_.num_vertices >> off_info_.num_faces >> off_info_.num_edges)) {
+    if (!(iss >> off_info_.num_vertices >> off_info_.num_faces >> off_info_.num_edges)) {
       std::cerr << "incorrect number of vertices/faces/edges\n";
       return false;
-      }
     }
     off_visitor.init(off_info_.dim, off_info_.num_vertices, off_info_.num_faces, off_info_.num_edges);
 
@@ -131,10 +132,12 @@ class Off_reader {
   }
 
   bool goto_next_uncomment_line(std::string& uncomment_line) {
-    uncomment_line.clear();
-    do
-      std::getline(stream_, uncomment_line); while (uncomment_line[0] == '%');
-    return (uncomment_line.size() > 0 && uncomment_line[0] != '%');
+    do {
+      // skip whitespace, including empty lines
+      if (!std::ifstream::sentry(stream_)) return false;
+      std::getline(stream_, uncomment_line);
+    } while (uncomment_line[0] == '#');
+    return (bool)stream_;
   }
 
   template<typename OffVisitor>
diff --git a/src/common/include/gudhi/Points_off_io.h b/src/common/include/gudhi/Points_off_io.h
index 29af8a8a..08f324c6 100644
--- a/src/common/include/gudhi/Points_off_io.h
+++ b/src/common/include/gudhi/Points_off_io.h
@@ -126,9 +126,9 @@ class Points_off_visitor_reader {
  * \code $> ./vector_double_off_reader ../../data/points/alphacomplexdoc.off
  * \endcode
  *
- * the program output is:
+ * the program outputs a file ../../data/points/alphacomplexdoc.off.txt:
  * 
- * \include common/cgaloffreader_result.txt
+ * \include common/vectordoubleoffreader_result.txt
  */
 template<typename Point_d>
 class Points_off_reader {
-- 
cgit v1.2.3