New Calc

src/main/java/rocks/zipcode/calcskin/CalcEngine.java

@@ -6,18 +6,55 @@ public class CalcEngine {
     }
 
     public double add(double v, double v1) {
-        return Double.NaN;
+        return v + v1;
     }
 
     public double subtract(double v, double v1) {
-        return Double.NaN;
+        return v - v1;
     }
 
     public double multiply(double v, double v1) {
-        return Double.NaN;
+        return v * v1;
     }
 
     public double divide(double v, double v1) {
-        return Double.NaN;
+        return v / v1;
+    }
+
+    public double exponent(double v, double v1 ) {
+        return Math.pow(v, v1);
+    }
+
+
+    public double squareRoot(double v) {
+        double answer = Math.sqrt(v);
+        return Math.toRadians(answer);
+    }
+
+
+    public double squared(double v) {
+        return Math.pow(v, 2);
+    }
+
+    public double inverse(double v) {
+        return (1 / v);
+    }
+
+    public double sin(double v) {
+        double answer = Math.toDegrees(Math.sin(v));
+
+        return Math.toRadians(answer);
+    }
+
+    public double cos(double v) {
+
+        double answer = Math.toDegrees(Math.cos(v));
+        return Math.toRadians(answer);
+    }
+
+    public double tan(double v) {
+
+        double answer = Math.toDegrees(Math.sin(v));
+        return Math.toRadians(answer);
     }
 }

src/main/java/rocks/zipcode/calcskin/CalcSkin.java

@@ -24,10 +24,10 @@ public class CalcSkin extends Application {
         launch(args);
     }
     private static final String[][] template = {
-            { "7", "8", "9", "/" },
-            { "4", "5", "6", "*" },
-            { "1", "2", "3", "-" },
-            { "0", "c", "=", "+" }
+            { "7", "8", "9", "/", "^", "sin"},
+            { "4", "5", "6", "*", "√", "cos" },
+            { "1", "2", "3", "-", "x²", "tan" },
+            { "0", "c", "=", "+", "1/x" }
     };
 
     private final Map<String, Button> accelerators = new HashMap<>();
@@ -36,7 +36,7 @@ public class CalcSkin extends Application {
     private DoubleProperty currentValue = new SimpleDoubleProperty();
     private CalcEngine calcEngine = new CalcEngine();
 
-    private enum Op { NOOP, ADD, SUBTRACT, MULTIPLY, DIVIDE }
+    private enum Op { NOOP, ADD, SUBTRACT, MULTIPLY, DIVIDE, EXPONENT, SQUAREROOT, SQUARED, INVERSE, SINE, COSINE, TANGENT }
 
     private Op curOp   = Op.NOOP;
     private Op stackOp = Op.NOOP;
@@ -60,7 +60,7 @@ public class CalcSkin extends Application {
     private VBox createLayout(TextField screen, TilePane buttons) {
         final VBox layout = new VBox(20);
         layout.setAlignment(Pos.CENTER);
-        layout.setStyle("-fx-background-color: silver; -fx-padding: 20; -fx-font-size: 20;");
+        layout.setStyle("-fx-background-color: #4e4e4e; -fx-padding: 20; -fx-font-size: 20;");
         layout.getChildren().setAll(screen, buttons);
         handleAccelerators(layout);
         screen.prefWidthProperty().bind(buttons.widthProperty());
@@ -81,10 +81,10 @@ public class CalcSkin extends Application {
 
     private TextField createScreen() {
         final TextField screen = new TextField();
-        screen.setStyle("-fx-background-color: aquamarine;");
+        screen.setStyle("-fx-background-color: #faffd3;");
         screen.setAlignment(Pos.CENTER_RIGHT);
         screen.setEditable(false);
-        screen.textProperty().bind(Bindings.format("%.0f", currentValue));
+        screen.textProperty().bind(Bindings.format("%.2f", currentValue));
         return screen;
     }
 
@@ -114,7 +114,19 @@ public class CalcSkin extends Application {
                 makeClearButton(button);
             } else if ("=".equals(s)) {
                 makeEqualsButton(button);
-            }
+            } else if ("√".equals(s)) {
+               squareRootButton(button);
+            } else if ("x²".equals(s)) {
+                squaredButton(button);
+            } else if ("1/x".equals(s)) {
+                inverseButton(button);
+            } else if ("sin".equals(s)) {
+                sinButton(button);
+            } else if ("cos".equals(s)) {
+                cosButton(button);
+            } else if ("tan".equals(s)) {
+                tanButton(button);
+        }
         }
 
         return button;
@@ -127,6 +139,13 @@ public class CalcSkin extends Application {
             case "-": triggerOp.set(Op.SUBTRACT); break;
             case "*": triggerOp.set(Op.MULTIPLY); break;
             case "/": triggerOp.set(Op.DIVIDE);   break;
+            case "^": triggerOp.set(Op.EXPONENT); break;
+//            case "√": triggerOp.set(Op.SQUAREROOT); break;
+//            case "x²": triggerOp.set(Op.SQUARED);   break;
+//            case "1/x": triggerOp.set(Op.INVERSE);  break;
+//            case "sin": triggerOp.set(Op.SINE); break;
+//            case "cos": triggerOp.set(Op.COSINE);   break;
+//            case "tan": triggerOp.set(Op.TANGENT);  break;
         }
         return triggerOp;
     }
@@ -185,10 +204,80 @@ public class CalcSkin extends Application {
                     case SUBTRACT: currentValue.set(calcEngine.subtract(previousValue.get(), currentValue.get())); break;
                     case MULTIPLY: currentValue.set(calcEngine.multiply(previousValue.get(), currentValue.get())); break;
                     case DIVIDE:   currentValue.set(calcEngine.divide(previousValue.get(), currentValue.get())); break;
+                    case EXPONENT:   currentValue.set(calcEngine.exponent(previousValue.get(), currentValue.get())); break;
                 }
             }
         });
     }
