Elliott Calc Skin

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

@@ -6,18 +6,45 @@ 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 square(double v){
+
+
+
+        return v * v;
+    }
+
+    public double squareRoot(double v){
+
+        return Math.sqrt(v);
+    }
+
+    public double invertNumber(double v){
+
+        return 1/v;
+    }
+
+    public double exponent(double v, double v1){
+
+        return Math.pow(v,v1);
+
     }
 }

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", "/", "x^2" },
+            { "4", "5", "6", "*", "1/x" },
+            { "1", "2", "3", "-", "SqRt" },
+            { "0", "c", "=", "+", "x^y" }
     };
 
     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, SQUARE, SQUAREROOT, INVERT, EXPONENT}
 
     private Op curOp   = Op.NOOP;
     private Op stackOp = Op.NOOP;
@@ -84,7 +84,7 @@ public class CalcSkin extends Application {
         screen.setStyle("-fx-background-color: aquamarine;");
         screen.setAlignment(Pos.CENTER_RIGHT);
         screen.setEditable(false);
-        screen.textProperty().bind(Bindings.format("%.0f", currentValue));
+        screen.textProperty().bind(Bindings.format("%.3f", currentValue));
         return screen;
     }
 
@@ -127,10 +127,17 @@ public class CalcSkin extends Application {
             case "-": triggerOp.set(Op.SUBTRACT); break;
             case "*": triggerOp.set(Op.MULTIPLY); break;
             case "/": triggerOp.set(Op.DIVIDE);   break;
+            case "x^2": triggerOp.set(Op.SQUARE); break;
+            case "SqRt": triggerOp.set(Op.SQUAREROOT); break;
+            case "1/x": triggerOp.set(Op.INVERT); break;
+            case "x^y": triggerOp.set(Op.EXPONENT); break;
+
         }
         return triggerOp;
     }
 
+    //private void squareRoot(Button button)
+
     private void makeOperandButton(Button button, final ObjectProperty<Op> triggerOp) {
         button.setStyle("-fx-base: lightgray;");
         button.setOnAction(new EventHandler<ActionEvent>() {
@@ -185,10 +192,31 @@ 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 SQUARE:   currentValue.set(calcEngine.square(currentValue.get())); break;
+                    case SQUAREROOT:   currentValue.set(calcEngine.squareRoot(currentValue.get())); break;
+                    case INVERT:   currentValue.set(calcEngine.invertNumber(currentValue.get())); break;
+                    case EXPONENT:   currentValue.set(calcEngine.exponent(previousValue.get(), currentValue.get())); break;
+
                 }
             }
         });
     }
+
+//    private void makeSquareButton(Button button) {
+//        button.setStyle("-fx-base: mistyrose;");
+//        button.setOnAction(new EventHandler<ActionEvent>() {
+//            @Override
+//            public void handle(ActionEvent actionEvent) {
+//                switch (stackOp) {
+//
+//                    case SQUARE:
+//                        currentValue.set(calcEngine.square(currentValue.get()));
+//                }
+//            }
+//        });
+//    }
+
+
 }
 
 

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

@@ -38,4 +38,12 @@ public class CalcEngineTest {
     public void divide() {
         Assert.assertTrue("", (testCalc.divide(10.0, 2.0) == 5.0));
     }
+
+    @Test
+    public void square() {
+
+
+        Assert.assertEquals(25.0, testCalc.square(5.0));
+
+    }
 }