Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions src/simplejavacalculator/Calculator.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ private Double calculateBiImpl() {
return num1 * num2;
}
if (mode.equals(BiOperatorModes.divide)) {
if (num2 == 0){
return NaN;
}
return num1 / num2;
}
if (mode.equals(BiOperatorModes.xpowerofy)) {
Expand Down Expand Up @@ -92,6 +95,9 @@ public Double calculateMono(MonoOperatorModes newMode, Double num) {
return Math.sqrt(num);
}
if (newMode.equals(MonoOperatorModes.oneDividedBy)) {
if(num == 0) {
return NaN; // This line of code handles division by zero to avoid infinity
}
return 1 / num;
}
if (newMode.equals(MonoOperatorModes.cos)) {
Expand Down
10 changes: 8 additions & 2 deletions src/simplejavacalculator/UI.java
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,14 @@ public void actionPerformed(ActionEvent e) {
if (source == butabs)
writer(calc.calculateMono(Calculator.MonoOperatorModes.abs, reader()));

if (source == butEqual)
writer(calc.calculateEqual(reader()));
if (source == butEqual){
Double result = calc.calculateEqual(reader());
if (Double.isNaN(result)){ // it checks for math errors (like dividing by 0) and if there is one, it returns
text.setText("Invalid Operation"); // "invalid operation". If not, it returns the result
} else {
writer(result);
}
}

if (source == butCancel)
writer(calc.reset());
Expand Down