Merge pull request #10 from nrc-cnrc/hotfix

Fix integer to a power bug
nrc-cnrc · May 7, 2020 · 2230edc · 2230edc
2 parents 34339db + 1b3cdf6
commit 2230edc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/dist/metrolopy-0.5.4.tar.gz b/dist/metrolopy-0.5.4.tar.gz
diff --git a/dist/metrolopy-0.5.4-py3-none-any.whl → dist/metrolopy-0.5.5-py3-none-any.whl b/dist/metrolopy-0.5.4-py3-none-any.whl → dist/metrolopy-0.5.5-py3-none-any.whl
diff --git a/dist/metrolopy-0.5.5.tar.gz b/dist/metrolopy-0.5.5.tar.gz
diff --git a/dist/metrolopy-0.5.4.zip → dist/metrolopy-0.5.5.zip b/dist/metrolopy-0.5.4.zip → dist/metrolopy-0.5.5.zip
diff --git a/dist/x b/dist/x
@@ -0,0 +1 @@
+
diff --git a/metrolopy/ummy.py b/metrolopy/ummy.py
@@ -958,10 +958,14 @@ def _pow(self,b):
             x = self._x**b._x
         dua = b._x*self._x**(b._x-1)*self._u
         lgx = log(self._x)
-        try:
-            lgx = type(self._x)(lgx)
-        except:
-            pass
+
+        # don't exactly remember why I did this,
+        # but it causes problems if x is int.
+        #try:
+            #lgx = type(self._x)(lgx)
+        #except:
+            #pass
+
         dub = lgx*self._x**b._x*b._u
         u = _combu(dua,dub,c)
 
@@ -1002,10 +1006,14 @@ def _rpow(self,b):
             raise ValueError('a negative number cannot raised to a power which has an uncertainty')
 
         lgb = log(b)
-        try:
-            lgb = type(b)(lgb)
-        except:
-            pass
+
+        # don't exactly remember why I did this,
+        # but it causes problems if x is int.
+        #try:
+            #lgb = type(b)(lgb)
+        #except:
+            #pass
+
         u = abs(b**self._x*lgb*self._u)
         refs = -self._refs if b < 0 else self._refs
         return type(self)(x,u,dof=self._ref,utype=refs)