Skip to content

Commit ff140f7

Browse files
authored
Merge branch 'master' into fix-rescale-integer-arg
2 parents abefd96 + 8239f66 commit ff140f7

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

‎quantities/tests/test_arithmetic.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,25 @@ def test_truediv(self):
139139
Quantity([11, 10, 9, 8], units=pq.dimensionless)
140140
)
141141

142+
q = Quantity([46, 42, 38, 34], units=pq.ms)
143+
self.assertQuantityEqual(
144+
q/(4 * pq.ms),
145+
Quantity([11.5, 10.5, 9.5, 8.5], units=pq.dimensionless)
146+
)
147+
142148
def test_floordiv(self):
143149
q = Quantity([45, 43, 39, 32], units=pq.ms)
144150
self.assertQuantityEqual(
145151
q//(4 * pq.ms),
146152
Quantity([11, 10, 9, 8], units=pq.dimensionless)
147153
)
148154

155+
q = Quantity([46, 42, 38, 34], units=pq.ms)
156+
self.assertQuantityEqual(
157+
q//(4 * pq.ms),
158+
Quantity([11, 10, 9, 8], units=pq.dimensionless)
159+
)
160+
149161
def test_mixed_addition(self):
150162
self.assertQuantityEqual(1*pq.ft + 1*pq.m, 4.280839895 * pq.ft)
151163
self.assertQuantityEqual(1*pq.ft + pq.m, 4.280839895 * pq.ft)

‎quantities/tests/test_conversion.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ def test_inplace_conversion(self):
1616
def test_rescale(self):
1717
for u in ('ft', 'feet', pq.ft):
1818
self.assertQuantityEqual((10*pq.m).rescale(u), 32.80839895 * pq.ft)
19+
self.assertQuantityEqual((10 * pq.deg).rescale(pq.rad), 0.17453293 * pq.rad)
20+
self.assertQuantityEqual(quantity.Quantity(10, pq.deg).rescale(pq.rad), 0.17453293 * pq.rad)
1921

2022
def test_rescale_preferred(self):
2123
quantity.PREFERRED = [pq.mV, pq.pA]

0 commit comments

Comments
 (0)