code review: DRY for nodes_by_label

GUDHI · Oct 23, 2024 · f8de11a · f8de11a
1 parent 0f8a7b8
commit f8de11a
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -2378,17 +2378,15 @@ class Simplex_tree {
   std::unordered_map<Vertex_handle, List_max_vertex> nodes_label_to_list_;
 
   List_max_vertex* nodes_by_label(Vertex_handle v) {
-    if constexpr (Options::link_nodes_by_label) {
-      auto it_v = nodes_label_to_list_.find(v);
-      if (it_v != nodes_label_to_list_.end()) {
-        return &(it_v->second);
-      } else {
-        return nullptr;
-      }
-    }
-    return nullptr;
+    // Scott Meyers in Effective C++ 3rd Edition. On page 23, Item 3: a non const method can safely call a const one
+    // Doing it the other way is not safe
+    return const_cast<List_max_vertex*>(_nodes_by_label(v));
   }
   List_max_vertex const* nodes_by_label(Vertex_handle v) const {
+    return _nodes_by_label(v);
+  }
+
+  List_max_vertex const* _nodes_by_label(Vertex_handle v) const {
     if constexpr (Options::link_nodes_by_label) {
       auto it_v = nodes_label_to_list_.find(v);
       if (it_v != nodes_label_to_list_.end()) {