units now register themselves

Darren Dale · Darren Dale · commit a49e808e0255 · 2008-12-30T17:42:18.000-05:00
all units *appear* to be working
constants also *appear* to be working
diff --git a/quantities/__init__.py b/quantities/__init__.py
@@ -50,13 +50,12 @@
 __version__ = '0.1(bzr)'
 
 
-#from quantity import Quantity, ProtectedUnitsError
 from quantity import Quantity
 
-#from parser import unit_registry
-#
-#import units
-#from units import *
-#
-#import constants
-#from constants import *
+from parser import unit_registry
+
+import units
+from units import *
+
+import constants
+from constants import *
diff --git a/quantities/constants/codata.py b/quantities/constants/codata.py
diff --git a/quantities/constants/constants.py b/quantities/constants/constants.py
@@ -8,7 +8,7 @@
 
 def _cd(name):
     entry = _pc[name]
-    q = Quantity(entry['value'], entry['units'])
+    q = Quantity(entry['value'], 'd', entry['units'])
     q.precision = entry['precision']
     return q
 
diff --git a/quantities/parser.py b/quantities/parser.py
@@ -74,11 +74,11 @@ def __getitem__(self, label):
             try:
                 _unit = self.__registry[label.lower()]
             except:
-                _unit = self.__registry['compound'](label)
+                _unit = self.__registry['UnitQuantity'](label)
 
         # this check should be more robust:
-        if hasattr(_unit, 'modify_units'):
-            return copy.deepcopy(_unit)
+        if hasattr(_unit, '_dimensionality'):
+            return _unit
         else:
             raise "unrecognized unit: %s"%_unit
 
diff --git a/quantities/quantity.py b/quantities/quantity.py
@@ -7,6 +7,7 @@
 
 from quantities.dimensionality import BaseDimensionality, \
     MutableDimensionality, ImmutableDimensionality
+from quantities.parser import unit_registry
 
 
 class HasDimensionality(numpy.ndarray):
@@ -109,6 +110,8 @@ class Quantity(HasDimensionality):
     __array_priority__ = 21
 
     def __init__(self, magnitude, dtype='d', units={}, mutable=True):
+        if isinstance(units, str):
+            units = unit_registry[units].dimensionality
         if isinstance(units, HasDimensionality):
             units = units.dimensionality
         assert isinstance(units, (BaseDimensionality, dict))
diff --git a/quantities/units/__init__.py b/quantities/units/__init__.py
@@ -1,92 +1,70 @@
 """
 """
 
