improved Dimensionality repr

ddale · ddale · commit de9f645cc9d3 · 2009-02-15T18:23:45.000-05:00
keep all tests in top-level tests directory, allows better control over
order in which tests are run

begin working on dimensionality tests
diff --git a/quantities.e4p b/quantities.e4p
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-4.6.dtd">
 <!-- eric4 project file for project quantities -->
-<!-- Saved: 2009-02-11, 08:41:32 -->
+<!-- Saved: 2009-02-15, 17:28:58 -->
 <!-- Copyright (C) 2009 ,  -->
 <Project version="4.6">
   <Language>en</Language>
@@ -72,8 +72,6 @@
     <Source>quantities/umath/ufunclike.py</Source>
     <Source>quantities/umath/__init__.py</Source>
     <Source>quantities/umath/umath.py</Source>
-    <Source>quantities/tests/test_umath.py</Source>
-    <Source>quantities/umath/tests/test_umath.py</Source>
   </Sources>
   <Forms>
   </Forms>
diff --git a/quantities/dimensionality.py b/quantities/dimensionality.py
@@ -17,6 +17,10 @@ class Dimensionality(dict):
     """
     """
 
+    @property
+    def ndims(self):
+        return sum(abs(i) for i in self.simplified.itervalues())
+
     @property
     def simplified(self):
         if len(self):
@@ -144,7 +148,8 @@ def __ipow__(self, other):
         return self
 
     def __repr__(self):
-        return self.string
+        return 'Dimensionality([%s])' \
+            % ', '.join(['(%s, %s)'% (u.name, e) for u, e in self.iteritems()])
 
     def __str__(self):
         if USE_UNICODE:
@@ -155,5 +160,22 @@ def __str__(self):
     def __eq__(self, other):
         return hash(self) == hash(other)
 
+    def __ne__(self, other):
+        return hash(self) != hash(other)
+
+    __neq__ = __ne__
+
+    def __gt__(self, other):
+        return self.ndims > other.ndims
+
+    def __ge__(self, other):
+        return self.ndims >= other.ndims
+
+    def __lt__(self, other):
+        return self.ndims < other.ndims
+
+    def __le__(self, other):
+        return self.ndims <= other.ndims
+
     def copy(self):
         return Dimensionality(self)
diff --git a/quantities/quantity.py b/quantities/quantity.py
@@ -6,6 +6,7 @@
 
 import numpy
 
+from .config import USE_UNICODE
 from .dimensionality import Dimensionality
 from .registry import unit_registry
 from .utilities import with_doc
@@ -353,14 +354,16 @@ def __rpow__(self, other):
     @with_doc(numpy.ndarray.__repr__)
     def __repr__(self):
         return '%s * %s'%(
-            repr(self.magnitude), repr(self.dimensionality)
+            repr(self.magnitude), self.dimensionality.string
         )
 
     @with_doc(numpy.ndarray.__str__)
     def __str__(self):
-        return '%s %s'%(
-            str(self.magnitude), str(self.dimensionality)
-        )
+        if USE_UNICODE:
+            dims = self.dimensionality.unicode
+        else:
+            dims = self.dimensionality.string
+        return '%s %s'%(str(self.magnitude), dims)
 
     @with_doc(numpy.ndarray.__getitem__)
     def __getitem__(self, key):
