added support for mixed operations (eg LArray + ndarray)

gdementen · gdementen · commit e6e16c6f8d13 · 2015-01-30T11:31:10.000+01:00
diff --git a/larray/core.py b/larray/core.py
@@ -1352,6 +1352,8 @@ def opmethod(self, other):
             if isinstance(other, LArray):
                 #TODO: first test if it is not already broadcastable
                 other = other.broadcast_with(self)
+            elif isinstance(other, np.ndarray):
+                pass
             elif not np.isscalar(other):
                 raise TypeError("unsupported operand type(s) for %s: '%s' "
                                 "and '%s'" % (opname, type(self), type(other)))
diff --git a/larray/tests/test_la.py b/larray/tests/test_la.py
@@ -1262,6 +1262,14 @@ def test_binary_ops(self):
         # test adding two larrays with different axes order
         self._assert_equal_raw(la + la.transpose(), raw * 2)
 
+        # mixed operations
+        la_raw = la + raw
+        self.assertEqual(la_raw.axes, la.axes)
+        self._assert_equal_raw(la_raw, raw + raw)
+        raw_la = raw + la
+        self._assert_equal_raw(raw_la, raw + raw)
+        self.assertEqual(raw_la.axes, la.axes)
+
     def test_unary_ops(self):
         raw = self.small_data
         la = self.small
