switched to np.greater_equal, np.less_equal, and np.is_real

Author: ihincks

src/qinfer/domains.py

@@ -257,7 +257,12 @@ def in_domain(self, points):
 
         :rtype: `bool`
         """
-        return np.all(points >= self._min) and np.all(points <= self._max) and np.all(np.real(points) == points)
+        if np.all(np.isreal(points)):
+            are_greater = np.all(np.greater_equal(points, self._min))
+            are_smaller = np.all(np.less_equal(points, self._max))
+            return  are_greater and are_smaller
+        else:
+            return False
 
 class IntegerDomain(Domain):
     """
@@ -382,13 +387,13 @@ def in_domain(self, points):
 
         :rtype: `bool`
         """
-        if np.all(np.real(points) == points):
+        if np.all(np.isreal(points)):
             try:
                 are_integer = np.all(np.mod(points, 1) == 0)
             except TypeError:
                 are_integer = False
-            are_greater = np.all(points >= self._min)
-            are_smaller = np.all(points <= self._max)
+            are_greater = np.all(np.greater_equal(points, self._min))
+            are_smaller = np.all(np.less_equal(points, self._max))
             return  are_integer and are_greater and are_smaller
         else:
             return False
@@ -533,4 +538,6 @@ def in_domain(self, points):
         :rtype: `bool`
         """
         array_view = self.to_regular_array(points)
-        return np.all(array_view >= 0) and np.all(np.sum(array_view, axis=-1) == self.n_meas)
+        non_negative = np.all(np.greater_equal(array_view, 0))
+        correct_sum = np.all(np.sum(array_view, axis=-1) == self.n_meas)
+        return non_negative and correct_sum