metrolopy 0.6.5__py3-none-any.whl → 1.0.0__py3-none-any.whl

metrolopy/tests/__init__.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from .test_create import *
-from .test_operations import *
-from .test_ubreakdown import *
-from .test_complex import *
-from .test_misc import *
-from .test_gummy import *
+from .test_create import TestCreate
+from .test_operations import TestOperations
+from .test_ubreakdown import TestUbreakdown
+from .test_complex import TestComplex
+from .test_misc import TestMisc
+from .test_gummy import TestGummy

metrolopy/tests/test_create.py

@@ -161,8 +161,8 @@ class TestCreate(unittest.TestCase):
         
                     if rand.randint(10) == 0:
                         n = rand.randint(12)
-                        if bayesian and n > 0:
-                            dof = float('inf')
+                        #if bayesian and n > 0:
+                           # dof = float('inf')
                         if n == 0:
                             nm = g.name
                             g = uc.gummy(g)
@@ -292,10 +292,11 @@ class TestCreate(unittest.TestCase):
                         
                     self.assertTrue((g.x - x)/u < 1e-6)
                     
-                    if dof == float('inf'):
-                        self.assertTrue(g.dof == float('inf'))
-                    else:
-                        self.assertTrue((g.dof - dof)/dof < 1e-6)
+                    if not uc.gummy.bayesian:
+                        if dof == float('inf'):
+                            self.assertTrue(g.dof == float('inf'))
+                        else:
+                            self.assertTrue((g.dof - dof)/dof < 1e-6)
                     
                     if uunit is not None and uunit != unit:
                         self.assertTrue(g.uunit is uc.Unit.unit(uunit))

metrolopy/tests/test_gummy.py

@@ -35,18 +35,6 @@ class TestGummy(unittest.TestCase):
         self.assertTrue(_ku(2.1,3.3) == 2.1*3.3)
         self.assertTrue(_ku(2.1,Decimal(3.3)) == Decimal(float(2.1))*Decimal(3.3))
         
-    def test_lg10(self):
-        from metrolopy.gummy import _lg10
-        from mpmath import mpf,log10
-        from decimal import Decimal
-        from fractions import Fraction
-        import math
-        
-        self.assertTrue(_lg10(mpf(2.2)) == log10(mpf(2.2)))
-        self.assertTrue(_lg10(Decimal(2.2)) == Decimal(2.2).log10())
-        self.assertTrue(_lg10(2.2) == np.log10(2.2))
-        self.assertTrue(_lg10(Fraction(2,3)) == math.log10(float(Fraction(2,3))))
-        
     def test_meta_properties(self):
         a = uc.gummy.cimethod
         self.assertTrue(isinstance(a,str))
@@ -217,7 +205,7 @@ class TestGummy(unittest.TestCase):
         try:
             uc.gummy(3.3,1.3,unit='%',uunit='m')
             self.assertTrue(False)
-        except uc.NoUnitConversionFoundError:
+        except uc.IncompatibleUnitsError:
             pass
         
         gg = uc.gummy(3.3,1.4,unit='%',uunit=uc.one)
@@ -252,7 +240,7 @@ class TestGummy(unittest.TestCase):
         self.assertTrue(abs(c.U[1] - 4.4*1.1/3**2) < 1e-12)
         
     def test_set_U(self):
-        g = uc.gummy(1,1,k=2,unit='cm',uunit='mm')
+        g = uc.gummy(1.0,1.0,k=2,unit='cm',uunit='mm')
         self.assertTrue(g.U == 1)
         self.assertTrue(g.uunit is uc.unit('mm'))
         g.unit = 'm'
@@ -285,7 +273,7 @@ class TestGummy(unittest.TestCase):
         try:
             self.assertTrue(g._iset_U(unit='kg'))
             self.assertTrue(False)
-        except uc.NoUnitConversionFoundError:
+        except uc.IncompatibleUnitsError:
             pass
         
         g = uc.gummy(0,1,unit='m')
