pull in the changes from the .jls to the .ipynbs

Author: bzinberg

tutorials/A Bottom-Up Introduction to Gen.ipynb

@@ -442,7 +442,7 @@
    "source": [
     "using Gen: get_choices\n",
     "\n",
-    "println(get_choices(trace))"
+    "display(get_choices(trace))"
    ]
   },
   {
@@ -629,7 +629,7 @@
    "source": [
     "using Gen: get_score\n",
     "trace = simulate(foo, (0.3,))\n",
-    "println(get_choices(trace))\n",
+    "display(get_choices(trace))\n",
     "println(\"log probability: $(get_score(trace))\")"
    ]
   },
@@ -683,7 +683,7 @@
     "\n",
     "constraints = choicemap((:a, true), (:c, false))\n",
     "\n",
-    "println(constraints)"
+    "display(constraints)"
    ]
   },
   {
@@ -732,7 +732,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "println(get_choices(trace))"
+    "display(get_choices(trace))"
    ]
   },
   {
@@ -1154,6 +1154,12 @@
    "display_name": "Julia 1.1.1",
    "language": "julia",
    "name": "julia-1.1"
+  },
+  "language_info": {
+   "file_extension": ".jl",
+   "mimetype": "application/julia",
+   "name": "julia",
+   "version": "1.1.1"
   }
  },
  "nbformat": 4,

tutorials/Data-Driven Proposals in Gen.ipynb

@@ -479,7 +479,7 @@
    "outputs": [],
    "source": [
     "(proposed_choices, _, _) = Gen.propose(custom_dest_proposal, (measurements, scene))\n",
-    "println(proposed_choices)"
+    "display(proposed_choices)"
    ]
   },
   {
@@ -1495,6 +1495,12 @@
    "display_name": "Julia 1.1.1",
    "language": "julia",
    "name": "julia-1.1"
+  },
+  "language_info": {
+   "file_extension": ".jl",
+   "mimetype": "application/julia",
+   "name": "julia",
+   "version": "1.1.1"
   }
  },
  "nbformat": 4,

tutorials/Introduction to Modeling in Gen.ipynb

@@ -290,7 +290,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "println(Gen.get_choices(trace))"
+    "display(Gen.get_choices(trace))"
    ]
   },
   {
@@ -1169,7 +1169,7 @@
    "outputs": [],
    "source": [
     "trace = Gen.simulate(bar, ())\n",
-    "println(Gen.get_choices(trace))"
+    "display(Gen.get_choices(trace))"
    ]
   },
   {
@@ -1186,7 +1186,7 @@
    "outputs": [],
    "source": [
     "trace = Gen.simulate(bar_using_namespace, ())\n",
-    "println(Gen.get_choices(trace))"
+    "display(Gen.get_choices(trace))"
    ]
   },
   {

tutorials/Iterative inference in Gen.ipynb

@@ -1204,6 +1204,12 @@
    "display_name": "Julia 1.1.1",
    "language": "julia",
    "name": "julia-1.1"
+  },
+  "language_info": {
+   "file_extension": ".jl",
+   "mimetype": "application/julia",
+   "name": "julia",
+   "version": "1.1.1"
   }
  },
  "nbformat": 4,

tutorials/Modeling with Black-Box Julia Code.ipynb

@@ -391,7 +391,7 @@
     "planner_params = PlannerParams(300, 3.0, 2000, 1.)\n",
     "(trace, _) = Gen.generate(agent_model, (scene, dt, num_ticks, planner_params));\n",
     "choices = Gen.get_choices(trace)\n",
-    "println(choices)"
+    "display(choices)"
    ]
   },
   {
@@ -680,9 +680,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Cora Julia 1.1.1",
+   "display_name": "Julia 1.1.1",
    "language": "julia",
-   "name": "cora-julia-1.1"
+   "name": "julia-1.1"
   },
   "language_info": {
    "file_extension": ".jl",

tutorials/Modeling with TensorFlow Code.ipynb

@@ -169,7 +169,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "println(Gen.get_choices(trace))"
+    "display(Gen.get_choices(trace))"
    ]
   },
   {
@@ -246,7 +246,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "println(Gen.get_choices(trace))"
+    "display(Gen.get_choices(trace))"
    ]
   },
   {

tutorials/Particle Filtering in Gen.ipynb

@@ -526,7 +526,7 @@
    "outputs": [],
    "source": [
     "trace = Gen.simulate(chain, (4, State(0., 0., 0., 0.), 0.01, 0.01))\n",
-    "println(Gen.get_choices(trace))"
+    "display(Gen.get_choices(trace))"
    ]
   },
   {
@@ -584,7 +584,7 @@
    "outputs": [],
    "source": [
     "(trace, _) = Gen.generate(unfold_model, (4,))\n",
-    "println(Gen.get_choices(trace))"
+    "display(Gen.get_choices(trace))"
    ]
   },
   {

tutorials/Reasoning About Regenerate.ipynb

@@ -132,7 +132,7 @@
    "source": [
     "using Gen: get_choices\n",
     "\n",
-    "println(get_choices(trace))"
+    "display(get_choices(trace))"
    ]
   },
   {
@@ -304,7 +304,7 @@
    "source": [
     "trace, weight = generate(foo, (0.3,), choicemap((:a, true), (:b, false), (:c, true)));\n",
     "(trace, weight, retdiff) = regenerate(trace, (0.3,), (NoChange(),), select(:a));\n",
-    "println(get_choices(trace))\n",
+    "display(get_choices(trace))\n",
     "println(\"weight: $weight\");"
    ]
   },

tutorials/Scaling with Combinators and the Static Modeling Language.ipynb

@@ -315,7 +315,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "println(get_choices(trace))"
+    "display(get_choices(trace))"
    ]
   },
   {
@@ -356,7 +356,7 @@
    "outputs": [],
    "source": [
     "trace = simulate(model_with_map, (xs,));\n",
-    "println(get_choices(trace))"
+    "display(get_choices(trace))"
    ]
   },
   {
@@ -799,6 +799,12 @@
    "display_name": "Julia 1.1.1",
    "language": "julia",
    "name": "julia-1.1"
+  },
+  "language_info": {
+   "file_extension": ".jl",
+   "mimetype": "application/julia",
+   "name": "julia",
+   "version": "1.1.1"
   }
  },
  "nbformat": 4,