Tibeuleu/FOC_Reduction
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge CZ fork to testing, prepare pipeline for clenup and fix

Browse Source
This commit is contained in:
Thibault Barnouin
2024-07-17 16:44:06 +02:00
parent 2d0d8105be 1c60e875e8
commit d505ef6f8a
3 changed files with 502 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/lib/reduction.py
View File

@@ -217,9 +217,9 @@ def bin_ndarray(ndarray, new_shape, operation="sum"):
elif operation.lower() in ["mean", "average", "avg"]:
ndarray = ndarray.mean(-1 * (i + 1))
else:
row_comp = np.mat(get_row_compressor(ndarray.shape[0], new_shape[0], operation))
col_comp = np.mat(get_column_compressor(ndarray.shape[1], new_shape[1], operation))
ndarray = np.array(row_comp * np.mat(ndarray) * col_comp)
row_comp = np.asmatrix(get_row_compressor(ndarray.shape[0], new_shape[0], operation))
col_comp = np.asmatrix(get_column_compressor(ndarray.shape[1], new_shape[1], operation))
ndarray = np.array(row_comp * np.asmatrix(ndarray) * col_comp)
return ndarray