-#from quantities.parser import unit_registry
-#
-#import acceleration
-#unit_registry.update(acceleration)
-#from acceleration import *
-#
-#import angle
-#unit_registry.update(angle)
-#from angle import *
-#
-#import area
-#unit_registry.update(area)
-#from area import *
-#
-#import compound
-#unit_registry.update(compound)
-#from compound import *
-#
-#import dimensionless
-#unit_registry.update(dimensionless)
-#from dimensionless import *
-#
-#import electromagnetism
-#unit_registry.update(electromagnetism)
-#from electromagnetism import *
-#
-#import energy
-#unit_registry.update(energy)
-#from energy import *
-#
-#import force
-#unit_registry.update(force)
-#from force import *
-#
-#import frequency
-#unit_registry.update(frequency)
-#from frequency import *
-#
-#import heat
-#unit_registry.update(heat)
-#from heat import *
-#
-#import information
-#unit_registry.update(information)
-#from information import *
-#
-#import length
-#unit_registry.update(length)
-#from length import *
-#
-#import mass
-#unit_registry.update(mass)
-#from mass import *
-#
-#import power
-#unit_registry.update(power)
-#from power import *
-#
-#import pressure
-#unit_registry.update(pressure)
-#from pressure import *
-#
-#import radiation
-#unit_registry.update(radiation)
-#from radiation import *
-#
-#import substance
-#unit_registry.update(substance)
-#from substance import *
-#
-#import temperature
-#unit_registry.update(temperature)
-#from temperature import *
-#
-#import time
-#unit_registry.update(time)
-#from time import *
-#
-#import velocity
-#unit_registry.update(velocity)
-#from velocity import *
-#
-#import viscosity
-#unit_registry.update(viscosity)
-#from viscosity import *
-#
-#import volume
-#unit_registry.update(volume)
-#from volume import *
+from quantities.parser import unit_registry
+
+import acceleration
+from acceleration import *
+
+import angle
+from angle import *
+
+import area
+from area import *
+
+import compound
+from compound import *
+
+import dimensionless
+from dimensionless import *
+
+import electromagnetism
+from electromagnetism import *
+
+import energy
+from energy import *
+
+import force
+from force import *
+
+import frequency
+from frequency import *
+
+import heat
+from heat import *
+
+import information
+from information import *
+
+import length
+from length import *
+
+import mass
+from mass import *
+
+import power
+from power import *
+
+import pressure
+from pressure import *
+
+import radiation
+from radiation import *
+
+import substance
+from substance import *
+
+import temperature
+from temperature import *
+
+import time
+from time import *
+
+import velocity
+from velocity import *
+
+import viscosity
+from viscosity import *
+
+import volume
+from volume import *
diff --git a/quantities/units/angle.py b/quantities/units/angle.py
@@ -18,6 +18,6 @@
 degree_west = degrees_west = degree_W= degrees_W = UnitAngle('degrees_W')
 degree_true = degrees_true = degree_T = degrees_T = UnitAngle('degrees_T')
 
-sr = steradian = steradians = UnitQuantity('steradian')
+sr = steradian = steradians = UnitQuantity('sr')
 
 del UnitQuantity
diff --git a/quantities/units/dimensionless.py b/quantities/units/dimensionless.py
@@ -1,6 +1,6 @@
 """
 """
 
-from unitquantities import UnitQuantity
+from quantities.units.unitquantity import Dimensionless
 
-dimensionless = UnitQuantity('')
+dimensionless = Dimensionless('dimensionless')
diff --git a/quantities/units/electromagnetism.py b/quantities/units/electromagnetism.py
@@ -1,7 +1,7 @@
 """
 """
 
-from quantities.units.unitquantities import UnitCurrent, \
+from quantities.units.unitquantity import UnitCurrent, \
     UnitLuminousIntensity, UnitQuantity
 from quantities.units.time import s
 from quantities.units.length import m
diff --git a/quantities/units/heat.py b/quantities/units/heat.py
@@ -7,6 +7,6 @@
 from quantities.units.power import W
 
 
-clo = clos = compound('clo', 1.55e-1*K*m**2/W)
+clo = clos = UnitQuantity('clo', 1.55e-1*K*m**2/W)
 
 del UnitQuantity, K, m, W
diff --git a/quantities/units/information.py b/quantities/units/information.py
@@ -1,7 +1,7 @@
 """
 """
 
-from quantities.units.unitquantities import UnitQuantity, UnitInformation
+from quantities.units.unitquantity import UnitQuantity, UnitInformation
 from quantities.units.time import s
 
 bit = bits = UnitInformation('bit')
diff --git a/quantities/units/mass.py b/quantities/units/mass.py
@@ -20,7 +20,8 @@
 slug = UnitMass('slug')
 apothecary_ounce = troy_ounce = UnitMass('troy_ounce')
 apothecary_pound = troy_pound = UnitMass('troy_pound')
-u = amu = atomic_mass_unit = UnitMass('amu')
+amu = atomic_mass_unit = UnitMass('amu')
+u = UnitMass('u')
 scruple = UnitMass('scruple')
 apdram = UnitMass('apdram')
 apounce = UnitMass('apounce')
diff --git a/quantities/units/power.py b/quantities/units/power.py
@@ -10,7 +10,7 @@
 W = watt = watts = UnitQuantity('W', J/s)
 mW = milliwatt = milliwatts = UnitQuantity('mW', W/1000)
 kW = kilowatt = kilowatts = UnitQuantity('kW', 1000*W)
