Merged latest trunk changes to Nerve_GIC

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

Former-commit-id: 866ddfadee8160dfaa46b8d703fd8d8d4476892a

1 files changed, 16 insertions, 8 deletions

diff --git a/src/Bitmap_cubical_complex/example/Bitmap_cubical_complex.cpp b/src/Bitmap_cubical_complex/example/Bitmap_cubical_complex.cpp
index e6bc6648..67735ba1 100644
--- a/src/Bitmap_cubical_complex/example/Bitmap_cubical_complex.cpp
+++ b/src/Bitmap_cubical_complex/example/Bitmap_cubical_complex.cpp
@@ -27,8 +27,9 @@
 
 // standard stuff
 #include <iostream>
-#include <sstream>
+#include <string>
 #include <vector>
+#include <cstddef>
 
 int main(int argc, char** argv) {
   std::cout << "This program computes persistent homology, by using bitmap_cubical_complex class, of cubical " <<
@@ -38,9 +39,6 @@ int main(int argc, char** argv) {
       "filtrations of top dimensional cells. We assume that the cells are in the lexicographical order. See " <<
       "CubicalOneSphere.txt or CubicalTwoSphere.txt for example.\n" << std::endl;
 
-  int p = 2;
-  double min_persistence = 0;
-
   if (argc != 2) {
     std::cerr << "Wrong number of parameters. Please provide the name of a file with a Perseus style bitmap at " <<
         "the input. The program will now terminate.\n";
@@ -56,16 +54,26 @@ int main(int argc, char** argv) {
 
   // Compute the persistence diagram of the complex
   Persistent_cohomology pcoh(b);
+  int p = 2;
+  double min_persistence = 0;
+
   pcoh.init_coefficients(p);  // initializes the coefficient field for homology
   pcoh.compute_persistent_cohomology(min_persistence);
 
-  std::stringstream ss;
-  ss << argv[1] << "_persistence";
-  std::ofstream out(ss.str().c_str());
+  std::string output_file_name(argv[1]);
+  output_file_name += "_persistence";
+
+  std::size_t last_in_path = output_file_name.find_last_of("/\\");
+
+  if (last_in_path != std::string::npos) {
+    output_file_name = output_file_name.substr(last_in_path+1);
+  }
+
+  std::ofstream out(output_file_name.c_str());
   pcoh.output_diagram(out);
   out.close();
 
-  std::cout << "Result in file: " << ss.str().c_str() << "\n";
+  std::cout << "Result in file: " << output_file_name << "\n";
 
   return 0;
 }