| 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 | # Perform the block multiplication | |
| 168 | result_blocks = self.blocks * other.blocks | |
| 169 | ||
| 170 | # Convert any scalar Zero objects back to ZeroMatrix with correct dimensions | |
| 171 | from sympy.core.numbers import Zero | |
| 172 | from sympy.matrices.expressions.matexpr import ZeroMatrix | |
| 173 | ||
| 174 | # Create a new matrix with properly typed blocks | |
| 175 | new_blocks_data = [] | |
| 176 | for i in range(result_blocks.shape[0]): | |
| 177 | row = [] | |
| 178 | for j in range(result_blocks.shape[1]): | |
| 179 | block = result_blocks[i, j] | |
| 180 | # If we have a scalar Zero, convert it to ZeroMatrix with correct dimensions | |
| 181 | if isinstance(block, Zero): | |
| 182 | # Determine dimensions: rows from self's ith row, cols from other's jth column | |
| 183 | rows = self.blocks[i, 0].rows if hasattr(self.blocks[i, 0], 'rows') else self.blocks[i, 0].shape[0] | |
| 184 | cols = other.blocks[0, j].cols if hasattr(other.blocks[0, j], 'cols') else other.blocks[0, j].shape[1] | |
| 185 | row.append(ZeroMatrix(rows, cols)) | |
| 186 | else: | |
| 187 | row.append(block) | |
| 188 | new_blocks_data.append(row) | |
| 189 | ||
| 190 | from sympy.matrices.immutable import ImmutableDenseMatrix | |
| 191 | new_blocks = ImmutableDenseMatrix(new_blocks_data) | |
| 192 | return BlockMatrix(new_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.