Skip to content

Commit 3a478ca

Browse files
mhvkbsipocz
authored andcommitted
Further short-cuts for single-unit CompositeUnit initialization.
1 parent 1e551a7 commit 3a478ca

2 files changed

Lines changed: 20 additions & 7 deletions

File tree

‎astropy/units/core.py‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2014,12 +2014,23 @@ def __init__(self, scale, bases, powers, decompose=False,
20142014
"bases must be sequence of UnitBase instances")
20152015
powers = [validate_power(p) for p in powers]
20162016

2017-
if not decompose and len(bases) == 1 and powers == [1]:
2018-
# Short-cut
2017+
if not decompose and len(bases) == 1:
2018+
# Short-cut; with one unit there's no expand and gather.
20192019
unit = bases[0]
2020-
self._scale = sanitize_scale(scale * unit.scale)
2021-
self._bases = unit.bases
2022-
self._powers = unit.powers
2020+
power = powers[0]
2021+
if power == 1:
2022+
scale *= unit.scale
2023+
self._bases = unit.bases
2024+
self._powers = unit.powers
2025+
elif power == 0:
2026+
self._bases = []
2027+
self._powers = []
2028+
else:
2029+
scale *= unit.scale ** power
2030+
self._bases = unit.bases
2031+
self._powers = [operator.mul(*resolve_fractions(p, power))
2032+
for p in unit.powers]
2033+
self._scale = sanitize_scale(scale)
20232034
else:
20242035
self._scale = scale
20252036
self._bases = bases

‎astropy/units/utils.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,10 @@ def resolve_fractions(a, b):
252252
This ensures that any operation involving a Fraction will use
253253
rational arithmetic and preserve precision.
254254
"""
255-
a_is_fraction = isinstance(a, Fraction)
256-
b_is_fraction = isinstance(b, Fraction)
255+
a_is_fraction = (a.__class__ is not int and a.__class__ is not float and
256+
isinstance(a, Fraction))
257+
b_is_fraction = (b.__class__ is not int and b.__class__ is not float and
258+
isinstance(b, Fraction))
257259
if a_is_fraction and not b_is_fraction:
258260
b = Fraction(b)
259261
elif not a_is_fraction and b_is_fraction:

0 commit comments

Comments
 (0)