fix init and best_size calc for Win32 platforms

Author: francof2a

fxpmath/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.3.0'
+__version__ = '0.3.1'
 
 import sys
 __maxsize__ = sys.maxsize

fxpmath/objects.py

@@ -212,8 +212,14 @@ def set_best_sizes(self, val=None, n_word=None, n_frac=None, max_error=1.0e-6, n
             if np.iscomplexobj(val):
                 val = np.array([val.real, val.imag])
 
+            # define numpy integer type
+            if self.signed:
+                int_dtype = np.int64
+            else:
+                int_dtype = np.uint64
+
             # find fractional parts
-            frac_vals = np.abs(np.subtract(val, val.astype(int))).ravel()
+            frac_vals = np.abs(np.subtract(val, val.astype(int_dtype))).ravel()
 
             # n_frac estimation
             if n_frac is None:
@@ -233,7 +239,7 @@ def set_best_sizes(self, val=None, n_word=None, n_frac=None, max_error=1.0e-6, n
                 n_frac = int(max(n_frac_calcs))
 
             # max raw value (integer) estimation
-            n_int = max( np.ceil(np.log2(np.max(np.abs( val*(1 << n_frac) + 0.5 )))).astype(int) - n_frac, 0)
+            n_int = max( np.ceil(np.log2(np.max(np.abs( val*(1 << n_frac) + 0.5 )))).astype(int_dtype) - n_frac, 0)
 
             # size assignement
             if n_word is None:
@@ -279,11 +285,11 @@ def set_val(self, val, raw=False, vdtype=None):
         if self.signed:
             val_max = (1 << (self.n_word-1)) - 1
             val_min = -val_max - 1
-            val_dtype = 'int'
+            val_dtype = np.int64
         else:
             val_max =  (1 << self.n_word) - 1
             val_min = 0
-            val_dtype = 'uint'
+            val_dtype = np.uint64
 
         # conversion factor
         if raw:
@@ -330,12 +336,15 @@ def astype(self, dtype=None):
         if dtype is None:
             dtype = self.vdtype
 
-        if dtype == float:
-            val = self.val / 2.0**self.n_frac
-        elif dtype == int or dtype == 'uint':
-            val = self.val.astype(dtype) // 2**self.n_frac
-        elif dtype == complex:
-            val = (self.val.real + 1j * self.val.imag) / 2.0**self.n_frac
+        if self.val is not None:
+            if dtype == float or np.issubdtype(dtype, np.floating):
+                val = self.val / 2.0**self.n_frac
+            elif dtype == int or dtype == 'uint' or dtype == 'int' or np.issubdtype(dtype, np.integer):
+                val = self.val.astype(dtype) // 2**self.n_frac
+            elif dtype == complex or np.issubdtype(dtype, np.complexfloating):
+                val = (self.val.real + 1j * self.val.imag) / 2.0**self.n_frac
+            else:
+                val = self.val / 2.0**self.n_frac
         else:
             val = None
 
@@ -541,14 +550,14 @@ def __pow__(self, n):
         n_word = self.n_word * n
         n_frac = self.n_frac * n
 
-        y = Fxp(self.get_val() ** n, signed=self.signed or x.signed, n_word=n_word, n_frac=n_frac)
+        y = Fxp(self.get_val() ** n, signed=self.signed or n.signed, n_word=n_word, n_frac=n_frac)
         return y
 
     def __rpow__(self, n):
         n_word = self.n_word * n
         n_frac = self.n_frac * n
 
-        y = Fxp(n ** self.get_val(), signed=self.signed or x.signed, n_word=n_word, n_frac=n_frac)
+        y = Fxp(n ** self.get_val(), signed=self.signed or n.signed, n_word=n_word, n_frac=n_frac)
         return y
 
     __ipow__ = __pow__
@@ -565,7 +574,7 @@ def __rshift__(self, n):
 
     def __lshift__(self, n):
         if self.shifting == 'expand':
-            n_word = max(self.n_word, np.ceil(np.log2(np.abs(self.val)+0.5)).astype(int) + self.signed + n)
+            n_word = max(self.n_word, int(np.max(np.ceil(np.log2(np.abs(self.val)+0.5)))) + self.signed + n)
         else:
             n_word = self.n_word
 

tests/test_bugs.py

@@ -41,4 +41,9 @@ def test_bugs_0_2_2():
     assert x() == -1.0
     assert x.n_word == 4
     assert x.signed == True
-    assert x.n_frac == 2
+    assert x.n_frac == 2
+
+def test_bugs_0_3_0():
+    # fail in Win32 because numpy astype(int) behavior
+    x = Fxp(4.001)
+    assert x() == 4.001