NOTEBOOKS.

arokem · arokem · commit 2ad71d5e0254 · 2012-10-20T14:56:12.000-07:00
diff --git a/matlab_magic.ipynb b/matlab_magic.ipynb
@@ -340,7 +340,7 @@
      "collapsed": false,
      "input": [
       "%%matlab -i a -o b\n",
-      "b = a + 3"
+      "b = [a;a]"
      ],
      "language": "python",
      "metadata": {},
@@ -351,12 +351,13 @@
         "\n",
         "b =\n",
         "\n",
-        "     4     5     6\n",
+        "     1     2     3\n",
+        "     1     2     3\n",
         "\n"
        ]
       }
      ],
-     "prompt_number": 6
+     "prompt_number": 16
     },
     {
      "cell_type": "code",
@@ -369,13 +370,14 @@
      "outputs": [
       {
        "output_type": "pyout",
-       "prompt_number": 7,
+       "prompt_number": 17,
        "text": [
-        "array([4, 5, 6])"
+        "array([[1, 2, 3],\n",
+        "       [1, 2, 3]])"
        ]
       }
      ],
-     "prompt_number": 7
+     "prompt_number": 17
     },
     {
      "cell_type": "code",
diff --git a/pymatbridge.ipynb b/pymatbridge.ipynb
@@ -43,7 +43,63 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Starting MATLAB on http://localhost:59735\n"
+        "Starting MATLAB on http://localhost:62161\n"
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "."
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "."
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "."
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "."
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "."
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "."
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "."
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "."
        ]
       },
       {
@@ -303,13 +359,21 @@
       "res_dict = matlab.run_code('a=[1,3,7]')\n",
       "res_dict = matlab.run_code('plot(a)')\n",
       "res_dict = matlab.run_code('b=a+1')\n",
-      "aa = matlab.get_variable('b')['var']\n",
-      "aa"
+      "exec('this=np.array(%s)'%matlab.get_variable('b')) \n",
+      "this"
      ],
      "language": "python",
      "metadata": {},
-     "outputs": [],
-     "prompt_number": "*"
+     "outputs": [
+      {
+       "output_type": "pyout",
+       "prompt_number": 3,
+       "text": [
+        "array([2, 4, 8])"
+       ]
+      }
+     ],
+     "prompt_number": 3
     },
     {
      "cell_type": "code",
@@ -390,13 +454,21 @@
       },
       {
        "output_type": "pyout",
-       "prompt_number": 4,
+       "prompt_number": 37,
        "text": [
         "True"
        ]
       }
      ],
-     "prompt_number": 4
+     "prompt_number": 37
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [],
+     "language": "python",
+     "metadata": {},
+     "outputs": []
     }
    ],
    "metadata": {}
