remove the child merge stuff

Author: jjcmoon

.gitignore

@@ -12,4 +12,5 @@ __pycache__
 cmake-build-debug
 .venv
 tmp
-data
+data
+_build

src/circuit.cpp

@@ -108,30 +108,6 @@ Node* Circuit::add_node_level_compressed(Node* node) {
 }
 
 
-Node* Circuit::add_node_merge(Node *node) {
-    Node* new_node; // The hash of the first node might be spoiled
-    if (node->type == NodeType::Or) {
-        new_node = Node::createOrNode();
-    } else if (node->type == NodeType::And) {
-        new_node = Node::createAndNode();
-    } else {
-        return add_node_level_compressed(node);
-    }
-
-    emhash8::HashSet<Node*, NodeHash, NodeEqual> children_set = {};
-    for (auto child: node->children) {
-        while (child->layer < node->layer - 1)
-            child = add_node(child->dummy_parent());
-        children_set.insert(child);
-    }
-    delete node;
-
-    for (auto child: children_set)
-        new_node->add_child(child);
-
-    return add_node_level_compressed(new_node);
-}
-
 /**
  * Auxiliary method for Circuit::add_sdd_from_file
  */
@@ -492,37 +468,6 @@ std::pair<Arrays, Arrays> Circuit::get_indices() {
 }
 
 
-NodePtr Circuit::disjoin(std::vector<NodePtr> nodes) {
-    Node* or_node = Node::createOrNode();
-    for (NodePtr node_ptr: nodes) {
-        Node* node = node_ptr.get();
-        if (node->type == NodeType::Or) {
-            for (Node* ch: node->children)
-                or_node->add_child(ch);
-        } else {
-            or_node->add_child(node);
-        }
-    }
-    return NodePtr(add_node_merge(or_node));
-}
-
-
-NodePtr Circuit::conjoin(std::vector<NodePtr> nodes) {
-    Node* and_node = Node::createAndNode();
-    for (NodePtr node_ptr: nodes) {
-        Node* node = node_ptr.get();
-        if (node->type == NodeType::And) {
-            for (Node* ch: node->children)
-                and_node->add_child(ch);
-        } else {
-            and_node->add_child(node);
-        }
-    }
-    return NodePtr(add_node_merge(and_node));
-}
-
-
-
 NB_MODULE(nanobind_ext, m) {
 m.doc() = "Layerize arithmetic circuits";
 
@@ -537,8 +482,6 @@ nb::class_<Circuit>(m, "Circuit", "Circuits are the main class added by KLay, an
 .def("add_sdd_from_file", &Circuit::add_sdd_from_file, "filename"_a, "true_lits"_a = std::vector<int>(), "false_lits"_a = std::vector<int>(), "Add an SDD circuit from file.\n\n:param filename:\n\tPath to the :code:`.sdd` file on disk.\n:param true_lits:\n\tList of literals that are always true and should get propagated away.\n:param false_lits:\n\tList of literals that are always false and should get propagated away.")
 .def("add_d4_from_file", &Circuit::add_d4_from_file, "filename"_a, "true_lits"_a = std::vector<int>(), "false_lits"_a = std::vector<int>(), "Add an NNF circuit in the D4 format from file.\n\n:param filename:\n\tPath to the :code:`.nnf` file on disk.\n:param true_lits:\n\tList of literals that are always true and should get propagated away.\n:param false_lits:\n\tList of literals that are always false and should get propagated away.")
 .def("_get_indices", &Circuit::get_indices)
-.def("disjoin", &Circuit::disjoin)
-.def("conjoin", &Circuit::conjoin)
 .def("nb_nodes", &Circuit::nb_nodes, "Number of nodes in the circuit.")
 .def("nb_root_nodes", &Circuit::nb_root_nodes, "Number of root nodes in the circuit.")
 .def("true_node", &Circuit::true_node, "Adds a true node to the circuit, and returns a pointer to this node.")

src/circuit.h

@@ -132,11 +132,6 @@ class Circuit {
      */
     Node* add_node_level_compressed(Node* node);
 
-    /**
-     * De-duplicate the children of the node and add it to the circuit.
-     */
-    Node* add_node_merge(Node* node);
-
     /**
      * Get the corresponding node in the circuit.
      * This may be a different node instance with the same hash and
@@ -232,7 +227,4 @@ class Circuit {
         }
         return NodePtr(add_node_level_compressed(node));
     }
-
-    NodePtr disjoin(std::vector<NodePtr> nodes);
-    NodePtr conjoin(std::vector<NodePtr> nodes);
 };

tests/test_manual.py

@@ -19,19 +19,6 @@ def test_or_node():
     assert m(weights) == 0.4 + (1 - 0.8)
 
 
-def test_disjoin_conjoin():
-    c = klay.Circuit()
-    l1, l2, l3 = c.literal_node(1), c.literal_node(-2), c.literal_node(3)
-    or_node1 = c.disjoin([l1, l2, l2])
-    or_node2 = c.disjoin([l3, or_node1, l3, or_node1])
-    c.set_root(or_node2)
-
-    m = c.to_torch_module(semiring='real')
-    weights = torch.tensor([0.4, 0.8, 0.5])
-    expected_result = torch.tensor(0.4 + (1 - 0.8) + 0.5)
-    assert torch.allclose(m(weights), expected_result)
-
-
 def test_probabilistic():
     c = klay.Circuit()
     l1, l2, l3 = c.literal_node(1), c.literal_node(-2), c.literal_node(3)