more units improvements

ddale · ddale · commit 7e55a9d262c0 · 2009-01-14T15:23:18.000-05:00
diff --git a/quantities/units/frequency.py b/quantities/units/frequency.py
@@ -5,15 +5,30 @@
 from quantities.units.time import s, min
 
 
-Hz = hertz = rps = \
-    UnitQuantity('Hz', s**-1)
-kHz = \
-    UnitQuantity('kHz', Hz*1000)
-MHz = \
-    UnitQuantity('MHz', kHz*1000)
-GHz = \
-    UnitQuantity('GHz', MHz*1000)
-rpm = \
-    UnitQuantity('rpm', min**-1)
+Hz = hertz = rps = UnitQuantity(
+    'hertz',
+    s**-1,
+    symbol='Hz'
+)
+kHz = kilohertz = UnitQuantity(
+    'kilohertz',
+    Hz*1000,
+    symbol='kHz'
+)
+MHz = megahertz = UnitQuantity(
+    'megahertz',
+    kHz*1000,
+    symbol='MHz'
+)
+GHz = gigahertz = UnitQuantity(
+    'gigahertz',
+    MHz*1000,
+    symbol='GHz'
+)
+rpm = revolutions_per_minute = UnitQuantity(
+    'revolutions_per_minute',
+    min**-1,
+    symbol='rpm'
+)
 
 del UnitQuantity, s, min
diff --git a/quantities/units/heat.py b/quantities/units/heat.py
@@ -2,12 +2,30 @@
 """
 
 from quantities.units.unitquantity import UnitQuantity
-from quantities.units.temperature import K
-from quantities.units.length import m
+from quantities.units.temperature import K, degF
+from quantities.units.length import m, ft
 from quantities.units.power import W
+from quantities.units.energy import BTU
+from quantities.units.time import h
 
 
-clo = clos = \
-    UnitQuantity('clo', 1.55e-1*K*m**2/W)
+RSI = UnitQuantity(
+    'RSI',
+    K*m**2/W,
+    note='R-value in SI'
+)
 
-del UnitQuantity, K, m, W
+clo = clos = UnitQuantity(
+    'clo',
+    0.155*RSI,
+    aliases=['clos']
+)
+
+R_value = UnitQuantity(
+    'R_value',
+    ft**2*degF*h/BTU,
+    note='American customary units'
+)
+
+
+del UnitQuantity, K, degF, m, ft, W, BTU, h
