jpt-archive/bia-fitness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stop using __class__

Browse Source
This commit is contained in:
James Turk 2015-03-24 17:01:24 -04:00
parent bff8814fe2
commit ecf4bd7075
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bia/units.py
View File

@ -81,9 +81,9 @@ class UnitValue(object):
def as_unit(self, unit):
unit = Unit.unit(unit)
if self.unit == unit:
return self.__class__(self.scalar, self.unit)
return UnitValue(self.scalar, self.unit)
return self.__class__(self.scalar * self.unit.conversion_factor(unit), unit)
return UnitValue(self.scalar * self.unit.conversion_factor(unit), unit)
def __str__(self):
return '{}{}'.format(self.scalar, self.unit)
@ -100,25 +100,25 @@ class UnitValue(object):
def __add__(self, other):
if self.unit != other.unit:
other = other.as_unit(self.unit)
return self.__class__(self.scalar + other.scalar, self.unit)
return UnitValue(self.scalar + other.scalar, self.unit)
def __sub__(self, other):
if self.unit != other.unit:
other = other.as_unit(self.unit)
return self.__class__(self.scalar - other.scalar, self.unit)
return UnitValue(self.scalar - other.scalar, self.unit)
def __mul__(self, other):
if isinstance(other, UnitValue):
if self.unit != other.unit:
other = other.as_unit(self.unit)
return self.__class__(self.scalar * other.scalar, self.unit * other.unit)
return UnitValue(self.scalar * other.scalar, self.unit * other.unit)
else:
return self.__class__(self.scalar * other, self.unit)
return UnitValue(self.scalar * other, self.unit)
def __div__(self, other):
if isinstance(other, UnitValue):
if self.unit != other.unit:
other = other.as_unit(self.unit)
return self.__class__(self.scalar / other.scalar, self.unit / other.unit)
return UnitValue(self.scalar / other.scalar, self.unit / other.unit)
else:
return self.__class__(self.scalar / other, self.unit)
return UnitValue(self.scalar / other, self.unit)