Code review : find_child implementation improvement

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/graph_expansion_with_blocker_oracle@2632 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: c4024b5a56b64dd168a5de1422a857ccebd606fb

1 files changed, 10 insertions, 5 deletions

diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index 88092b3d..aa097a38 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -1189,11 +1189,16 @@ class Simplex_tree {
    * Returns null_simplex() if it does not exist
   */
   Simplex_handle find_child(Simplex_handle sh, Vertex_handle vh) {
-    std::vector<Vertex_handle> child = {vh};
-    for (auto vertex : simplex_vertex_range(sh)) {
-      child.push_back(vertex);
-    }
-    return find(child);
+    if (!has_children(sh))
+      return null_simplex();
+
+    Simplex_handle child = sh->second.children()->find(vh);
+    // Specific case of boost::flat_map does not find, returns boost::flat_map::end()
+    // in simplex tree we want a null_simplex()
+    if (child == sh->second.children()->members().end())
+      return null_simplex();
+
+    return child;
   }
 
  public: