From cd0f1b7513be17bfca4de6ea4744a3d931694a8f Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 21 Mar 2017 21:05:04 +0000 Subject: Roll back bad modifications git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2216 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 832a1770a18476c18e7ba75754c5ee89225eaf34 --- .../example_one_skeleton_rips_from_points.cpp | 3 +- src/Rips_complex/include/gudhi/Rips_complex.h | 15 ----- src/Simplex_tree/example/simple_simplex_tree.cpp | 77 +--------------------- 3 files changed, 2 insertions(+), 93 deletions(-) diff --git a/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp b/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp index da915ecb..3fd69ebc 100644 --- a/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp +++ b/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp @@ -30,8 +30,7 @@ int main() { Rips_complex rips_complex_from_points(points, threshold, Euclidean_distance()); Simplex_tree stree; - rips_complex_from_points.create_complex(stree, 3); - stree.initialize_filtration(); + rips_complex_from_points.create_complex(stree, 1); // ---------------------------------------------------------------------------- // Display information about the one skeleton Rips complex // ---------------------------------------------------------------------------- diff --git a/src/Rips_complex/include/gudhi/Rips_complex.h b/src/Rips_complex/include/gudhi/Rips_complex.h index 42669e8b..1e4b76a7 100644 --- a/src/Rips_complex/include/gudhi/Rips_complex.h +++ b/src/Rips_complex/include/gudhi/Rips_complex.h @@ -116,21 +116,6 @@ class Rips_complex { // insert the proximity graph in the simplicial complex complex.insert_graph(rips_skeleton_graph_); - - std::cout << "********************************************************************\n"; - // Display the complex - std::cout << "* The complex contains " << complex.num_simplices() << " simplices\n"; - std::cout << " - dimension " << complex.dimension() << " - filtration " << complex.filtration() << "\n"; - std::cout << "* Iterator on Simplices in the filtration, with [filtration value]:\n"; - for (auto f_simplex : complex.filtration_simplex_range()) { - std::cout << " " << "[" << complex.filtration(f_simplex) << "] "; - for (auto vertex : complex.simplex_vertex_range(f_simplex)) { - std::cout << static_cast(vertex) << " "; - } - std::cout << std::endl; - } - - // expand the graph until dimension dim_max complex.expansion(dim_max); } diff --git a/src/Simplex_tree/example/simple_simplex_tree.cpp b/src/Simplex_tree/example/simple_simplex_tree.cpp index 19073305..60f9a35e 100644 --- a/src/Simplex_tree/example/simple_simplex_tree.cpp +++ b/src/Simplex_tree/example/simple_simplex_tree.cpp @@ -250,80 +250,5 @@ int main(int argc, char * const argv[]) { std::cout << "***+ YES IT IS!\n"; else std::cout << "***- NO IT ISN'T\n"; - //return 0; - - /* [0] 0 - [0] 1 - [0] 2 - [0] 3 - [0] 4 - [0] 5 - [0] 6 - [5] 3 2 - [5.38516] 5 4 - [5.83095] 2 0 - [6.08276] 1 0 - [6.32456] 3 1 - [6.7082] 2 1 - [7.28011] 6 5 - [8.94427] 4 2 - [9.43398] 3 0 - [9.48683] 6 4 - [11] 6 3 - */ - Simplex_tree stree; - typeVectorVertex graph = { 3, 2 }; - stree.insert_simplex(graph, Filtration_value(0.1)); - graph = { 2, 0 }; - stree.insert_simplex(graph, Filtration_value(0.1)); - graph = { 1, 0 }; - stree.insert_simplex(graph, Filtration_value(0.1)); - graph = { 3, 1 }; - stree.insert_simplex(graph, Filtration_value(0.1)); - graph = { 2, 1 }; - stree.insert_simplex(graph, Filtration_value(0.1)); - graph = { 6, 5 }; - stree.insert_simplex(graph, Filtration_value(0.1)); - graph = { 4, 2 }; - stree.insert_simplex(graph, Filtration_value(0.1)); - graph = { 3, 0 }; - stree.insert_simplex(graph, Filtration_value(0.1)); - graph = { 6, 4 }; - stree.insert_simplex(graph, Filtration_value(0.1)); - graph = { 6, 3 }; - stree.insert_simplex(graph, Filtration_value(0.1)); - - - // ++ GENERAL VARIABLE SET - stree.set_filtration(0.1); // Max filtration value - stree.set_dimension(2); // Max dimension = 2 -> (2,1,0) - - std::cout << "********************************************************************\n"; - // Display the stree - std::cout << "* The complex contains " << stree.num_simplices() << " simplices\n"; - std::cout << " - dimension " << stree.dimension() << " - filtration " << stree.filtration() << "\n"; - std::cout << "* Iterator on Simplices in the filtration, with [filtration value]:\n"; - for (auto f_simplex : stree.filtration_simplex_range()) { - std::cout << " " << "[" << stree.filtration(f_simplex) << "] "; - for (auto vertex : stree.simplex_vertex_range(f_simplex)) { - std::cout << static_cast(vertex) << " "; - } - std::cout << std::endl; - } - - stree.expansion(2); - stree.initialize_filtration(); - - std::cout << "********************************************************************\n"; - // Display the stree - std::cout << "* The complex contains " << stree.num_simplices() << " simplices\n"; - std::cout << " - dimension " << stree.dimension() << " - filtration " << stree.filtration() << "\n"; - std::cout << "* Iterator on Simplices in the filtration, with [filtration value]:\n"; - for (auto f_simplex : stree.filtration_simplex_range()) { - std::cout << " " << "[" << stree.filtration(f_simplex) << "] "; - for (auto vertex : stree.simplex_vertex_range(f_simplex)) { - std::cout << static_cast(vertex) << " "; - } - std::cout << std::endl; - } + return 0; } -- cgit v1.2.3