Merge branch '16-add-operator-tests' of...

Merge branch '16-add-operator-tests' of https://gitlab.mpcdf.mpg.de/ift/nifty-dev into 16-add-operator-tests

nifty5/data_objects/distributed_do.py

@@ -158,11 +158,11 @@ class data_object(object):
     def prod(self, axis=None):
         return self._contraction_helper("prod", MPI.PROD, axis)
 
-    def min(self, axis=None):
-        return self._contraction_helper("min", MPI.MIN, axis)
+#    def min(self, axis=None):
+#        return self._contraction_helper("min", MPI.MIN, axis)
 
-    def max(self, axis=None):
-        return self._contraction_helper("max", MPI.MAX, axis)
+#    def max(self, axis=None):
+#        return self._contraction_helper("max", MPI.MAX, axis)
 
     def mean(self, axis=None):
         if axis is None:

nifty5/field.py

@@ -481,39 +481,39 @@ class Field(object):
     def any(self, spaces=None):
         return self._contraction_helper('any', spaces)
 
-    def min(self, spaces=None):
-        """Determines the minimum over the sub-domains given by `spaces`.
-
-        Parameters
-        ----------
-        spaces : None, int or tuple of int (default: None)
-            The operation is only carried out over the sub-domains in this
-            tuple. If None, it is carried out over all sub-domains.
-
-        Returns
-        -------
-        Field or scalar
-            The result of the operation. If it is carried out over the entire
-            domain, this is a scalar, otherwise a Field.
-        """
-        return self._contraction_helper('min', spaces)
-
-    def max(self, spaces=None):
-        """Determines the maximum over the sub-domains given by `spaces`.
-
-        Parameters
-        ----------
-        spaces : None, int or tuple of int (default: None)
-            The operation is only carried out over the sub-domains in this
-            tuple. If None, it is carried out over all sub-domains.
-
-        Returns
-        -------
-        Field or scalar
-            The result of the operation. If it is carried out over the entire
-            domain, this is a scalar, otherwise a Field.
-        """
-        return self._contraction_helper('max', spaces)
+#     def min(self, spaces=None):
+#         """Determines the minimum over the sub-domains given by `spaces`.
+#
+#         Parameters
+#         ----------
+#         spaces : None, int or tuple of int (default: None)
+#             The operation is only carried out over the sub-domains in this
+#             tuple. If None, it is carried out over all sub-domains.
+#
+#         Returns
+#         -------
+#         Field or scalar
+#             The result of the operation. If it is carried out over the entire
+#             domain, this is a scalar, otherwise a Field.
+#         """
+#         return self._contraction_helper('min', spaces)
+#
+#     def max(self, spaces=None):
+#         """Determines the maximum over the sub-domains given by `spaces`.
+#
+#         Parameters
+#         ----------
+#         spaces : None, int or tuple of int (default: None)
+#             The operation is only carried out over the sub-domains in this
+#             tuple. If None, it is carried out over all sub-domains.
+#
+#         Returns
+#         -------
+#         Field or scalar
+#             The result of the operation. If it is carried out over the entire
+#             domain, this is a scalar, otherwise a Field.
+#         """
+#         return self._contraction_helper('max', spaces)
 
     def mean(self, spaces=None):
         """Determines the mean over the sub-domains given by `spaces`.

test/test_field.py

@@ -154,8 +154,8 @@ class Test_Functionality(unittest.TestCase):
         assert_equal(f1.local_data, +f1.local_data)
         assert_equal(f1.sum(), f1.sum(0))
         f1 = ift.from_global_data(s1, np.arange(10))
-        assert_equal(f1.min(), 0)
-        assert_equal(f1.max(), 9)
+#        assert_equal(f1.min(), 0)
+#        assert_equal(f1.max(), 9)
         assert_equal(f1.prod(), 0)
 
     def test_weight(self):