diff --git a/quantities/tests/test_dimensionality.py b/quantities/tests/test_dimensionality.py
@@ -0,0 +1,87 @@
+﻿# -*- coding: utf-8 -*-
+
+import operator
+import os
+
+from nose.tools import *
+from numpy.testing import *
+
+import quantities as q
+from quantities.dimensionality import Dimensionality
+
+
+meter = Dimensionality([(q.m, 1)])
+meter_repr = 'Dimensionality([(meter, 1)])'
+meter_str = 'm'
+joule = Dimensionality([(q.kg, 1), (q.m, 2), (q.s, -2)])
+joule_repr = 'Dimensionality([(kilogram, 1), (meter, 2), (second, -2)])'
+joule_str = 'kg*m**2/s**2'
+joule_uni = 'kg·m²/s²'
+Joule = Dimensionality([(q.J, 1)])
+Joule_repr = 'Dimensionality([(joule, 1)])'
+Joule_str = 'J'
+
+
+def test_dimensionality_repr():
+    assert_equal(repr(meter), meter_repr)
+    assert_equal(repr(joule), joule_repr)
+    assert_equal(repr(Joule), Joule_repr)
+
+def test_dimensionality_str():
+    assert_equal(str(meter), meter_str)
+    assert_equal(joule.string, joule_str)
+    assert_equal(joule.unicode, joule_uni)
+    assert_equal(Joule.string, 'J')
+
+def test_equality():
+    assert_true(meter == meter)
+    assert_true(joule == joule)
+    assert_false(meter == Joule)
+    assert_false(joule == Joule)
+    assert_equal(repr(joule), joule_repr)
+
+def test_inequality():
+    assert_false(meter != meter)
+    assert_false(joule != joule)
+    assert_true(meter != Joule)
+    assert_true(joule != Joule)
+    assert_equal(repr(joule), joule_repr)
+
+def test_addition():
+    assert_equal(repr(meter+meter), meter_repr)
+    assert_true(meter + meter is not meter)
+    assert_equal(repr(meter), meter_repr)
+    assert_raises(ValueError, operator.__add__, meter, joule)
+    assert_raises(ValueError, operator.__add__, Joule, joule)
+
+def test_subtraction():
+    assert_equal(repr(meter-meter), meter_repr)
+    assert_true(meter - meter is not meter)
+    assert_equal(repr(meter), meter_repr)
+    assert_raises(ValueError, operator.__sub__, meter, joule)
+    assert_raises(ValueError, operator.__sub__, Joule, joule)
+
+
+def test_simplification():
+    assert_equal(Joule.simplified.string, 'kg*m**2/s**2')
+
+def test_gt():
+    assert_true(joule > meter)
+    assert_true(Joule > meter)
+    assert_false(meter > joule)
+    assert_false(meter > Joule)
+    assert_false(joule > joule)
+    assert_false(joule > Joule)
+
+def test_ge():
+    assert_true(joule >= meter)
+    assert_true(Joule >= meter)
+    assert_false(meter >= joule)
+    assert_false(meter >= Joule)
+    assert_true(joule >= joule)
+    assert_true(joule >= Joule)
+
+
+
+if __name__ == "__main__":
+    run_module_suite()
diff --git a/quantities/tests/test_umath.py b/quantities/tests/test_umath.py
diff --git a/quantities/umath/__init__.py b/quantities/umath/__init__.py
@@ -1,7 +1,3 @@
 from fromnumeric import *
 from ufunclike import *
 from umath import *
-
-from numpy.testing import Tester
-test = Tester().test
-#bench = Tester().bench
diff --git a/quantities/uncertainquantity.py b/quantities/uncertainquantity.py
@@ -170,15 +170,19 @@ def __repr__(self):
         return '%s(%s, %s, %s)'%(
             self.__class__.__name__,
             repr(self.magnitude),
-            repr(self.dimensionality),
+            self.dimensionality.string,
             repr(self.uncertainty.magnitude)
         )
 
     @with_doc(Quantity.__str__, use_header=False)
     def __str__(self):
+        if USE_UNICODE:
+            dims = self.dimensionality.unicode
+        else:
+            dims = self.dimensionality.string
         s = '%s %s\n+/-%s (1 sigma)'%(
             str(self.magnitude),
-            str(self.dimensionality),
+            dims,
             str(self.uncertainty)
         )
         if USE_UNICODE:
diff --git a/quantities/unitquantity.py b/quantities/unitquantity.py
@@ -138,7 +138,7 @@ def _set_units(self, units):
     def __repr__(self):
         ref = self._definition
         if ref:
-            ref = ', %s * %s'%(str(ref.magnitude), repr(ref.dimensionality))
+            ref = ', %s * %s'%(str(ref.magnitude), ref.dimensionality.string)
         else:
             ref = ''
         symbol = self._symbol
diff --git a/quantities/units/mass.py b/quantities/units/mass.py
@@ -7,7 +7,7 @@
 from .length import m
 
 kg = kilogram =  UnitMass(
-    'kilograms',
+    'kilogram',
     symbol='kg',
     aliases=['kilograms']
 )
diff --git a/setup.py b/setup.py
@@ -33,7 +33,10 @@
 import os
 import sys
 
-from distutils.core import setup
+if 'develop' in sys.argv or 'nosetests' in sys.argv:
+    from setuptools import setup
+else:
+    from distutils.core import setup
 
 if os.path.exists('MANIFEST'): os.remove('MANIFEST')
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`from .length import m`
`8`	`8`
`9`	`9`	`kg = kilogram = UnitMass(`
`10`		`- 'kilograms',`
	`10`	`+ 'kilogram',`
`11`	`11`	`symbol='kg',`
`12`	`12`	`aliases=['kilograms']`
`13`	`13`	`)`