radioactiveshrimp 0.1.0__cp39-abi3-manylinux_2_28_x86_64.whl → 0.1.1__cp39-abi3-manylinux_2_28_x86_64.whl

radioactiveshrimp/matrix/__init.py__

@@ -0,0 +1,5 @@
+"""
+Matrix subpackage containing rref function.
+"""
+from .elementary import rref, rowswap, rowscale, rowreplacement
+__all__=['rref, rowswap, rowscale,rowreplacement']

radioactiveshrimp/matrix/elementary.py

@@ -0,0 +1,201 @@
+import torch
+import math
+
+def rowswap(M, idxSourceRow, idxTargetRow):
+    """
+    Swap rows in a matrix.
+    
+    Args:
+        M (matrix/pytorch tensor): Matrix of values
+        idxSourceRow (int): Index value of one of the rows to be swapped (indexing from 1)
+        idxTargetRow (int): Index value of one of the rows to be swapped (indexing from 1)
+
+    Returns:
+        mat: Matrix with the indicated rows swapped
+    
+    Example:
+        >>> rowswap(torch.tensor([[1,2,3],[4,5,6]]), 1,2)
+        tensor([[4,5,6],[1,2,3]])
+    """
+    # print("DOING ROW SWAP")
+    mat = M.clone()
+    # print('swap: ', idxSourceRow, idxTargetRow)
+    temptarget = M[idxTargetRow-1, :]
+    mat[idxTargetRow-1] = M[idxSourceRow-1]
+    mat[idxSourceRow-1] = temptarget
+    return mat
+
+def rowscale(M, idxRow, scaleFactor):
+    """
+    Scale one row of matrix by scalar value.
+    
+    Args:
+        M (matrix/pytorch tensor): Matrix of values
+        idxRow (int): Index (starting from 1) of row to be scaled
+        scaleFactor (number int or float): Value to scale each element in the row by 
+
+    Returns:
+        mat: Matrix with the indicated row scaled
+
+    Example:
+        >>> rowscale(torch.tensor([[1,2,3],[4,5,6]]), 1,5)
+        tensor([[5,10,15],[4,5,6]])
+    """
+    # print('DOING ROW SCALE')
+    M[idxRow-1] = M[idxRow-1, :]*scaleFactor
+    return M
+
+def rowreplacement(M, idxFirstRow, idxSecondRow, scaleJ, scaleK):
+    """
+    Replace row in matrix by scaling and adding to other row.
+
+    Args:
+        M (matrix/pytorch tensor): Matrix of values
+        idxFirstRow (int): Index of the row to be updated
+        idxSecondRow (int): Index of the row to be added into the updated row
+        scaleJ (number int or float): Scale factor used for the firstRow elements
+        scaleK (number int or float): Scale factor used for the secondRow elements
+
+    Returns:
+        mat: Matrix with the indicated row scaled and summed with the scale of the second row
+
+    Example:
+        >>> rowreplacement(torch.tensor([[1,2,3],[4,5,6]]), 1,2,2,1)
+        tensor([[6,9,12],[4,5,6]])
+    """
+    # print('DOING ROW REPLACE')
+    # print(M, idxFirstRow, idxSecondRow, scaleJ, scaleK)
+    mat = M.clone()
+    firstScaled = rowscale(mat, idxFirstRow, scaleJ)[idxFirstRow-1]
+    secondScaled = rowscale(mat, idxSecondRow, scaleK)[idxSecondRow-1]
+    firstScaled = firstScaled + secondScaled
+    M[idxFirstRow-1] = firstScaled
+    return M
+
+def rref(M):
+    """
+    Calculate reduced row echelon form of a matrix
+
+    Args:
+        M (matrix/pytorch tensor): Matrix of values
+
+    Returns:
+        mat: Matrix in rref
+    
+    Example:
+        >>> rref(torch.tensor([[1,2,3],[4,5,6]]))
+        tensor([[ 1,  0, -1],[ 0,  1,  2]])
+    """
+    mat = M.clone()
+    pivotFound = False
+    totalRows= mat.shape[0]
+    # print(totalRows)
+    manualRowidx = 0
+    for colidx in range(len(mat[0])):
+        if manualRowidx==totalRows:
+            break
+        for rowidx in range(manualRowidx, totalRows):
+            # print(rowidx, colidx)
+            # print(mat[rowidx, colidx].item())
+            if mat[rowidx, colidx].item() == 1 or mat[rowidx, colidx].item() == 1.0 :
+                if rowidx>manualRowidx:
+                    mat = rowswap(mat, rowidx+1, manualRowidx+1)
+                    # print(mat)
+                    rowidx = manualRowidx
+                pivot = [rowidx,colidx]
+                # mat = reduceCol(mat, pivot)
+                pivotFound = True
+                break
+        if pivotFound == False: #no value in column = 1
+            if mat[manualRowidx, colidx].item()==0:
+                for rowidx in range(manualRowidx, totalRows):
+                    if mat[rowidx,colidx].item() != 0:
+                        mat = rowswap(mat, manualRowidx+1, rowidx+1)
+                        # print(mat)
+                        pivotFound=True
+                        pivot = [manualRowidx, colidx]
+                        break
+            else: #current pivot item not 0
+                pivotFound = True
+                pivot = [manualRowidx, colidx]
+        if pivotFound ==True:
+            mat = reduceCol(mat, pivot)
+            manualRowidx+=1
+            pivotFound = False
+        # print('*'*50)
+        # print(mat)
+    # print()
+    return mat
+
+
+
+def reduceCol(M, pivot):
+    """
+    Reduces the column of a matrix based on pivot value to acheive rref.
+
+    Args:
+        M (matrix/pytorch tensor): Matrix of values
+        pivot ([int, int]): List (len=2) of integer values representing the row, column index for the current pivot
+
+    Returns:
+        mat: Matrix with the column of focus reduced
+
+    Example:
+        >>> reduceCol(torch.tensor([[1,2],[3,4]]), [1,1])
+        tensor([[1,0],[1,0]])
+    """
+    # print('doing reduction')
+    pivotRow = pivot[0]
+    pivotCol = pivot[1]
+
+    # if M[pivotRow,pivotCol].item() == 0:
+    #     pivotCol+=1
+
+    if M[pivotRow, pivotCol].item() != 1:
+        try:
+            scale = 1/M[pivotRow, pivotCol].item()
+            # print(scale)
+            M = rowscale(M, pivotRow+1, scale)
+        except:
+            pass
+
+
+    for rowidx in range(len(M)):
+        if rowidx != pivotRow:
+            # print(M[rowidx, pivotCol].item())
+            if M[rowidx,pivotCol].item() ==0:
+                pass
+            else:
+                fractionCheck, _ = math.modf(M[rowidx, pivotCol].item())
+                if fractionCheck != 0: #check if its a fraction 
+                    scale = M[rowidx, pivotCol].item()
+                    # print(scale)
+                    M = rowreplacement(M, rowidx+1, pivotRow+1, 1, scale*-1)
+                else:
+                    scale = M[rowidx, pivotCol].item()/1
+                    # print(M, rowidx, pivotRow, 1, scale*-1)
+                    M = rowreplacement(M, rowidx+1, pivotRow+1, 1, scale*-1)
+    return M
+
+
+# Matrix = torch.tensor([[0,1,1],[1,1,6],[2,1,8]], dtype=torch.float16)
+
+# print(rowswap(Matrix, 4,1))
+# print(rowscale(Matrix, 1, 10))
+# print(rowreplacement(Matrix, 1,6,16,-1))
+
+
+
+# Matrix = torch.tensor([[1,3,0,0,3], [0,0,1,0,9], [0,0,0,1,-4]], dtype=torch.float16)
+# print(Matrix)
+# M = rowswap(Matrix, 1,2)
+# print(M)
+# M = rowscale(M, 1,(1/3))
+# print(M)
+# M = rowreplacement(M, 3, 1, 1, -3)
+# print(M)
+
+# Matrix = torch.tensor([[1,2,3],[4,5,6],[7,8,9]], dtype=torch.float16)
+
+
+# print(rref(Matrix))

