Merge pull request #44 from charlesreid1/master

Update all example notebooks
soft-matter · Feb 27, 2018 · 10c98f0 · 10c98f0
2 parents ff83559 + 4e90d7a
commit 10c98f0
Show file tree

Hide file tree

Showing 11 changed files with 1,636 additions and 1,768 deletions.
diff --git a/notebooks/custom-feature-detection.ipynb b/notebooks/custom-feature-detection.ipynb
diff --git a/notebooks/linking-diagnostics.ipynb b/notebooks/linking-diagnostics.ipynb
diff --git a/notebooks/loading-video-frames.ipynb b/notebooks/loading-video-frames.ipynb
diff --git a/notebooks/on-disk.ipynb b/notebooks/on-disk.ipynb
diff --git a/notebooks/parallel-locate.ipynb b/notebooks/parallel-locate.ipynb
@@ -6,11 +6,11 @@
    "source": [
     "# Parallelized Feature Location using IPython Parallel\n",
     "\n",
-    "Feature-finding can easily be parallelized: each frame an independent task, and the tasks can be divided among the available CPUs. IPython parallel makes this very straightforward.\n",
+    "Feature-finding can easily be parallelized: each frame an independent task, and the tasks can be divided among the available CPUs. [IPython parallel](https://github.com/ipython/ipyparallel) makes this very straightforward.\n",
     "\n",
     "## Intsall ipyparallel\n",
     "\n",
-    "As for IPython 4.0 (summer 2015), IPython parallel is a separate package. Install it as follows:\n",
+    "As of IPython 6.2 (November 2017), IPython parallel is a separate package. Install it as follows:\n",
     "```\n",
     "pip install ipyparalell\n",
     "```\n",
@@ -26,9 +26,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "from ipyparallel import Client\n",
@@ -46,9 +44,7 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "data": {
@@ -75,9 +71,7 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "%%px\n",
@@ -94,9 +88,7 @@
   {
    "cell_type": "code",
    "execution_count": 4,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "import pims\n",
@@ -118,9 +110,7 @@
   {
    "cell_type": "code",
    "execution_count": 5,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "curried_locate = lambda image: tp.locate(image, 13, invert=True)"
@@ -129,9 +119,7 @@
   {
    "cell_type": "code",
    "execution_count": 6,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "data": {
@@ -158,17 +146,15 @@
   {
    "cell_type": "code",
    "execution_count": 7,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
       "  32/32 tasks finished after    1 s\n",
       "done\n",
-      "1 loop, best of 3: 1.3 s per loop\n"
+      "1.83 s ± 47.6 ms per loop (mean ± std. dev. of 7 runs, 1 loop each)\n"
      ]
     }
    ],
@@ -182,15 +168,13 @@
   {
    "cell_type": "code",
    "execution_count": 8,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "1 loop, best of 3: 3.15 s per loop\n"
+      "3.28 s ± 61.3 ms per loop (mean ± std. dev. of 7 runs, 1 loop each)\n"
      ]
     }
    ],
@@ -216,9 +200,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.4.3"
+   "version": "3.6.3"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }
diff --git a/notebooks/performance.ipynb b/notebooks/performance.ipynb
diff --git a/notebooks/prediction.ipynb b/notebooks/prediction.ipynb
diff --git a/notebooks/subnets.ipynb b/notebooks/subnets.ipynb
diff --git a/notebooks/tracking-3d.ipynb b/notebooks/tracking-3d.ipynb
diff --git a/notebooks/uncertainty.ipynb b/notebooks/uncertainty.ipynb
diff --git a/notebooks/walkthrough.ipynb b/notebooks/walkthrough.ipynb