resolve conflicts

biaslab · Jul 30, 2020 · 0e4a6ed · 0e4a6ed
2 parents 9d9674d + 9e19baf
commit 0e4a6ed
Show file tree

Hide file tree

Showing 85 changed files with 6,772 additions and 1,811 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,6 @@
 *.cov
 .ipynb_checkpoints
 demo/*.jl
+*.gif
 docs/build
-Manifest.toml
+Manifest.toml
diff --git a/demo/bayes_rule_2d.ipynb b/demo/bayes_rule_2d.ipynb
@@ -25,7 +25,7 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "┌ Info: Precompiling Distributions [31c24e10-a181-5473-b8eb-7969acd0382f]\n",
+      "┌ Info: Precompiling ForneyLab [9fc3f58a-c2cc-5bff-9419-6a294fefdca9]\n",
       "└ @ Base loading.jl:1273\n"
      ]
     }
@@ -112,7 +112,7 @@
     }
    ],
    "source": [
-    "algo = sumProductAlgorithm(x) # Generate algorithm\n",
+    "algo = messagePassingAlgorithm(x) # Generate algorithm\n",
     "source_code = algorithmSourceCode(algo)\n",
     "eval(Meta.parse(source_code)) # Load algorithm\n",
     "\n",

diff --git a/demo/bayes_rule_discrete.ipynb b/demo/bayes_rule_discrete.ipynb
@@ -59,65 +59,65 @@
        "<g id=\"graph0\" class=\"graph\" transform=\"scale(1 1) rotate(0) translate(4 391)\">\n",
        "<title>G</title>\n",
        "<polygon fill=\"#ffffff\" stroke=\"transparent\" points=\"-4,4 -4,-391 245,-391 245,4 -4,4\"/>\n",
-       "<!-- 9940591395683606390 -->\n",
+       "<!-- 12199439523247696402 -->\n",
        "<g id=\"node1\" class=\"node\">\n",
-       "<title>9940591395683606390</title>\n",
+       "<title>12199439523247696402</title>\n",
        "<polygon fill=\"#d3d3d3\" stroke=\"#000000\" points=\"184,-387 116,-387 116,-333 184,-333 184,-387\"/>\n",
        "<text text-anchor=\"middle\" x=\"150\" y=\"-357.8\" font-family=\"Times,serif\" font-size=\"9.00\" fill=\"#000000\">placeholder_w</text>\n",
        "</g>\n",
-       "<!-- 6665574939858667132 -->\n",
-       "<g id=\"node5\" class=\"node\">\n",
-       "<title>6665574939858667132</title>\n",
+       "<!-- 3562141941983525839 -->\n",
+       "<g id=\"node4\" class=\"node\">\n",
+       "<title>3562141941983525839</title>\n",
        "<polygon fill=\"none\" stroke=\"#000000\" points=\"186,-288 114,-288 114,-216 186,-216 186,-288\"/>\n",
        "<text text-anchor=\"middle\" x=\"150\" y=\"-254.8\" font-family=\"Times,serif\" font-size=\"9.00\" fill=\"#000000\">T</text>\n",
        "<text text-anchor=\"middle\" x=\"150\" y=\"-244.8\" font-family=\"Times,serif\" font-size=\"9.00\" fill=\"#000000\">transition_1</text>\n",
        "</g>\n",
-       "<!-- 9940591395683606390&#45;&#45;6665574939858667132 -->\n",
+       "<!-- 12199439523247696402&#45;&#45;3562141941983525839 -->\n",
        "<g id=\"edge3\" class=\"edge\">\n",
-       "<title>9940591395683606390&#45;&#45;6665574939858667132</title>\n",
+       "<title>12199439523247696402&#45;&#45;3562141941983525839</title>\n",
        "<path fill=\"none\" stroke=\"#000000\" d=\"M150,-332.747C150,-319.2495 150,-302.7693 150,-288.2253\"/>\n",
        "<text text-anchor=\"start\" x=\"150\" y=\"-308.6\" font-family=\"Times,serif\" font-size=\"8.00\" fill=\"#ff0000\">w</text>\n",
        "<text text-anchor=\"start\" x=\"131\" y=\"-290.8253\" font-family=\"Times,serif\" font-size=\"8.00\" fill=\"#000000\">1 out </text>\n",
        "<text text-anchor=\"start\" x=\"131\" y=\"-326.347\" font-family=\"Times,serif\" font-size=\"8.00\" fill=\"#000000\">1 out </text>\n",
        "</g>\n",
-       "<!-- 12819661097584440509 -->\n",
+       "<!-- 5994724595692541259 -->\n",
        "<g id=\"node2\" class=\"node\">\n",
-       "<title>12819661097584440509</title>\n",
+       "<title>5994724595692541259</title>\n",
        "<polygon fill=\"#d3d3d3\" stroke=\"#000000\" points=\"63,-54 9,-54 9,0 63,0 63,-54\"/>\n",
        "<text text-anchor=\"middle\" x=\"36\" y=\"-24.8\" font-family=\"Times,serif\" font-size=\"9.00\" fill=\"#000000\">clamp_1</text>\n",
        "</g>\n",
-       "<!-- 15462892210138511503 -->\n",
+       "<!-- 13874360673902692178 -->\n",
        "<g id=\"node3\" class=\"node\">\n",
-       "<title>15462892210138511503</title>\n",
+       "<title>13874360673902692178</title>\n",
        "<polygon fill=\"none\" stroke=\"#000000\" points=\"72,-171 0,-171 0,-99 72,-99 72,-171\"/>\n",
        "<text text-anchor=\"middle\" x=\"36\" y=\"-137.8\" font-family=\"Times,serif\" font-size=\"9.00\" fill=\"#000000\">Cat</text>\n",
        "<text text-anchor=\"middle\" x=\"36\" y=\"-127.8\" font-family=\"Times,serif\" font-size=\"9.00\" fill=\"#000000\">categorical_1</text>\n",
        "</g>\n",
-       "<!-- 15462892210138511503&#45;&#45;12819661097584440509 -->\n",
-       "<g id=\"edge2\" class=\"edge\">\n",
-       "<title>15462892210138511503&#45;&#45;12819661097584440509</title>\n",
+       "<!-- 13874360673902692178&#45;&#45;5994724595692541259 -->\n",
+       "<g id=\"edge1\" class=\"edge\">\n",
+       "<title>13874360673902692178&#45;&#45;5994724595692541259</title>\n",
        "<path fill=\"none\" stroke=\"#000000\" d=\"M36,-98.7371C36,-84.1526 36,-67.6262 36,-54.1146\"/>\n",
        "<text text-anchor=\"start\" x=\"36\" y=\"-74.6\" font-family=\"Times,serif\" font-size=\"8.00\" fill=\"#ff0000\">clamp_1</text>\n",
        "<text text-anchor=\"start\" x=\"17\" y=\"-56.7146\" font-family=\"Times,serif\" font-size=\"8.00\" fill=\"#000000\">1 out </text>\n",
        "<text text-anchor=\"start\" x=\"23\" y=\"-92.3371\" font-family=\"Times,serif\" font-size=\"8.00\" fill=\"#000000\">2 p </text>\n",
        "</g>\n",
-       "<!-- 3875087641579696637 -->\n",
-       "<g id=\"node4\" class=\"node\">\n",
-       "<title>3875087641579696637</title>\n",
-       "<polygon fill=\"#d3d3d3\" stroke=\"#000000\" points=\"241,-162 187,-162 187,-108 241,-108 241,-162\"/>\n",
-       "<text text-anchor=\"middle\" x=\"214\" y=\"-132.8\" font-family=\"Times,serif\" font-size=\"9.00\" fill=\"#000000\">clamp_2</text>\n",
-       "</g>\n",
-       "<!-- 6665574939858667132&#45;&#45;15462892210138511503 -->\n",
-       "<g id=\"edge4\" class=\"edge\">\n",
-       "<title>6665574939858667132&#45;&#45;15462892210138511503</title>\n",
+       "<!-- 3562141941983525839&#45;&#45;13874360673902692178 -->\n",
+       "<g id=\"edge2\" class=\"edge\">\n",
+       "<title>3562141941983525839&#45;&#45;13874360673902692178</title>\n",
        "<path fill=\"none\" stroke=\"#000000\" d=\"M114.866,-215.9415C100.9966,-201.7071 85.0914,-185.3833 71.2142,-171.1409\"/>\n",
        "<text text-anchor=\"start\" x=\"96\" y=\"-191.6\" font-family=\"Times,serif\" font-size=\"8.00\" fill=\"#ff0000\">m</text>\n",
        "<text text-anchor=\"start\" x=\"52.2142\" y=\"-173.7409\" font-family=\"Times,serif\" font-size=\"8.00\" fill=\"#000000\">1 out </text>\n",
        "<text text-anchor=\"start\" x=\"95.866\" y=\"-218.5415\" font-family=\"Times,serif\" font-size=\"8.00\" fill=\"#000000\">2 in1 </text>\n",
        "</g>\n",
-       "<!-- 6665574939858667132&#45;&#45;3875087641579696637 -->\n",
-       "<g id=\"edge1\" class=\"edge\">\n",
-       "<title>6665574939858667132&#45;&#45;3875087641579696637</title>\n",
+       "<!-- 12691913731775350860 -->\n",
+       "<g id=\"node5\" class=\"node\">\n",
+       "<title>12691913731775350860</title>\n",
+       "<polygon fill=\"#d3d3d3\" stroke=\"#000000\" points=\"241,-162 187,-162 187,-108 241,-108 241,-162\"/>\n",
+       "<text text-anchor=\"middle\" x=\"214\" y=\"-132.8\" font-family=\"Times,serif\" font-size=\"9.00\" fill=\"#000000\">clamp_2</text>\n",
+       "</g>\n",
+       "<!-- 3562141941983525839&#45;&#45;12691913731775350860 -->\n",
+       "<g id=\"edge4\" class=\"edge\">\n",
+       "<title>3562141941983525839&#45;&#45;12691913731775350860</title>\n",
        "<path fill=\"none\" stroke=\"#000000\" d=\"M169.7243,-215.9415C179.2001,-198.6185 190.3687,-178.201 199.1178,-162.2064\"/>\n",
        "<text text-anchor=\"start\" x=\"183\" y=\"-191.6\" font-family=\"Times,serif\" font-size=\"8.00\" fill=\"#ff0000\">clamp_2</text>\n",
        "<text text-anchor=\"start\" x=\"180.1178\" y=\"-164.8064\" font-family=\"Times,serif\" font-size=\"8.00\" fill=\"#000000\">1 out </text>\n",
@@ -169,7 +169,7 @@
     }
    ],
    "source": [
-    "algo = sumProductAlgorithm(m) # Build the algorithm code\n",
+    "algo = messagePassingAlgorithm(m) # Build the algorithm code\n",
     "source_code = algorithmSourceCode(algo)\n",
     "eval(Meta.parse(source_code)) # Parse and load the algorithm in scope\n",
     "\n",