From aa67dab1eebe3cdba573741857051005ba72cc3b Mon Sep 17 00:00:00 2001 From: mcarrier Date: Mon, 8 May 2017 16:56:25 +0000 Subject: git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Nerve_GIC@2406 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 2d857904595833667d469db97c746bbd8696eac4 --- src/Nerve_GIC/example/simple_GIC.cpp | 40 +++++++++++++++--------------------- 1 file changed, 17 insertions(+), 23 deletions(-) (limited to 'src/Nerve_GIC/example/simple_GIC.cpp') diff --git a/src/Nerve_GIC/example/simple_GIC.cpp b/src/Nerve_GIC/example/simple_GIC.cpp index 8b3aecb8..5161a46b 100644 --- a/src/Nerve_GIC/example/simple_GIC.cpp +++ b/src/Nerve_GIC/example/simple_GIC.cpp @@ -2,7 +2,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 [ouput_file.txt]\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"; exit(-1); // ----- >> } @@ -16,6 +16,7 @@ int main(int argc, char **argv) { int coord = atoi(argv[3]); double resolution = atof(argv[4]); double gain = atof(argv[5]); + bool verb = 0; if(argc == 7) verb = 1; // Type definitions using Graph_t = boost::adjacency_list < boost::vecS, boost::vecS, boost::undirectedS,\ @@ -27,8 +28,9 @@ int main(int argc, char **argv) { // ---------------------------------------------------------------------------- Gudhi::graph_induced_complex::Graph_induced_complex GIC; + GIC.set_verbose(verb); - GIC.set_graph_from_automatic_rips(100, off_file_name); + 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); @@ -38,9 +40,9 @@ int main(int argc, char **argv) { GIC.set_color_from_coordinate(coord, off_file_name); //GIC.set_color_from_file(func_file_name); - resolution = GIC.set_automatic_resolution_for_GICMAP(); - - GIC.set_cover_from_function(resolution,gain,1); + GIC.set_automatic_resolution_for_GICMAP(); + GIC.set_gain(); + GIC.set_cover_from_function(1); //GIC.find_GIC_simplices(); //GIC.find_Nerve_simplices(); @@ -50,34 +52,26 @@ int main(int argc, char **argv) { Simplex_tree stree; GIC.create_complex(stree); - std::streambuf* streambufffer; - std::ofstream ouput_file_stream; - - if (argc == 7) { - ouput_file_stream.open(std::string(argv[4])); - streambufffer = ouput_file_stream.rdbuf(); - } else { - streambufffer = std::cout.rdbuf(); - } - + std::streambuf* streambufffer = std::cout.rdbuf(); std::ostream output_stream(streambufffer); // ---------------------------------------------------------------------------- // Display information about the graph induced complex // ---------------------------------------------------------------------------- - output_stream << "Graph induced complex is of dimension " << stree.dimension() << + + if(verb){ + output_stream << "Graph induced complex is of dimension " << stree.dimension() << " - " << stree.num_simplices() << " simplices - " << stree.num_vertices() << " vertices." << std::endl; - output_stream << "Iterator on graph induced complex simplices" << std::endl; - for (auto f_simplex : stree.filtration_simplex_range()) { - for (auto vertex : stree.simplex_vertex_range(f_simplex)) { - output_stream << vertex << " "; + output_stream << "Iterator on graph induced complex simplices" << std::endl; + for (auto f_simplex : stree.filtration_simplex_range()) { + for (auto vertex : stree.simplex_vertex_range(f_simplex)) { + output_stream << vertex << " "; + } + output_stream << std::endl; } - output_stream << std::endl; } - ouput_file_stream.close(); - return 0; } -- cgit v1.2.3