From 3459c495a4bd7ffc0d17d1dee02b9416d74b3cd0 Mon Sep 17 00:00:00 2001 From: mcarrier Date: Thu, 26 Jan 2017 18:13:53 +0000 Subject: git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Nerve_GIC@2017 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 734dc64ee7916048c83805e2a0ce5cc471db59f2 --- src/Nerve_GIC/include/gudhi/GIC.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/Nerve_GIC/include') diff --git a/src/Nerve_GIC/include/gudhi/GIC.h b/src/Nerve_GIC/include/gudhi/GIC.h index 1a156bd5..d8046611 100644 --- a/src/Nerve_GIC/include/gudhi/GIC.h +++ b/src/Nerve_GIC/include/gudhi/GIC.h @@ -63,13 +63,14 @@ class Graph_induced_complex { std::vector > cliques; public: + template void create_complex(SimplicialComplexForGIC & complex) { size_t sz = cliques.size(); for(int i = 0; i < sz; i++) complex.insert_simplex_and_subfaces(cliques[i]); } public: - void find_all_simplices(std::vector & cliques, const std::vector > & cover_elts, int & token, std::vector & simplex_tmp){ + void find_all_simplices(std::vector > & cliques, const std::vector > & cover_elts, int & token, std::vector & simplex_tmp){ int num_nodes = cover_elts.size(); if(token == num_nodes-1){ int num_clus = cover_elts[token].size(); @@ -81,8 +82,8 @@ class Graph_induced_complex { else{ int num_clus = cover_elts[token].size(); for(int i = 0; i < num_clus; i++){ - std::vector simplex = simplex_tmp; simplex.push_back(cover_elts[token][i]); - find_all_simplices(cliques, cover_elts, ++tok, simplex); + std::vector simplex = simplex_tmp; simplex.push_back(cover_elts[token][i]); + find_all_simplices(cliques, cover_elts, ++token, simplex); } } } @@ -97,11 +98,11 @@ class Graph_induced_complex { * `Cover_value`. * */ - template - Graph_induced_complex(const Graph_t& G, const Cover& C, const int& max_dim) { + template + Graph_induced_complex(Simplex_tree & st, const Cover& C, const int& max_dim) { // Construct the Simplex Tree corresponding to the graph - Simplex_tree<> st; st.insert_graph(G); st.expansion(max_dim); + st.expansion(max_dim); // Find complexes of GIC cliques.clear(); -- cgit v1.2.3