Merge branch 'master' into noinherit

gdementen · gdementen · commit 356bd9f928a3 · 2015-01-30T11:14:50.000+01:00
Conflicts:
	larray/core.py
diff --git a/larray/core.py b/larray/core.py
@@ -977,6 +977,10 @@ def __getitem__(self, key, collapse_slices=False):
 
         if (isinstance(key, np.ndarray) or isinstance(key, LArray)) and \
                 np.issubdtype(key.dtype, bool):
+            #TODO: return an LArray with Axis labels = combined keys
+            # these combined keys should be objects which display as:
+            # (axis1_label, axis2_label, ...) but should also store the axis
+            # (names). Should it be the same object as the NDValueGroup?/NDKey?
             return data[np.asarray(key)]
 
         translated_key = self.translated_key(self.full_key(key))
diff --git a/larray/tests/test_la.py b/larray/tests/test_la.py
@@ -1233,7 +1233,7 @@ def test_transpose(self):
         self.assertEqual(la.transpose().axes_names,
                          ['lipro', 'sex', 'geo', 'age'])
 
-    def test_arithmetics(self):
+    def test_binary_ops(self):
         raw = self.small_data
         la = self.small
 
@@ -1262,13 +1262,20 @@ def test_arithmetics(self):
         # test adding two larrays with different axes order
         self._assert_equal_raw(la + la.transpose(), raw * 2)
 
-    # def test_boolean_indexing(self):
-    #     raw = self.small_data
-    #     la = self.small
-    #
-    #     self._assert_equal_raw(la > 2, raw > 2)
-    # FIXME this fails: it should return a 1d array with "combined ticks"
-    #     self._assert_equal_raw(la[la > 2], raw[raw > 2])
+    def test_unary_ops(self):
+        raw = self.small_data
+        la = self.small
+
+        # using numpy functions
+        self._assert_equal_raw(np.abs(la - 10), np.abs(raw - 10))
+        self._assert_equal_raw(np.negative(la), np.negative(raw))
+        self._assert_equal_raw(np.invert(la), np.invert(raw))
+
+        # using python builtin ops
+        self._assert_equal_raw(abs(la - 10), abs(raw - 10))
+        self._assert_equal_raw(-la, -raw)
+        self._assert_equal_raw(+la, +raw)
+        self._assert_equal_raw(~la, ~raw)
 
     def test_mean(self):
         la = self.small