@@ -534,32 +522,6 @@ class TestGummy(unittest.TestCase):
         self.assertTrue(a.covariance(a) == 1)
         self.assertTrue(b.covariance(b) == 4)
         
-    def test_correlation_matrix(self):
-        a = uc.gummy(1,1)
-        b = uc.gummy(1,2)
-        c = a + b
-        m = uc.gummy.correlation_matrix([a,b,c])
-        self.assertTrue(m[0][0] == m[1][1] == m[2,2] == 1)
-        self.assertTrue(m[0][1] == m[1][0] == 0)
-        self.assertTrue(abs(m[2][0] - 1/c.u) < 1e-4)
-        self.assertTrue(abs(m[0][2] - 1/c.u) < 1e-4)
-        self.assertTrue(abs(m[2][1] - 2/c.u) < 1e-4)
-        self.assertTrue(abs(m[1][2] - 2/c.u) < 1e-4)
-        
-    def test_covariance_matrix(self):
-        a = uc.gummy(1,1)
-        b = uc.gummy(1,2)
-        c = a + b
-        m = uc.gummy.covariance_matrix([a,b,c])
-        self.assertTrue(m[0][0] == 1)
-        self.assertTrue(m[1][1] == 4)
-        self.assertTrue(abs(m[2][2] - 5) < 1e-4)
-        self.assertTrue(m[0][1] == m[1][0] == 0)
-        self.assertTrue(abs(m[2][0] - 1) < 1e-4)
-        self.assertTrue(abs(m[0][2] - 1) < 1e-4)
-        self.assertTrue(abs(m[2][1] - 4) < 1e-4)
-        self.assertTrue(abs(m[1][2] - 4) < 1e-4)
-        
     def test_correlation_sim(self):
         a = uc.gummy(1,1)
         b = uc.gummy(1,2)
@@ -653,8 +615,8 @@ class TestGummy(unittest.TestCase):
         c = uc.gummy(0.9,0.2,utype='B')
         d = a + b + c
         self.assertTrue(abs(d.ufrom('A') - np.sqrt(0.2**2+0.5**2)) < 1e-8)
-        uc.gummy.simulate([d,'A'])
-        self.assertTrue(abs(d.ufrom('A',sim=True) - np.sqrt(0.2**2+0.5**2)) < 1e-2)
+        uc.gummy.simulate([d,b])
+        self.assertTrue(abs(d.ufromsim('A') - np.sqrt(0.2**2+0.5**2)) < 1e-2)
         self.assertTrue(d.ufrom(c) == 0.2)
         
     def test_dof_from(self):

metrolopy/tests/test_misc.py

@@ -103,6 +103,7 @@ class TestMisc(unittest.TestCase):
             return t.ppf(1-(1-con)/2, len(x)-1)*x.std(ddof=1)/np.sqrt(len(x))
     
         x = np.random.rand(5)
+        uc.gummy.bayesian = False
         g = uc.mean(x)
         g.p = 'ssd'
         self.assertTrue(abs(con-g.p) < 1e-6)

metrolopy/tests/test_operations.py

@@ -85,8 +85,9 @@ class TestOperations(unittest.TestCase):
         else:
             self.assertTrue(abs((g.u - u)/u) < 1e-3)
         
-        if dof is not None and not np.isinf(dof):
-            self.assertTrue(abs((g.dof - dof)/dof) < 0.01)
+        if not uc.gummy.bayesian:
+            if dof is not None and not np.isinf(dof):
+                self.assertTrue(abs((g.dof - dof)/dof) < 0.01)
         
         self.assertTrue(a.correlation(b) == 0)
         

metrolopy/tests/test_ubreakdown.py

@@ -70,9 +70,10 @@ class TestUbreakdown(unittest.TestCase):
             
             ut = None
             for q in g:
-                if gr.value._ref is q.value._ref:
+                if abs(gr.correlation(q)) == 1:
                     ut = q.utype
-            self.assertTrue(gr.utype is ut)
+            if ut is not None:
+                self.assertTrue(gr.utype is ut)
             
             x = list(x)
             u = list(u)