Merge pull request python-quantities#207 from apdavison/fix-floordiv

apdavison · web-flow · commit 2186a7e8102e · 2022-10-25T09:15:24.000+01:00
fix failure to handle units with floordiv
diff --git a/quantities/dimensionality.py b/quantities/dimensionality.py
@@ -238,6 +238,7 @@ def _d_divide(q1, q2, out=None):
             return q2.dimensionality**-1
 p_dict[np.divide] = _d_divide
 p_dict[np.true_divide] = _d_divide
+p_dict[np.floor_divide] = _d_divide
 
 def _d_check_uniform(q1, q2, out=None):
     try:
@@ -273,7 +274,6 @@ def _d_check_uniform(q1, q2, out=None):
 p_dict[np.mod] = _d_check_uniform
 p_dict[np.fmod] = _d_check_uniform
 p_dict[np.remainder] = _d_check_uniform
-p_dict[np.floor_divide] = _d_check_uniform
 p_dict[np.hypot] = _d_check_uniform
 p_dict[np.equal] = _d_check_uniform
 p_dict[np.not_equal] = _d_check_uniform
diff --git a/quantities/tests/test_arithmetic.py b/quantities/tests/test_arithmetic.py
@@ -52,7 +52,7 @@ class iter_dtypes:
 
     def __init__(self):
         self._i = 1
-        self._typeDict = np.typeDict.copy()
+        self._typeDict = np.sctypeDict.copy()
         self._typeDict[17] = int
         self._typeDict[18] = long
         self._typeDict[19] = float
@@ -132,6 +132,20 @@ def test_mul(self):
                         self.check_rmul(x, y)
             dtypes.pop(0)
 
+    def test_truediv(self):
+        q = Quantity([44, 40, 36, 32], units=pq.ms)
+        self.assertQuantityEqual(
+            q/(4 * pq.ms),
+            Quantity([11, 10, 9, 8], units=pq.dimensionless)
+        )
+
+    def test_floordiv(self):
+        q = Quantity([45, 43, 39, 32], units=pq.ms)
+        self.assertQuantityEqual(
+            q//(4 * pq.ms),
+            Quantity([11, 10, 9, 8], units=pq.dimensionless)
+        )
+
     def test_mixed_addition(self):
         self.assertQuantityEqual(1*pq.ft + 1*pq.m, 4.280839895 * pq.ft)
         self.assertQuantityEqual(1*pq.ft + pq.m, 4.280839895 * pq.ft)
