Merge pull request #39 from Chilichiller/master

bugfix for complex data

Author: arokem

pymatbridge/examples/matlab_magic.ipynb

@@ -12,6 +12,7 @@
      "collapsed": false,
      "input": [
       "import os\n",
+      "import numpy as np\n",
       "import pymatbridge as pymat\n",
       "reload(pymat)"
      ],
@@ -179,13 +180,47 @@
      ],
      "prompt_number": 7
     },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "%%matlab -o cmpl\n",
+      "a = linspace(0.01,6*pi,100);\n",
+      "cmpl = exp(1i * a);"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [],
+     "prompt_number": 8
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "cmpl[2]  # complex data works also"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "metadata": {},
+       "output_type": "pyout",
+       "prompt_number": 9,
+       "text": [
+        "array([ 0.92468189+0.3807406j])"
+       ]
+      }
+     ],
+     "prompt_number": 9
+    },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [],
      "language": "python",
      "metadata": {},
-     "outputs": []
+     "outputs": [],
+     "prompt_number": 9
     }
    ],
    "metadata": {}

pymatbridge/matlab_magic.py

@@ -21,12 +21,12 @@
 
 import numpy as np
 try:
-    import tables
+    import h5py
     import scipy.io as sio
     has_io = True
 except ImportError:
     has_io = False
-    no_io_str = "Must have pytables and scipy.io to perform i/o"
+    no_io_str = "Must have h5py and scipy.io to perform i/o"
     no_io_str += "operations with the Matlab session"
 
 from IPython.core.displaypub import publish_display_data
@@ -62,11 +62,15 @@ def __str__(self):
 
 def loadmat(fname):
     """
-    Use pytables to read a variable from a v7.3 mat file
+    Use h5py to read a variable from a v7.3 mat file
     """
 
-    f = tables.File(fname)
-    return f.root.__getattr__(f.root.__members__[0])
+    f = h5py.File(fname)
+    data = f.values()[0][:]
+    if len(data.dtype) > 0:
+        # must be complex data
+        data = data['real'] + 1j * data['imag']        
+    return data
 
 
 def matlab_converter(matlab, key):