From 1ae99c5f04b6d14a730bdc8fea2e77d33665cd26 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Thu, 14 Dec 2017 12:31:48 +0000
Subject: Add cmake improvement for Persistence representation module. Was bad
 tested and too hard to maintain

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

Former-commit-id: fa4684701edbe6d172e75f119afa912eb3b5dad7
---
 .../plot_persistence_Betti_numbers.cpp             | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/Persistence_representations/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp')

diff --git a/src/Persistence_representations/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp b/src/Persistence_representations/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp
index da2b9319..b433c2b3 100644
--- a/src/Persistence_representations/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp
+++ b/src/Persistence_representations/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp
@@ -20,7 +20,6 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/reader_utils.h>
 #include <gudhi/Persistence_intervals.h>
 
 #include <iostream>
@@ -31,29 +30,24 @@
 using Persistence_intervals = Gudhi::Persistence_representations::Persistence_intervals;
 
 int main(int argc, char** argv) {
-  std::cout << "This program compute a plot of persistence Betti numbers. The input parameter is a file with "
-               "persistence intervals. \n";
-  std::cout << "The second optional parameter of a program is the dimension of the persistence that is to be used. If "
-               "your file contains only birth-death pairs, you can skip this parameter\n";
-  if (argc < 2) {
-    std::cout << "To run this program, please provide the name of a file with persistence diagram and number of "
-                 "dominant intervals you would like to get \n";
+  if ((argc != 3) && (argc != 2)) {
+    std::cout << "This program creates a gnuplot script of Betti numbers from a single persistence diagram file"
+              << "(*.pers).\n"
+              << "To run this program, please provide the name of a file with persistence diagram.\n"
+              << "The second optional parameter of a program is the dimension of the persistence that is to be used. "
+              << "If your file contains only birth-death pairs, you can skip this parameter.\n";
     return 1;
   }
+
   unsigned dimension = std::numeric_limits<unsigned>::max();
   int dim = -1;
-  if (argc > 2) {
+  if (argc == 3) {
     dim = atoi(argv[2]);
   }
   if (dim >= 0) {
     dimension = (unsigned)dim;
   }
 
-  std::stringstream gnuplot_script;
-  gnuplot_script << argv[1] << "_Gnuplot_script";
-  std::ofstream out;
-  out.open(gnuplot_script.str().c_str());
-
   Persistence_intervals p(argv[1], dimension);
   std::vector<std::pair<double, size_t> > pbns = p.compute_persistent_betti_numbers();
 
@@ -69,6 +63,11 @@ int main(int argc, char** argv) {
   xRangeEnd += (xRangeEnd - xRangeBegin) / 100.0;
   yRangeEnd += yRangeEnd / 100;
 
+  std::stringstream gnuplot_script;
+  gnuplot_script << argv[1] << "_GnuplotScript";
+  std::ofstream out;
+  out.open(gnuplot_script.str().c_str());
+
   out << "set xrange [" << xRangeBegin << " : " << xRangeEnd << "]" << std::endl;
   out << "set yrange [" << yRangeBegin << " : " << yRangeEnd << "]" << std::endl;
   out << "plot '-' using 1:2 notitle with lp " << std::endl;
@@ -81,7 +80,8 @@ int main(int argc, char** argv) {
   out << std::endl;
   out.close();
 
-  std::cout << "To visualize, open gnuplot and type: load \'" << gnuplot_script.str().c_str() << "\'" << std::endl;
+  std::cout << "To visualize, install gnuplot and type the command: gnuplot -persist -e \"load \'"
+            << gnuplot_script.str().c_str() << "\'\"" << std::endl;
 
   return 0;
 }
-- 
cgit v1.2.3