{radioactiveshrimp-0.1.0.dist-info → radioactiveshrimp-0.1.1.dist-info}/METADATA

@@ -1,6 +1,8 @@
 Metadata-Version: 2.4
 Name: radioactiveshrimp
-Version: 0.1.0
+Version: 0.1.1
+Requires-Dist: numpy>=2.3.3
+Requires-Dist: torch>=2.8.0
 Requires-Dist: twine>=6.1.0
 Summary: Add your description here
 Author-email: radioactiveshrimp <radioactiveshrimpmail@gmail.com>

{radioactiveshrimp-0.1.0.dist-info → radioactiveshrimp-0.1.1.dist-info}/RECORD

@@ -1,9 +1,11 @@
-radioactiveshrimp-0.1.0.dist-info/METADATA,sha256=hBcyOB8eYNUHqcmuxiZE3ymZbJTnA-H15M7MmDhDaEs,322
-radioactiveshrimp-0.1.0.dist-info/WHEEL,sha256=rXa1hNKJPd-J1se02jkvuZn4v_WM-W9q2R8LeAdqQiM,97
+radioactiveshrimp-0.1.1.dist-info/METADATA,sha256=4miZ8FtVUImI28hoh1lyXSbo-IuHwLBUmaK838D378Y,378
+radioactiveshrimp-0.1.1.dist-info/WHEEL,sha256=VCoUqQjnl5wExkC-2PG3I2s7-FBXYum-vf1jh8qiYg8,97
 radioactiveshrimp/__init__.py,sha256=QY4ait-Lo2WQdyx7MU8N6a1v2ZYyAmYRqzYqdNbiavI,101
 radioactiveshrimp/_core.abi3.so,sha256=3IMwsP7UrgNWdKdw2Pl11_VUQF8NqPy1xyyPuzkREdA,489672
 radioactiveshrimp/_core.pyi,sha256=b6oJaUXUzEzqUE5rpqefV06hl8o_JCU8pgKgIIzQgmc,33
 radioactiveshrimp/differential/__init.py__,sha256=jOhQKr6xM_7TVUt0GWRddtkgBvNn5I873WZcArT-GtE,101
 radioactiveshrimp/differential/discrete.py,sha256=9-w6Avz4MZfu8gFhJU8kTvryn9oT2xS1TvvYQ_8pmPU,1371
+radioactiveshrimp/matrix/__init.py__,sha256=EoerrXlfmd2lI9grb3jxqIhHn-bzLtYhRKyxI0RVgaE,166
+radioactiveshrimp/matrix/elementary.py,sha256=zPiBG24F5zIncrrVWbiXEp1oFnHw2xNKy5quF0GBOuc,6333
 radioactiveshrimp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-radioactiveshrimp-0.1.0.dist-info/RECORD,,
+radioactiveshrimp-0.1.1.dist-info/RECORD,,

{radioactiveshrimp-0.1.0.dist-info → radioactiveshrimp-0.1.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.9.3)
+Generator: maturin (1.9.4)
 Root-Is-Purelib: false
 Tag: cp39-abi3-linux_x86_64