bugfix

GBR-613 · Sep 15, 2014 · c09fb73 · c09fb73
1 parent 84d40ad
commit c09fb73
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/smop/runtime.py b/smop/runtime.py
@@ -236,8 +236,7 @@ def __str__(self):
         return str(np.asarray(self))
 
     def __add__(self,other):
-        return np.asarray(self)+np.asarray(other)
-        return np.ndarray.__add__(self,other)
+        return matlabarray(np.asarray(self)+np.asarray(other))
 
     def __neg__(self):
         return matlabarray(np.asarray(self).__neg__())
@@ -520,7 +519,10 @@ def rand_(*args,**kwargs):
         return np.random.rand()
     if len(args) == 1:
         args += args
-    return np.random.rand(np.prod(args)).reshape(args,order="F")
+    try:
+        return np.random.rand(np.prod(args)).reshape(args,order="F")
+    except:
+        pass
 
 def ravel_(a):
     return np.asanyarray(a).reshape(-1,1)