adding branches

.gitignore

@@ -149,6 +149,7 @@ fabric.properties
 .project
 .classpath
 .settings
+.DS_Store
 
 
 #maven build target

pom.xml

@@ -7,6 +7,14 @@
     <groupId>com.zipcodewilmington</groupId>
     <artifactId>scientific_calculator</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
 
 </project>

src/main/java/com/zipcodewilmington/scientificcalculator/Calculator.java

@@ -0,0 +1,70 @@
+package com.zipcodewilmington.scientificcalculator;
+import java.util.Scanner;
+
+public class Calculator {
+
+    public Double operator;
+    public Double firstOption;
+    public Double secondOption;
+    public Double ans;
+    public Double history;
+    public Double calcChoice;
+
+    public Calculator() {
+
+    }
+
+    public Double setCalcChoice(Double choice) {
+        this.calcChoice = choice;
+        return choice;
+    }
+
+    public Double getCalcChoice() {
+        return this.calcChoice;
+    }
+
+
+    public Double setAns(Double ans) {
+        this.ans = ans;
+        return ans;
+    }
+
+    public Double getAns() {
+        return this.ans;
+    }
+
+    public Double getCurrentValue(Double currentValue) {
+        return this.history;
+    }
+
+    public Double getInputFromUser() {
+        Scanner scanner = new Scanner(System.in);
+        Double userInput = scanner.nextDouble();
+        return userInput;
+    }
+
+    public void setFirstInput(Double input){
+        firstOption = input;
+    }
+
+    public void setSecondOptionInput(Double input){
+       secondOption = input;
+    }
+
+    public void setOperator(Double input){
+        operator = input;
+    }
+
+    public Double chooseCalc() {
+        return null;
+    }
+
+    public Double getFirstNumber() {
+        return firstOption;
+    }
+
+    public Double getSecondNumber() {
+        return secondOption;
+    }
+
+}

src/main/java/com/zipcodewilmington/scientificcalculator/Console.java

@@ -22,11 +22,11 @@ public static String getStringInput(String prompt) {
         return userInput;
     }
 
-    public static Integer getIntegerInput(String prompt) {
+    /*public static Integer getIntegerInput(String prompt) {
         return null;
     }
 
     public static Double getDoubleInput(String prompt) {
         return null;
-    }
-}
+    }*/
+}

src/main/java/com/zipcodewilmington/scientificcalculator/CoreFunctions.java

@@ -0,0 +1,61 @@
+package com.zipcodewilmington.scientificcalculator;
+
+import java.lang.*;
+import com.sun.tools.javac.util.StringUtils;
+
+public class CoreFunctions {
+
+    Double display;
+
+    //This is a constructor for CLass
+    public CoreFunctions() {
+
+    }
+
+    /*public double displayScreen() {
+        display = 0.0;
+        return display;
+    }*/
+
+    public boolean IsANumber(Double input) {
+        return true;
+    }
+
+    /*public class convertToDouble {
+        private String number1;
+        double convertedNumber = Double.parseDouble(number1);
+    }*/
+    public Double Add(Double a, Double b) {
+        Double sum = a + b;
+        return sum;
+    }
+
+    public Double Subtract(Double a, Double b) {
+        Double sum = a - b;
+        return sum;
+    }
+
+    public Double Multiply(Double a, Double b) {
+        Double sum = a * b;
+        return sum;
+    }
+
+    public Double Divide(Double a, Double b) {
+        Double sum = a / b;
+        return sum;
+    }
+
+    public Double SquareRoot(Double a) {
+        Double sum = Math.sqrt(a);
+        return sum;
+    }
+
+    public Double Square(Double a, Double b) {
+        Double sum = a - b;
+        return sum;
+    }
+
+    public Double Inverse() {
+        return null;
+    }
+}