diff options
author | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-03-25 12:38:56 +0000 |
---|---|---|
committer | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-03-25 12:38:56 +0000 |
commit | 9280807119434e1ca4dd90267233ba01dfb0eeb6 (patch) | |
tree | 41bd747e1ca55b52a0a4d21e088ec7297aae813f /src/Witness_complex/include | |
parent | 1ec3e1ae82dab1109ce871f690df716fb05c6a16 (diff) | |
parent | 87032aea5bf14683d964ecd30bd9d744da975e1b (diff) |
Merged latest trunk to witness
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/witness@505 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: a90ff18c8991da76cf66daec3dc8f68c049cfe57
Diffstat (limited to 'src/Witness_complex/include')
-rw-r--r-- | src/Witness_complex/include/gudhi/Witness_complex.h | 4 | ||||
-rw-r--r-- | src/Witness_complex/include/gudhi/Witness_complex1.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/Witness_complex/include/gudhi/Witness_complex.h b/src/Witness_complex/include/gudhi/Witness_complex.h index 1a96128f..c6968e44 100644 --- a/src/Witness_complex/include/gudhi/Witness_complex.h +++ b/src/Witness_complex/include/gudhi/Witness_complex.h @@ -273,16 +273,12 @@ private: if (!map.empty()) { std::cout << map.begin()->first; - if (map.begin()->second.children() == root()) - std::cout << "Sweet potato"; if (has_children(map.begin())) print_sc(map.begin()->second.children()); typename Dictionary::iterator it; for (it = map.begin()+1; it != map.end(); ++it) { std::cout << "," << it->first; - if (map.begin()->second.children() == root()) - std::cout << "Sweet potato"; if (has_children(it)) print_sc(it->second.children()); } diff --git a/src/Witness_complex/include/gudhi/Witness_complex1.h b/src/Witness_complex/include/gudhi/Witness_complex1.h index 6950c3bf..49ba7529 100644 --- a/src/Witness_complex/include/gudhi/Witness_complex1.h +++ b/src/Witness_complex/include/gudhi/Witness_complex1.h @@ -334,10 +334,10 @@ private: if (j != i) { std::cout << "+++ We are at vertex=" << knn[witness_id][j] << std::endl; - if (curr_sibl->find(knn[witness_id][j]) == null_simplex()) + if (curr_sibl->members().find(knn[witness_id][j]) == null_simplex()) return false; std::cout << "++++ the simplex is there\n"; - curr_sh = curr_sibl->find(knn[witness_id][j]); + curr_sh = curr_sibl->members().find(knn[witness_id][j]); std::cout << "++++ curr_sh affectation is OK\n"; if (has_children(curr_sh)) curr_sibl = curr_sh->second.children(); |