changed Quantity ctor kwarg order

Darren Dale · Darren Dale · commit 5ccd67c8c3b8 · 2008-12-30T18:49:26.000-05:00
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'], 'd', entry['units'])
+    q = Quantity(entry['value'], entry['units'], 'd')
     q.precision = entry['precision']
     return q
 
diff --git a/quantities/quantity.py b/quantities/quantity.py
@@ -15,7 +15,7 @@ class Quantity(numpy.ndarray):
     # TODO: what is an appropriate value?
     __array_priority__ = 21
 
-    def __new__(cls, magnitude, dtype='d', units={}, mutable=True):
+    def __new__(cls, magnitude, units={}, dtype='d', mutable=True):
         if not isinstance(magnitude, numpy.ndarray):
             magnitude = numpy.array(magnitude, dtype=dtype)
             if not magnitude.flags.contiguous:
@@ -30,7 +30,7 @@ def __new__(cls, magnitude, dtype='d', units={}, mutable=True):
         ret.flags.writeable = mutable
         return ret
 
-    def __init__(self, data, dtype='d', units={}, mutable=True):
+    def __init__(self, data, units={}, dtype='d', mutable=True):
         if isinstance(units, str):
             units = unit_registry[units].dimensionality
         if isinstance(units, Quantity):
@@ -75,14 +75,14 @@ def __add__(self, other):
             assert isinstance(other, Quantity)
         dims = self.dimensionality + other.dimensionality
         magnitude = self.magnitude + other.magnitude
-        return Quantity(magnitude, magnitude.dtype, dims)
+        return Quantity(magnitude, dims, magnitude.dtype)
 
     def __sub__(self, other):
         if self.dimensionality:
             assert isinstance(other, Quantity)
         dims = self.dimensionality - other.dimensionality
         magnitude = self.magnitude - other.magnitude
-        return Quantity(magnitude, magnitude.dtype, dims)
+        return Quantity(magnitude, dims, magnitude.dtype)
 
     def __mul__(self, other):
         assert isinstance(other, (numpy.ndarray, int, float))
@@ -92,7 +92,7 @@ def __mul__(self, other):
         except:
             dims = copy.copy(self.dimensionality)
             magnitude = self.magnitude * other
-        return Quantity(magnitude, magnitude.dtype, dims)
+        return Quantity(magnitude, dims, magnitude.dtype)
 
     def __truediv__(self, other):
         assert isinstance(other, (numpy.ndarray, int, float))
@@ -102,7 +102,7 @@ def __truediv__(self, other):
         except:
             dims = copy.copy(self.dimensionality)
             magnitude = self.magnitude / other
-        return Quantity(magnitude, magnitude.dtype, dims)
+        return Quantity(magnitude, dims, magnitude.dtype)
 
     __div__ = __truediv__
 
@@ -119,7 +119,7 @@ def __pow__(self, other):
         assert isinstance(other, (numpy.ndarray, int, float))
         dims = self.dimensionality**other
         magnitude = self.magnitude**other
-        return Quantity(magnitude, magnitude.dtype, dims)
+        return Quantity(magnitude, dims, magnitude.dtype)
 
     def __repr__(self):
         return '%s*%s'%(numpy.ndarray.__str__(self), self.units)
diff --git a/quantities/units/unitquantity.py b/quantities/units/unitquantity.py
@@ -14,14 +14,14 @@ def __new__(cls, name, reference_quantity=None):
         return Quantity.__new__(
             cls,
             1.0,
-            dtype='d',
             units={},
+            dtype='d',
             mutable=False
         )
 
     def __init__(self, name, reference_quantity=None):
         self._name = name
-        Quantity.__init__(self, 1.0, 'd', {self:1}, mutable=False)
+        Quantity.__init__(self, 1.0, {self:1}, 'd', mutable=False)
 
         if reference_quantity is None:
             reference_quantity = self
@@ -106,7 +106,7 @@ class Dimensionless(UnitQuantity):
 
     def __init__(self, name, reference_quantity=None):
         self._name = name
-        Quantity.__init__(self, 1.0, 'd', {}, mutable=False)
+        Quantity.__init__(self, 1.0, {}, 'd', mutable=False)
 
         if reference_quantity is None:
             reference_quantity = self
