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

Former-commit-id: f4998927b72b677f51727fb4efa5ea9fe0c0916f

1 files changed, 9 insertions, 5 deletions

diff --git a/src/Nerve_GIC/example/simple_GIC.cpp b/src/Nerve_GIC/example/simple_GIC.cpp
index d9297d04..a2b021f6 100644
--- a/src/Nerve_GIC/example/simple_GIC.cpp
+++ b/src/Nerve_GIC/example/simple_GIC.cpp
@@ -2,17 +2,19 @@
 
 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 cover [ouput_file.txt]\n";
+  std::cerr << "Usage: " << progName << " filename.off threshold function resolution gain [ouput_file.txt]\n";
   std::cerr << "       i.e.: " << progName << " ../../data/points/test.off 1.5 test_cov \n";
   exit(-1);  // ----- >>
 }
 
 int main(int argc, char **argv) {
-  if ((argc != 4) && (argc != 5)) usage(argc, (argv[0] - 1));
+  if ((argc != 6) && (argc != 7)) usage(argc, (argv[0] - 1));
 
   std::string off_file_name(argv[1]);
   double threshold = atof(argv[2]);
-  std::string cover_file_name(argv[3]);
+  std::string function_file_name(argv[3]);
+  double resolution = atof(argv[4]);
+  double gain = atof(argv[5]);
 
   // Type definitions
   using Graph_t = boost::adjacency_list < boost::vecS, boost::vecS, boost::undirectedS,\
@@ -24,13 +26,15 @@ int main(int argc, char **argv) {
   // ----------------------------------------------------------------------------
 
   Gudhi::graph_induced_complex::Graph_induced_complex GIC;
-  GIC.set_graph_simplex_tree(threshold, off_file_name); GIC.set_cover(cover_file_name); GIC.find_simplices();
+  GIC.set_graph_simplex_tree(threshold, off_file_name);
+  GIC.set_cover_from_function(function_file_name,resolution,gain,0);
+  GIC.find_simplices();
   Simplex_tree stree; GIC.create_complex(stree);
 
   std::streambuf* streambufffer;
   std::ofstream ouput_file_stream;
 
-  if (argc == 5) {
+  if (argc == 7) {
     ouput_file_stream.open(std::string(argv[4]));
     streambufffer = ouput_file_stream.rdbuf();
   } else {