+
+        private void squaredButton(Button button) {
+            button.setStyle("-fx-base: ghostwhite;");
+            button.setOnAction(new EventHandler<ActionEvent>() {
+                @Override
+                public void handle(ActionEvent actionEvent) {
+                    SQUARED:
+                    currentValue.set(calcEngine.squared(currentValue.get()));
+
+                }
+            });
+        }
+
+        private void squareRootButton(Button button) {
+            button.setStyle("-fx-base: ghostwhite;");
+            button.setOnAction(new EventHandler<ActionEvent>() {
+                @Override
+                public void handle(ActionEvent actionEvent) {
+                    SQUAREROOT:
+                    currentValue.set(calcEngine.squareRoot(currentValue.get()));
+
+                }
+            });
+        }
+
+            private void inverseButton(Button button) {
+                button.setStyle("-fx-base: ghostwhite;");
+                button.setOnAction(new EventHandler<ActionEvent>() {
+                    @Override
+                    public void handle(ActionEvent actionEvent) {
+                        INVERSE: currentValue.set(calcEngine.inverse(currentValue.get()));
+
+                    }
+                });
+            }
+
+            private void sinButton(Button button) {
+        button.setStyle("-fx-base: ghostwhite;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                SINE: currentValue.set(calcEngine.sin(currentValue.get()));
+
+            }
+        });
+    }
+
+        private void cosButton(Button button) {
+            button.setStyle("-fx-base: ghostwhite;");
+            button.setOnAction(new EventHandler<ActionEvent>() {
+                @Override
+                public void handle(ActionEvent actionEvent) {
+                    COSINE: currentValue.set(calcEngine.cos(currentValue.get()));
+
+                }
+            });
+        }
+
+        private void tanButton(Button button) {
+            button.setStyle("-fx-base: ghostwhite;");
+            button.setOnAction(new EventHandler<ActionEvent>() {
+                @Override
+                public void handle(ActionEvent actionEvent) {
+                    TANGENT: currentValue.set(calcEngine.tan(currentValue.get()));
+
+                }
+            });
+        }
+
 }
 
 

src/test/java/rocks/zipcode/calcskin/CalcEngineTest.java

@@ -38,4 +38,23 @@ public class CalcEngineTest {
     public void divide() {
         Assert.assertTrue("", (testCalc.divide(10.0, 2.0) == 5.0));
     }
+
+    @Test
+    public void exponent() { Assert.assertTrue("", (testCalc.exponent(3.0, 3.0) == 27.0)); }
+
+
+    @Test
+    public void squared() { Assert.assertTrue("", (testCalc.squared(10.0) == 100.0));
+    }
+
+    @Test
+    public void squareRoot() { Assert.assertTrue("", (testCalc.squareRoot(4.0) == 2.0));
+    }
+
+    @Test
+    public void inverse() { Assert.assertTrue("", (testCalc.inverse(2.0) == .5));
+    }
+
+    @Test
+    public void sin() { Assert.assertTrue("", (testCalc.sin(2.0) == .03)); }
 }