From 413f0c97bd70642a107d1479e9e8762fd24f300d Mon Sep 17 00:00:00 2001 From: skachano Date: Fri, 16 Dec 2016 17:09:07 +0000 Subject: Got filtration value right git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@1911 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: fcca8ce0da982092e8ea09e40f329afa9b21989b --- src/Witness_complex/include/gudhi/Strong_witness_complex.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Witness_complex/include/gudhi/Strong_witness_complex.h b/src/Witness_complex/include/gudhi/Strong_witness_complex.h index 4b39704e..a3f88aae 100644 --- a/src/Witness_complex/include/gudhi/Strong_witness_complex.h +++ b/src/Witness_complex/include/gudhi/Strong_witness_complex.h @@ -163,7 +163,7 @@ private: typeVectorVertex& vertices = simplex; //'simplex' now will be called vertices while (aw_it != aw.end() && aw_it->second < lim_dist2) { typeVectorVertex facet = {}; - add_all_faces_of_dimension(limit_dimension, vertices, vertices.begin(), aw_it, facet, complex); + add_all_faces_of_dimension(limit_dimension, vertices, vertices.begin(), aw_it, aw_it->second - aw.begin()->second, facet, complex); vertices.push_back(aw_it->first); aw_it++; } @@ -186,6 +186,7 @@ private: typeVectorVertex& vertices, typename typeVectorVertex::iterator curr_it, typename ActiveWitness::iterator aw_it, + FT filtration_value, typeVectorVertex& simplex, SimplicialComplexForWitness& sc) { @@ -197,6 +198,7 @@ private: vertices, next_it, aw_it, + filtration_value, simplex, sc); simplex.pop_back(); @@ -204,12 +206,13 @@ private: vertices, next_it, aw_it, + filtration_value, simplex, sc); } else if (dim == 0) { simplex.push_back(aw_it->first); - sc.insert_simplex_and_subfaces(simplex, aw_it->second); + sc.insert_simplex_and_subfaces(simplex, filtration_value); simplex.pop_back(); } } -- cgit v1.2.3