-MW = megawatt = megawatts = UnitQuantity('MW', 1000*kw)
+MW = megawatt = megawatts = UnitQuantity('MW', 1000*kW)
 VA = voltampere = voltamperes = UnitQuantity('VA', 1000*kW)
 boiler_horsepower = boiler_horsepowers = UnitQuantity('boiler_horsepower', 9.80950e3*W)
 hp = horsepower = horsepowers = UnitQuantity('hp', 7.456999e2*W)
diff --git a/quantities/units/unitquantity.py b/quantities/units/unitquantity.py
@@ -2,6 +2,7 @@
 """
 
 from quantities.quantity import Quantity
+from quantities.parser import unit_registry
 
 
 class UnitQuantity(Quantity):
@@ -29,6 +30,8 @@ def __init__(self, name, reference_quantity=None):
         self._format_order = (self._primary_order, self._secondary_order)
         self.__class__._secondary_order += 1
 
+        unit_registry[name] = self
+
     @property
     def format_order(self):
         return self._format_order
@@ -46,6 +49,8 @@ def __repr__(self):
 
     __str__ = __repr__
 
+unit_registry['UnitQuantity'] = UnitQuantity
+
 
 class UnitMass(UnitQuantity):
 
@@ -95,3 +100,19 @@ class UnitAngle(UnitQuantity):
 class UnitCurrency(UnitQuantity):
 
     _primary_order = 9
+
+
+class Dimensionless(UnitQuantity):
+
+    def __init__(self, name, reference_quantity=None):
+        self._name = name
+        Quantity.__init__(self, 1.0, 'd', {}, mutable=False)
+
+        if reference_quantity is None:
+            reference_quantity = self
+        self._reference_quantity = reference_quantity
+
+        self._format_order = (self._primary_order, self._secondary_order)
+        self.__class__._secondary_order += 1
+
+        unit_registry[name] = self
diff --git a/quantities/units/velocity.py b/quantities/units/velocity.py
@@ -1,7 +1,7 @@
 """
 """
 
-from quantities.units.unitquantities import UnitQuantity
+from quantities.units.unitquantity import UnitQuantity
 from quantities.units.length import m, nautical_mile
 from quantities.units.time import s, h
 
diff --git a/quantities/units/viscosity.py b/quantities/units/viscosity.py
@@ -1,7 +1,7 @@
 """
 """
 
-from quantities.units.unitquantities import UnitQuantity
+from quantities.units.unitquantity import UnitQuantity
 from quantities.units.time import s
 from quantities.units.length import m
 from quantities.units.pressure import Pa
diff --git a/quantities/units/volume.py b/quantities/units/volume.py
@@ -1,7 +1,7 @@
 """
 """
 
-from quantities.units.unitquantities import UnitQuantity
+from quantities.units.unitquantity import UnitQuantity
 from quantities.units.length import cm, m
 
 
diff --git a/setup.py b/setup.py
@@ -51,12 +51,7 @@ def run(self):
         name = line[:55].rstrip().replace('mag.','magnetic').replace('mom.', 'moment')
         val = line[55:77].replace(' ','').replace('...','')
         prec = line[77:99].replace(' ','').replace('(exact)', '0')
-        unit = line[99:].rstrip().replace(' ', '*')
-        unit = unit.replace('T', 'T_').replace('Pa','Pa_')
-        unit = unit.replace('J','J_').replace('ohm','ohm_')
-        unit = unit.replace('E_h','E_h_').replace('V','V_')
-        unit = unit.replace('Hz','Hz_').replace('F','F_')
-        unit = unit.replace('W','W_').replace('W_b','Wb_')
+        unit = line[99:].rstrip().replace(' ', '*').replace('^', '**')
         d = "{'value': %s, 'precision': %s, 'units': '%s'}"%(val, prec, unit)
         f.write("physical_constants['%s'] = %s\n"%(name, d))
 
