Skip to content
This repository has been archived by the owner on Mar 29, 2023. It is now read-only.

Fix issue #98: minor add some condition statements. #105

Merged
merged 1 commit into from
May 22, 2021
Merged

Fix issue #98: minor add some condition statements. #105

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
12 changes: 12 additions & 0 deletions app/src/main/java/com/duy/ncalc/matrix/FragmentMatrixInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,22 @@ public void doEval(MatrixOpt opt) {
String matrixA = getMatrixA();
String matrixB = getMatrixB();
if (opt == MatrixOpt.ADD) {
if (currentColumnA != currentColumnB){
throw new IllegalAccessException("inconsistent dimension");
}
if (currentRowA != currentRowB){
throw new IllegalAccessException("inconsistent dimension");
}
expr = matrixA + " + " + matrixB;
} else if (opt == MatrixOpt.MUL) {
expr = matrixA + " . " + matrixB;
} else {
if (currentColumnA != currentColumnB){
throw new IllegalAccessException("inconsistent dimension");
}
if (currentRowA != currentRowB){
throw new IllegalAccessException("inconsistent dimension");
}
expr = matrixA + " - " + matrixB;
}
if (listener != null) {
Expand Down