diff options
Diffstat (limited to 'src/de/fhswf/in')
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe12/BinaryOperator.java | 2 | ||||
| -rw-r--r-- | src/de/fhswf/in/inf/java1/aufgabe12/UpnMain.java | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/de/fhswf/in/inf/java1/aufgabe12/BinaryOperator.java b/src/de/fhswf/in/inf/java1/aufgabe12/BinaryOperator.java index 50ac855..5d522cc 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe12/BinaryOperator.java +++ b/src/de/fhswf/in/inf/java1/aufgabe12/BinaryOperator.java @@ -29,7 +29,7 @@ public abstract class BinaryOperator implements Operator if (stack.size() < 2) { throw new IllegalArgumentException( - "Unary operation requires one operand."); + "Binary operation requires two operand."); } double d2 = stack.pop(); diff --git a/src/de/fhswf/in/inf/java1/aufgabe12/UpnMain.java b/src/de/fhswf/in/inf/java1/aufgabe12/UpnMain.java index 9d056a6..30c3204 100644 --- a/src/de/fhswf/in/inf/java1/aufgabe12/UpnMain.java +++ b/src/de/fhswf/in/inf/java1/aufgabe12/UpnMain.java @@ -30,12 +30,19 @@ public final class UpnMain { UPN test = new UPN(); - - test.calculate("5 3 - 2 * 10 9 - / 10 6 - 8 6 - 2 * / -"); - System.out.println(test.getResult()); - test.calculate("-3.1415 abs"); - System.out.println(test.getResult()); + try + { + test.calculate("5 3 - 2 * 10 9 - / 10 6 - 8 6 - 2 * / -"); + System.out.println(test.getResult()); + test.calculate("-3.1415 abs cos"); + System.out.println(test.getResult()); + } + catch (IllegalArgumentException e) + { + System.err + .println("UPN string encountered error: " + e.getMessage()); + } } } |