Bug Fixes

Pencilcaseman · Oct 17, 2020 · eb4b276 · eb4b276
1 parent d5a0191
commit eb4b276
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 26 deletions.
diff --git a/build/lib.win-amd64-3.8/libpymath/matrix/matrix.py b/build/lib.win-amd64-3.8/libpymath/matrix/matrix.py
@@ -13,22 +13,22 @@ def LPM_OPTIMAL_MATRIX_THREADS(self):
            "D_SIGMOID", "D_TANH", "D_ReLU", "D_LEAKY_ReLU"]
 
 # Matrix fill options
-SCALAR = 0
-ASCENDING = 1
-DESCENDING = 2
-RANDOM = 3
+SCALAR = 1 << 0
+ASCENDING = 1 << 1
+DESCENDING = 1 << 2
+RANDOM = 1 << 3
 
 # Matrix map options
-SIGMOID = 4
-TANH = 5
-ReLU = 6
-LEAKY_ReLU = 7
+SIGMOID = 1 << 4
+TANH = 1 << 5
+ReLU = 1 << 6
+LEAKY_ReLU = 1 << 7
 
 # Matrix map derivative options
-D_SIGMOID = 8
-D_TANH = 9
-D_ReLU = 10
-D_LEAKY_ReLU = 11
+D_SIGMOID = 1 << 8
+D_TANH = 1 << 9
+D_ReLU = 1 << 10
+D_LEAKY_ReLU = 1 << 11
 
 
 # The Matrix class
@@ -184,6 +184,10 @@ def __init__(self, *args, **kwargs):
                             cols = len(tmp) // rows
                             if rows * cols != len(tmp):
                                 raise ValueError("Impossible to make dimensions fit the supplied data. Closest fit is {}x{}".format(rows, cols))
+                        else:
+                            # No rows or columns specified
+                            rows = 1
+                            cols = len(data)
                 else:
                     # Check against a 2d list
                     if rows is not None and cols is not None:

diff --git a/dist/libpymath-0.5.5-cp38-cp38-win_amd64.whl b/dist/libpymath-0.5.5-cp38-cp38-win_amd64.whl
diff --git a/dist/libpymath-0.5.5.tar.gz b/dist/libpymath-0.5.5.tar.gz
diff --git a/libpymath.egg-info/PKG-INFO b/libpymath.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libpymath
-Version: 0.5.4
+Version: 0.5.5
 Summary: A general purpose Python math module
 Home-page: https://www.github.com/pencilcaseman/libpymath
 Author: Toby Davis

diff --git a/libpymath/matrix/matrix.py b/libpymath/matrix/matrix.py
@@ -13,22 +13,22 @@ def LPM_OPTIMAL_MATRIX_THREADS(self):
            "D_SIGMOID", "D_TANH", "D_ReLU", "D_LEAKY_ReLU"]
 
 # Matrix fill options
-SCALAR = 0
-ASCENDING = 1
-DESCENDING = 2
-RANDOM = 3
+SCALAR = 1 << 0
+ASCENDING = 1 << 1
+DESCENDING = 1 << 2
+RANDOM = 1 << 3
 
 # Matrix map options
-SIGMOID = 4
-TANH = 5
-ReLU = 6
-LEAKY_ReLU = 7
+SIGMOID = 1 << 4
+TANH = 1 << 5
+ReLU = 1 << 6
+LEAKY_ReLU = 1 << 7
 
 # Matrix map derivative options
-D_SIGMOID = 8
-D_TANH = 9
-D_ReLU = 10
-D_LEAKY_ReLU = 11
+D_SIGMOID = 1 << 8
+D_TANH = 1 << 9
+D_ReLU = 1 << 10
+D_LEAKY_ReLU = 1 << 11
 
 
 # The Matrix class
@@ -184,6 +184,10 @@ def __init__(self, *args, **kwargs):
                             cols = len(tmp) // rows
                             if rows * cols != len(tmp):
                                 raise ValueError("Impossible to make dimensions fit the supplied data. Closest fit is {}x{}".format(rows, cols))
+                        else:
+                            # No rows or columns specified
+                            rows = 1
+                            cols = len(data)
                 else:
                     # Check against a 2d list
                     if rows is not None and cols is not None:

diff --git a/setup.py b/setup.py
@@ -207,7 +207,7 @@ def Wall():
 
 setup(
     name="libpymath",
-    version="0.5.4",
+    version="0.5.5",
     description="A general purpose Python math module",
     long_description=long_description,
     long_description_content_type='text/markdown',