ENH: Allow setting the maximal time to wait for a response from Matlab.

arokem · arokem · commit 6c1e899aad3e · 2012-11-13T11:48:53.000-08:00
In case you want to do something that takes more than 10 seconds to run.
diff --git a/pymatbridge/matlab_magic.py b/pymatbridge/matlab_magic.py
@@ -73,6 +73,7 @@ class MatlabMagics(Magics):
     """
     def __init__(self, shell,
                  matlab='matlab',
+                 maxtime=None,
                  matlab_converter=matlab_converter,
                  pyconverter=np.asarray,
                  cache_display_data=False):
@@ -86,6 +87,10 @@ def __init__(self, shell,
             The system call to start a matlab session. Allows you to choose a
             particular version of matlab if you want
 
+        maxtime : float
+           The maximal time to wait for responses for matlab (in seconds).
+           Default: 10 seconds.
+           
         pyconverter : callable
             To be called on matlab variables returning into the ipython
             namespace
@@ -104,6 +109,8 @@ def __init__(self, shell,
 
         self.Matlab = pymat.Matlab(matlab)
         self.Matlab.start()
+        
+        self.maxtime = maxtime
 
         self.pyconverter = pyconverter
         self.matlab_converter = matlab_converter        
@@ -112,7 +119,7 @@ def eval(self, line):
         """
         Parse and evaluate a single line of matlab
         """
-        run_dict = self.Matlab.run_code(line)
+        run_dict = self.Matlab.run_code(line, maxtime=self.maxtime)
 
         if run_dict['success'] == 'false':
             raise MatlabInterperterError(line, run_dict['content']['stdout'])
diff --git a/pymatbridge/pymatbridge.py b/pymatbridge/pymatbridge.py
@@ -28,7 +28,7 @@ class Matlab(object):
     server_process = Process()
 
     def __init__(self, matlab='matlab', host='localhost', port=None,
-                 id='python-matlab-bridge', log=False):
+                 id='python-matlab-bridge', log=False, maxtime=None):
         """
         Initialize this thing.
 
@@ -51,6 +51,10 @@ def __init__(self, matlab='matlab', host='localhost', port=None,
 
         log : bool
             Whether to save a log file in some known location.
+
+        maxtime : float
+           The maximal time to wait for a response from matlab (optional,
+           Default is 
             
         """
 
@@ -70,6 +74,7 @@ def __init__(self, matlab='matlab', host='localhost', port=None,
         self.server = 'http://%s:%s' % (self.host, str(self.port))
         self.id = id
         self.log = log
+        self.maxtime = maxtime
 
     def start(self):
         def _run_matlab_server():
