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

Former-commit-id: 324d557360a52e7181d9cf3c7d77c8445a367808

1 files changed, 5 insertions, 18 deletions

diff --git a/src/Nerve_GIC/example/GIC.cpp b/src/Nerve_GIC/example/GIC.cpp
index 5161a46b..30a485d5 100644
--- a/src/Nerve_GIC/example/GIC.cpp
+++ b/src/Nerve_GIC/example/GIC.cpp
@@ -3,7 +3,7 @@
 void usage(int nbArgs, char * const progName) {
   std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n";
   std::cerr << "Usage: " << progName << " filename.off threshold coordinate resolution gain\n";
-  std::cerr << "       i.e.: " << progName << " ../../data/points/test.off 1.5 1 10 0.3 \n";
+  std::cerr << "       i.e.: " << progName << " ../../../data/points/human.off 1.5 2 10 0.3 \n";
   exit(-1);  // ----- >>
 }
 
@@ -12,7 +12,6 @@ int main(int argc, char **argv) {
 
   std::string off_file_name(argv[1]);
   double threshold = atof(argv[2]);
-  //std::string func_file_name = argv[3];
   int coord = atoi(argv[3]);
   double resolution = atof(argv[4]);
   double gain = atof(argv[5]);
@@ -30,24 +29,12 @@ int main(int argc, char **argv) {
   Gudhi::graph_induced_complex::Graph_induced_complex GIC;
   GIC.set_verbose(verb);
 
-  GIC.set_graph_from_automatic_rips(off_file_name);
-  //GIC.set_graph_from_rips(threshold, off_file_name);
-  //GIC.set_graph_from_OFF(off_file_name);
-
+  GIC.set_graph_from_rips(threshold, off_file_name);
   GIC.set_function_from_coordinate(coord, off_file_name);
-  //GIC.set_function_from_file(func_file_name);
-
-  GIC.set_color_from_coordinate(coord, off_file_name);
-  //GIC.set_color_from_file(func_file_name);
-
-  GIC.set_automatic_resolution_for_GICMAP();
-  GIC.set_gain();
+  GIC.set_color_from_coordinate(off_file_name, coord);
+  GIC.set_resolution_double(resolution); GIC.set_gain(gain);
   GIC.set_cover_from_function(1);
-
-  //GIC.find_GIC_simplices();
-  //GIC.find_Nerve_simplices();
-  GIC.find_GICMAP_simplices_with_functional_minimal_cover();
-
+  GIC.find_GIC_simplices();
   GIC.plot_with_KeplerMapper();
 
   Simplex_tree stree; GIC.create_complex(stree);