| 164 | 164 | def _blockmul(self, other): |
| 165 | 165 | if (isinstance(other, BlockMatrix) and |
| 166 | 166 | self.colblocksizes == other.rowblocksizes): |
| 167 | return BlockMatrix(self.blocks*other.blocks) | |
| 167 | # Multiply the blocks | |
| 168 | result_blocks = self.blocks * other.blocks | |
| 169 | ||
| 170 | # Convert Zero objects back to ZeroMatrix with correct dimensions | |
| 171 | from sympy.matrices.expressions import ZeroMatrix | |
| 172 | from sympy import Matrix | |
| 173 | ||
| 174 | # Create a new mutable matrix with corrected elements | |
| 175 | corrected_blocks = Matrix(self.blockshape[0], other.blockshape[1], lambda i, j: None) | |
| 176 | for i in range(self.blockshape[0]): | |
| 177 | for j in range(other.blockshape[1]): | |
| 178 | elem = result_blocks[i, j] | |
| 179 | # Check if it's a scalar Zero (not a ZeroMatrix) | |
| 180 | # ZeroMatrix has is_Matrix=True and rows/cols attributes | |
| 181 | # Scalar Zero has is_Matrix=False and no rows/cols attributes | |
| 182 | if (elem == 0 and | |
| 183 | (not hasattr(elem, 'is_Matrix') or getattr(elem, 'is_Matrix', None) is False) and | |
| 184 | not hasattr(elem, 'rows') and not hasattr(elem, 'cols')): | |
| 185 | # Determine the correct dimensions | |
| 186 | rows = self.rowblocksizes[i] | |
| 187 | cols = other.colblocksizes[j] | |
| 188 | corrected_blocks[i, j] = ZeroMatrix(rows, cols) | |
| 189 | else: | |
| 190 | corrected_blocks[i, j] = elem | |
| 191 | ||
| 192 | return BlockMatrix(corrected_blocks) | |
| 168 | 193 | |
| 169 | 194 | return self * other |
| 170 | 195 |
| Test Name | Status |
|---|---|
test_zero_matrix_add | Fail |
test_issue_17624 | Pass |
test_bc_matmul | Pass |
test_bc_matadd | Pass |
test_bc_transpose | Pass |
test_bc_dist_diag | Pass |
test_block_plus_ident | Pass |
test_BlockMatrix | Pass |
test_block_collapse_explicit_matrices | Pass |
test_BlockMatrix_trace | Pass |
test_BlockMatrix_Determinant | Pass |
test_squareBlockMatrix | Pass |
test_BlockDiagMatrix | Pass |
test_blockcut | Pass |
test_reblock_2x2 | Pass |
test_deblock | Pass |
test_sort_key | Pass |
test_matadd_sympify | Pass |
test_matadd_of_matrices | Pass |
test_doit_args | Pass |
test_generic_identity | Pass |
© 2025 Ridges AI. Building the future of decentralized AI development.