From db8ead2c9af51efa2c94ff3d08b46cea82542a61 Mon Sep 17 00:00:00 2001 From: p-zach Date: Mon, 14 Apr 2025 18:55:36 -0400 Subject: [PATCH] Add remove-cell tags --- gtsam/inference/doc/BayesNet.ipynb | 5 +++- gtsam/inference/doc/BayesTree.ipynb | 5 +++- gtsam/inference/doc/ClusterTree.ipynb | 5 +++- gtsam/inference/doc/Conditional.ipynb | 5 +++- gtsam/inference/doc/DotWriter.ipynb | 7 ++++-- gtsam/inference/doc/EdgeKey.ipynb | 5 +++- gtsam/inference/doc/EliminationTree.ipynb | 5 +++- gtsam/inference/doc/Factor.ipynb | 5 +++- gtsam/inference/doc/FactorGraph.ipynb | 5 +++- gtsam/inference/doc/ISAM.ipynb | 5 +++- gtsam/inference/doc/JunctionTree.ipynb | 5 +++- gtsam/inference/doc/Key.ipynb | 5 +++- gtsam/inference/doc/LabeledSymbol.ipynb | 5 +++- gtsam/inference/doc/Ordering.ipynb | 28 ++++++++++------------- gtsam/inference/doc/Symbol.ipynb | 5 +++- gtsam/inference/doc/VariableIndex.ipynb | 5 +++- 16 files changed, 73 insertions(+), 32 deletions(-) diff --git a/gtsam/inference/doc/BayesNet.ipynb b/gtsam/inference/doc/BayesNet.ipynb index 786fdd9c9..82f545363 100644 --- a/gtsam/inference/doc/BayesNet.ipynb +++ b/gtsam/inference/doc/BayesNet.ipynb @@ -45,7 +45,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "bayesnet_pip_code" + "id": "bayesnet_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/BayesTree.ipynb b/gtsam/inference/doc/BayesTree.ipynb index 3a3d2049e..a5f6479e4 100644 --- a/gtsam/inference/doc/BayesTree.ipynb +++ b/gtsam/inference/doc/BayesTree.ipynb @@ -50,7 +50,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "bayestree_pip_code" + "id": "bayestree_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/ClusterTree.ipynb b/gtsam/inference/doc/ClusterTree.ipynb index b29a78970..402680078 100644 --- a/gtsam/inference/doc/ClusterTree.ipynb +++ b/gtsam/inference/doc/ClusterTree.ipynb @@ -35,7 +35,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "clustertree_pip_code" + "id": "clustertree_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/Conditional.ipynb b/gtsam/inference/doc/Conditional.ipynb index 2bfd0f10c..9f6a53665 100644 --- a/gtsam/inference/doc/Conditional.ipynb +++ b/gtsam/inference/doc/Conditional.ipynb @@ -56,7 +56,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "conditional_pip_code" + "id": "conditional_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/DotWriter.ipynb b/gtsam/inference/doc/DotWriter.ipynb index c048bf353..81a72316d 100644 --- a/gtsam/inference/doc/DotWriter.ipynb +++ b/gtsam/inference/doc/DotWriter.ipynb @@ -33,11 +33,14 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "dotwriter_pip_code" + "id": "dotwriter_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ - "%pip install gtsam graphviz" + "%pip install gtsam" ] }, { diff --git a/gtsam/inference/doc/EdgeKey.ipynb b/gtsam/inference/doc/EdgeKey.ipynb index d80e7cfa6..ca55d6619 100644 --- a/gtsam/inference/doc/EdgeKey.ipynb +++ b/gtsam/inference/doc/EdgeKey.ipynb @@ -31,7 +31,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "edgekey_pip_code" + "id": "edgekey_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/EliminationTree.ipynb b/gtsam/inference/doc/EliminationTree.ipynb index 703415455..11b3d2ec9 100644 --- a/gtsam/inference/doc/EliminationTree.ipynb +++ b/gtsam/inference/doc/EliminationTree.ipynb @@ -37,7 +37,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "etree_pip_code" + "id": "etree_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/Factor.ipynb b/gtsam/inference/doc/Factor.ipynb index 81812bcc2..40a53193d 100644 --- a/gtsam/inference/doc/Factor.ipynb +++ b/gtsam/inference/doc/Factor.ipynb @@ -44,7 +44,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "factor_pip_code" + "id": "factor_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/FactorGraph.ipynb b/gtsam/inference/doc/FactorGraph.ipynb index 01e111e1e..07633ae9c 100644 --- a/gtsam/inference/doc/FactorGraph.ipynb +++ b/gtsam/inference/doc/FactorGraph.ipynb @@ -46,7 +46,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "fg_pip_code" + "id": "fg_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/ISAM.ipynb b/gtsam/inference/doc/ISAM.ipynb index 3d1e4cddf..7e6a43269 100644 --- a/gtsam/inference/doc/ISAM.ipynb +++ b/gtsam/inference/doc/ISAM.ipynb @@ -35,7 +35,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "isam_pip_code" + "id": "isam_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/JunctionTree.ipynb b/gtsam/inference/doc/JunctionTree.ipynb index 9229a9004..7ebafb831 100644 --- a/gtsam/inference/doc/JunctionTree.ipynb +++ b/gtsam/inference/doc/JunctionTree.ipynb @@ -37,7 +37,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "jtree_pip_code" + "id": "jtree_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/Key.ipynb b/gtsam/inference/doc/Key.ipynb index 2acbd8c63..d643869da 100644 --- a/gtsam/inference/doc/Key.ipynb +++ b/gtsam/inference/doc/Key.ipynb @@ -31,7 +31,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "key_pip_code" + "id": "key_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/LabeledSymbol.ipynb b/gtsam/inference/doc/LabeledSymbol.ipynb index 1c49fdff9..2e8295086 100644 --- a/gtsam/inference/doc/LabeledSymbol.ipynb +++ b/gtsam/inference/doc/LabeledSymbol.ipynb @@ -31,7 +31,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "lsymbol_pip_code" + "id": "lsymbol_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/Ordering.ipynb b/gtsam/inference/doc/Ordering.ipynb index d8099ac7a..9dfcd0b4a 100644 --- a/gtsam/inference/doc/Ordering.ipynb +++ b/gtsam/inference/doc/Ordering.ipynb @@ -33,7 +33,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "ordering_pip_code" + "id": "ordering_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ @@ -42,7 +45,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 1, "metadata": { "id": "ordering_import_code" }, @@ -96,7 +99,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": null, "metadata": { "colab": { "base_uri": "https://localhost:8080/" @@ -106,21 +109,14 @@ }, "outputs": [ { - "name": "stdout", - "output_type": "stream", - "text": [ - "COLAMD Ordering: Position 0: l1, x0, x1, l2, x2\n" - ] - }, - { - "ename": "AttributeError", - "evalue": "type object 'gtsam.gtsam.Ordering' has no attribute 'ColamdConstrainedLast'", + "ename": "TypeError", + "evalue": "Colamd(): incompatible function arguments. The following argument types are supported:\n 1. (variableIndex: gtsam::VariableIndex) -> gtsam.gtsam.Ordering\n\nInvoked with: kwargs: graph=SymbolicFactorGraph \nsize: 7\nfactor 0: x0\nfactor 1: x0 x1\nfactor 2: x1 x2\nfactor 3: x0 l1\nfactor 4: x1 l1\nfactor 5: x1 l2\nfactor 6: x2 l2\n", "output_type": "error", "traceback": [ "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m", - "\u001b[1;31mAttributeError\u001b[0m Traceback (most recent call last)", - "Cell \u001b[1;32mIn[7], line 17\u001b[0m\n\u001b[0;32m 14\u001b[0m colamd_ordering\u001b[38;5;241m.\u001b[39mprint(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mCOLAMD Ordering: \u001b[39m\u001b[38;5;124m\"\u001b[39m)\n\u001b[0;32m 16\u001b[0m \u001b[38;5;66;03m# Constrained COLAMD (force x0 and x2 to be eliminated last)\u001b[39;00m\n\u001b[1;32m---> 17\u001b[0m constrained_ordering \u001b[38;5;241m=\u001b[39m \u001b[43mOrdering\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mColamdConstrainedLast\u001b[49m(graph, gtsam\u001b[38;5;241m.\u001b[39mKeyVector([X(\u001b[38;5;241m0\u001b[39m), X(\u001b[38;5;241m2\u001b[39m)]))\n\u001b[0;32m 18\u001b[0m constrained_ordering\u001b[38;5;241m.\u001b[39mprint(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mConstrained COLAMD (x0, x2 last): \u001b[39m\u001b[38;5;124m\"\u001b[39m)\n\u001b[0;32m 20\u001b[0m \u001b[38;5;66;03m# METIS ordering (if GTSAM was built with METIS support)\u001b[39;00m\n", - "\u001b[1;31mAttributeError\u001b[0m: type object 'gtsam.gtsam.Ordering' has no attribute 'ColamdConstrainedLast'" + "\u001b[1;31mTypeError\u001b[0m Traceback (most recent call last)", + "Cell \u001b[1;32mIn[3], line 13\u001b[0m\n\u001b[0;32m 10\u001b[0m graph\u001b[38;5;241m.\u001b[39mpush_factor(X(\u001b[38;5;241m2\u001b[39m), L(\u001b[38;5;241m2\u001b[39m))\n\u001b[0;32m 12\u001b[0m \u001b[38;5;66;03m# COLAMD (Column Approximate Minimum Degree) ordering\u001b[39;00m\n\u001b[1;32m---> 13\u001b[0m colamd_ordering \u001b[38;5;241m=\u001b[39m \u001b[43mOrdering\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mColamd\u001b[49m\u001b[43m(\u001b[49m\u001b[43mgraph\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mgraph\u001b[49m\u001b[43m)\u001b[49m\n\u001b[0;32m 14\u001b[0m colamd_ordering\u001b[38;5;241m.\u001b[39mprint(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mCOLAMD Ordering: \u001b[39m\u001b[38;5;124m\"\u001b[39m)\n\u001b[0;32m 16\u001b[0m \u001b[38;5;66;03m# Constrained COLAMD (force x0 and x2 to be eliminated last)\u001b[39;00m\n", + "\u001b[1;31mTypeError\u001b[0m: Colamd(): incompatible function arguments. The following argument types are supported:\n 1. (variableIndex: gtsam::VariableIndex) -> gtsam.gtsam.Ordering\n\nInvoked with: kwargs: graph=SymbolicFactorGraph \nsize: 7\nfactor 0: x0\nfactor 1: x0 x1\nfactor 2: x1 x2\nfactor 3: x0 l1\nfactor 4: x1 l1\nfactor 5: x1 l2\nfactor 6: x2 l2\n" ] } ], @@ -137,7 +133,7 @@ "graph.push_factor(X(2), L(2))\n", "\n", "# COLAMD (Column Approximate Minimum Degree) ordering\n", - "colamd_ordering = Ordering.Colamd(VariableIndex(graph))\n", + "colamd_ordering = Ordering.Colamd(graph)\n", "colamd_ordering.print(\"COLAMD Ordering: \")\n", "\n", "# Constrained COLAMD (force x0 and x2 to be eliminated last)\n", diff --git a/gtsam/inference/doc/Symbol.ipynb b/gtsam/inference/doc/Symbol.ipynb index 6f5430a64..20d9fd7e2 100644 --- a/gtsam/inference/doc/Symbol.ipynb +++ b/gtsam/inference/doc/Symbol.ipynb @@ -31,7 +31,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "symbol_pip_code" + "id": "symbol_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [ diff --git a/gtsam/inference/doc/VariableIndex.ipynb b/gtsam/inference/doc/VariableIndex.ipynb index 86ce4ab75..0a3af8c3f 100644 --- a/gtsam/inference/doc/VariableIndex.ipynb +++ b/gtsam/inference/doc/VariableIndex.ipynb @@ -33,7 +33,10 @@ "cell_type": "code", "execution_count": null, "metadata": { - "id": "vindex_pip_code" + "id": "vindex_pip_code", + "tags": [ + "remove-cell" + ] }, "outputs": [], "source": [