breaking get_all_nodes into two separated functions

singnet · Oct 15, 2024 · 0db9905 · 0db9905
1 parent 2aa14ef
commit 0db9905
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 21 deletions.
diff --git a/hyperon_das_atomdb_cpp/src/adapters/ram_only.cc b/hyperon_das_atomdb_cpp/src/adapters/ram_only.cc
@@ -76,25 +76,29 @@ const StringList InMemoryDB::get_node_by_name_starting_with(const string& node_t
 }
 
 //------------------------------------------------------------------------------
-const StringList InMemoryDB::get_all_nodes(const string& node_type, bool names) const {
+const StringList InMemoryDB::get_all_nodes_handles(const string& node_type) const {
     auto node_type_hash = ExpressionHasher::named_type_hash(node_type);
     StringList node_handles;
-    if (names) {
-        for (const auto& [_, node] : this->db.node) {
-            if (node->composite_type_hash == node_type_hash) {
-                node_handles.emplace_back(node->name);
-            }
-        }
-    } else {
-        for (const auto& [handle, node] : this->db.node) {
-            if (node->composite_type_hash == node_type_hash) {
-                node_handles.emplace_back(handle);
-            }
+    for (const auto& [handle, node] : this->db.node) {
+        if (node->composite_type_hash == node_type_hash) {
+            node_handles.emplace_back(handle);
         }
     }
     return move(node_handles);
 }
 
+//------------------------------------------------------------------------------
+const StringList InMemoryDB::get_all_nodes_names(const string& node_type) const {
+    auto node_type_hash = ExpressionHasher::named_type_hash(node_type);
+    StringList node_names;
+    for (const auto& [_, node] : this->db.node) {
+        if (node->composite_type_hash == node_type_hash) {
+            node_names.emplace_back(node->name);
+        }
+    }
+    return move(node_names);
+}
+
 //------------------------------------------------------------------------------
 const StringUnorderedSet InMemoryDB::get_all_links(const string& link_type) const {
     StringUnorderedSet link_handles;

diff --git a/hyperon_das_atomdb_cpp/src/adapters/ram_only.h b/hyperon_das_atomdb_cpp/src/adapters/ram_only.h
@@ -123,7 +123,9 @@ class InMemoryDB : public AtomDB {
     const StringList get_node_by_name_starting_with(const string& node_type,
                                                     const string& startswith) const override;
 
-    const StringList get_all_nodes(const string& node_type, bool names = false) const override;
+    const StringList get_all_nodes_handles(const string& node_type) const override;
+
+    const StringList get_all_nodes_names(const string& node_type) const override;
 
     const StringUnorderedSet get_all_links(const string& link_type) const override;
 

diff --git a/hyperon_das_atomdb_cpp/src/database.h b/hyperon_das_atomdb_cpp/src/database.h
@@ -205,12 +205,18 @@ class AtomDB {
                                                             const string& startswith) const = 0;
 
     /**
-     * @brief Get all nodes of a specific type.
+     * @brief Get all nodes handles of a specific type.
      * @param node_type The node type.
-     * @param names If True, return node names instead of handles. Default is False.
-     * @return A list of node handles or names, depending on the value of `names`.
+     * @return A list of node handles.
      */
-    virtual const StringList get_all_nodes(const string& node_type, bool names = false) const = 0;
+    virtual const StringList get_all_nodes_handles(const string& node_type) const = 0;
+
+    /**
+     * @brief Get all nodes names of a specific type.
+     * @param node_type The node type.
+     * @return A list of names.
+     */
+    virtual const StringList get_all_nodes_names(const string& node_type) const = 0;
 
     /**
      * @brief Retrieves all links of the specified type from the database.

diff --git a/hyperon_das_atomdb_cpp/src/nanobind/atom_db_trampoline.h b/hyperon_das_atomdb_cpp/src/nanobind/atom_db_trampoline.h
@@ -19,7 +19,7 @@ namespace nb = nanobind;
  * allowing for custom behavior and additional functionality.
  */
 struct AtomDBTrampoline : AtomDB {
-    NB_TRAMPOLINE(AtomDB, 31);
+    NB_TRAMPOLINE(AtomDB, 32);
 
     const string get_node_handle(const string& node_type, const string& node_name) const override {
         NB_OVERRIDE_PURE(get_node_handle, node_type, node_name);
@@ -60,8 +60,12 @@ struct AtomDBTrampoline : AtomDB {
         NB_OVERRIDE_PURE(get_node_by_name_starting_with, node_type, startswith);
     }
 
-    const StringList get_all_nodes(const string& node_type, bool names = false) const override {
-        NB_OVERRIDE_PURE(get_all_nodes, node_type, names);
+    const StringList get_all_nodes_handles(const string& node_type) const override {
+        NB_OVERRIDE_PURE(get_all_nodes_handles, node_type);
+    }
+
+    const StringList get_all_nodes_names(const string& node_type) const override {
+        NB_OVERRIDE_PURE(get_all_nodes_names, node_type);
     }
 
     const StringUnorderedSet get_all_links(const string& link_type) const override {

diff --git a/hyperon_das_atomdb_cpp/src/nanobind/hyperon_das_atomdb_cpp_bind.cc b/hyperon_das_atomdb_cpp/src/nanobind/hyperon_das_atomdb_cpp_bind.cc
@@ -115,7 +115,8 @@ NB_MODULE(ext, m) {
              &AtomDB::get_node_by_name_starting_with,
              "node_type"_a,
              "startswith"_a)
-        .def("get_all_nodes", &AtomDB::get_all_nodes, "node_type"_a, "names"_a = false)
+        .def("get_all_nodes_handles", &AtomDB::get_all_nodes_handles, "node_type"_a)
+        .def("get_all_nodes_names", &AtomDB::get_all_nodes_names, "node_type"_a)
         .def(
             "get_all_links",
             [](AtomDB& self, const string& link_type, const nb::kwargs& _ = {})