Skip to content

Use makeZeroMatrix, not copy constructor, for mutable submatrices #4013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Use makeZeroMatrix, not copy constructor, for mutable submatrices #4013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions M2/Macaulay2/e/mutablemat-defs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,8 +518,7 @@ class MutableMat : public MutableMatrix
n_cols() - 1);
return 0;
}
MutableMat* result =
new MutableMat(*this); // zero matrix, over the same ring
MutableMat* result = makeZeroMatrix(rows->len, cols->len);
MatOps::setFromSubmatrix(getMat(), rows, cols, result->getMat());
return result;
}
Expand All @@ -534,8 +533,7 @@ class MutableMat : public MutableMatrix
n_cols() - 1);
return 0;
}
MutableMat* result =
new MutableMat(*this); // zero matrix, over the same ring
MutableMat* result = makeZeroMatrix(n_rows(), cols->len);
MatOps::setFromSubmatrix(getMat(), cols, result->getMat());
return result;
}
Expand Down
5 changes: 5 additions & 0 deletions M2/Macaulay2/tests/normal/mutmat.m2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,8 @@ assert(ring mutableMatrix(ZZ/101, {{1,2,3}}) === ZZ/101)
M = mutableMatrix {{1, 2, 3}, {4, 5, 6}}
assert Equation(target M, ZZ^2)
assert Equation(source M, ZZ^3)

-- issue #997
A = mutableMatrix {{10}}
B = submatrix(A, {0}, {0})
assert(hash A != hash B)
Loading