From 1510476574773e6c346824aa153adfcc34d7ce56 Mon Sep 17 00:00:00 2001
From: annafu1 <104175541+annafu1@users.noreply.github.com>
Date: Fri, 28 Oct 2022 19:43:29 -0400
Subject: [PATCH 1/8] testing this if it works

---
 .../com/zipcodewilmington/scientificcalculator/Console.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
index 83f0e97..f4724c0 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
@@ -30,3 +30,5 @@ public static Double getDoubleInput(String prompt) {
         return null;
     }
 }
+
+test 
\ No newline at end of file

From 13a224f8aacbb893f049990b3773f8d861a53dcc Mon Sep 17 00:00:00 2001
From: Prathibha <prathibha@Zipcoders-MacBook-Pro-8.local>
Date: Sat, 29 Oct 2022 08:23:22 -0400
Subject: [PATCH 2/8] I have created switch statements for math options

---
 .../scientificcalculator/Console.java         | 10 +++++-
 .../scientificcalculator/MainApplication.java | 32 +++++++++++++++----
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
index 83f0e97..7147360 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
@@ -23,10 +23,18 @@ public static String getStringInput(String prompt) {
     }
 
     public static Integer getIntegerInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        int userInput = scanner.nextInt();
+        return userInput;
     }
 
     public static Double getDoubleInput(String prompt) {
         return null;
     }
+    public static int addInt(int i,int j)
+    {
+
+        return i+j;
+    }
 }
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
index 5f42132..334cc19 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
@@ -6,12 +6,32 @@
 public class MainApplication {
     public static void main(String[] args) {
         Console.println("Welcome to my calculator!");
-        String s = Console.getStringInput("Enter a string");
-        Integer i = Console.getIntegerInput("Enter an integer");
-        Double d = Console.getDoubleInput("Enter a double.");
+        Console.println("Select an option");
+        int option=Console.getIntegerInput("Enter an integer");
+        //String s = Console.getStringInput("Enter a string");
+        String selected;
+        switch (option)
+        {
+            case 0:selected="Addition of integers";
+                break;
+            case 1:selected="Substration of integers";
+                break;
+            case 2:selected="Multiplication of integers";
+                break;
+            case 3:selected="Division of integers";
+                break;
 
-        Console.println("The user input %s as a string", s);
-        Console.println("The user input %s as a integer", i);
-        Console.println("The user input %s as a d", d);
+        }
+        if(option==0) {
+            int i = Console.getIntegerInput("Enter an integer");
+            int i2 = Console.getIntegerInput("Enter an integer");
+            //Double d = Console.getDoubleInput("Enter a double.");
+            int result = Console.addInt(i, i2);
+            //Console.println("The user input %s as a string", s);
+            Console.println("The result is " + result);
+        }
+        ;
+
+        //Console.println("The user input %s as a d", d);
     }
 }

From 2d8f8f5e19877fb9dc7e34355263026eeb7f92b1 Mon Sep 17 00:00:00 2001
From: John <john@Zipcoders-MacBook-Pro-46.local>
Date: Sat, 29 Oct 2022 09:18:50 -0400
Subject: [PATCH 3/8] I have addedin subtraction multiplication and division
 methods

---
 .../scientificcalculator/Console.java         | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
index 7147360..cad827b 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
@@ -32,9 +32,26 @@ public static Integer getIntegerInput(String prompt) {
     public static Double getDoubleInput(String prompt) {
         return null;
     }
-    public static int addInt(int i,int j)
-    {
 
-        return i+j;
+    public static int addInt(int i, int j) {
+
+        return i + j;
+    }
+
+    public static int subtractionInt(int i, int j) {
+
+        return i - j;
+
+
     }
-}
+    public static int multiplicationnInt(int i, int j) {
+
+        return i * j;}
+
+
+    public static int divisionInt(int i, int j) {
+
+        return i / j;}
+    }
+
+}
\ No newline at end of file

From d0fd1e001119474f9acf6d8a50cd442ee9c2d2d7 Mon Sep 17 00:00:00 2001
From: annafu1 <104175541+annafu1@users.noreply.github.com>
Date: Sat, 29 Oct 2022 09:34:48 -0400
Subject: [PATCH 4/8] I have added in square, square roots, exponents, and
 inverse methods. I have added in switch cases too

---
 .../scientificcalculator/Console.java         | 25 ++++++++++++++++---
 .../scientificcalculator/MainApplication.java | 12 ++++++++-
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
index cad827b..2f45c27 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
@@ -44,14 +44,31 @@ public static int subtractionInt(int i, int j) {
 
 
     }
-    public static int multiplicationnInt(int i, int j) {
-
-        return i * j;}
+    public static int multiplicationInt(int i, int j) {
 
+        return i * j;
+    }
 
     public static int divisionInt(int i, int j) {
 
-        return i / j;}
+        return i / j;
+    }
+    public static int squareInt(int i) {
+
+        return i * i;
+    }
+    public static double squareRootInt(int i) {
+
+        return Math.sqrt(i);
     }
+    public static double exponentsInt(int i, int j) {
+
+        return Math.pow(i,j);
+    }
+    public static int inverseInt(int i) {
+
+        return (1 / i);
+    }
+
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
index 334cc19..f70fab6 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
@@ -14,12 +14,22 @@ public static void main(String[] args) {
         {
             case 0:selected="Addition of integers";
                 break;
-            case 1:selected="Substration of integers";
+            case 1:selected="Subtraction of integers";
                 break;
             case 2:selected="Multiplication of integers";
                 break;
             case 3:selected="Division of integers";
                 break;
+            case 4:selected="Square of integers";
+                break;
+            case 5:selected="Square root of integers";
+                break;
+            case 6:selected="Exponents of integers";
+                break;
+            case 7:selected="Inverse of integers";
+                break;
+
+
 
         }
         if(option==0) {

From d3c5535ca99b39fb2f3ce890f9c82b8416d94d21 Mon Sep 17 00:00:00 2001
From: Prathibha <prathibha@Zipcoders-MacBook-Pro-8.local>
Date: Sat, 29 Oct 2022 11:37:55 -0400
Subject: [PATCH 5/8] I have changed to double and added in test to check
 answer

---
 pom.xml                                       | 12 ++++++
 .../scientificcalculator/Console.java         | 30 +++++++------
 .../scientificcalculator/MainApplication.java | 42 ++++++++++---------
 .../TestMainApplication.java                  | 14 ++++++-
 4 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index e7cb4f6..c4da364 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,18 @@
     <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>
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
 
 
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
index 2f45c27..366715f 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
@@ -15,57 +15,61 @@ public static void println(String output, Object... args) {
         print(output + "\n", args);
     }
 
-    public static String getStringInput(String prompt) {
+    public static int getIntegerInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
         println(prompt);
-        String userInput = scanner.nextLine();
+        int  userInput = scanner.nextInt();
         return userInput;
     }
 
-    public static Integer getIntegerInput(String prompt) {
+    public static String getStringInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
         println(prompt);
-        int userInput = scanner.nextInt();
+        String userInput = scanner.nextLine();
         return userInput;
     }
 
     public static Double getDoubleInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        double  userInput = scanner.nextDouble();
+        return userInput;
+
     }
 
-    public static int addInt(int i, int j) {
+    public static double add(double i, double j) {
 
         return i + j;
     }
 
-    public static int subtractionInt(int i, int j) {
+    public static double subtraction(double i, double j) {
 
         return i - j;
 
 
     }
-    public static int multiplicationInt(int i, int j) {
+    public static double multiplication(double i, double j) {
 
         return i * j;
     }
 
-    public static int divisionInt(int i, int j) {
+    public static double division(double i, double j) {
 
         return i / j;
     }
-    public static int squareInt(int i) {
+    public static double square(double i) {
 
         return i * i;
     }
-    public static double squareRootInt(int i) {
+    public static double squareRoot(double i) {
 
         return Math.sqrt(i);
     }
-    public static double exponentsInt(int i, int j) {
+    public static double exponents(double i, double j) {
 
         return Math.pow(i,j);
     }
-    public static int inverseInt(int i) {
+    public static double inverse(double i) {
 
         return (1 / i);
     }
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
index f70fab6..38d24b4 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
@@ -6,41 +6,45 @@
 public class MainApplication {
     public static void main(String[] args) {
         Console.println("Welcome to my calculator!");
-        Console.println("Select an option");
-        int option=Console.getIntegerInput("Enter an integer");
+        System.out.println("1.Addition of integers");
+        System.out.println("2. Substraction");
+        System.out.println("3.Multiplication");
+        System.out.println("4.Division");
+        System.out.println("5.Square");
+        int option=Console.getIntegerInput("Enter an option");
+
+
+        Double n1=Console.getDoubleInput("Enter an integer");
         //String s = Console.getStringInput("Enter a string");
         String selected;
+        Double n2;
         switch (option)
         {
-            case 0:selected="Addition of integers";
+            case 1:n2=Console.getDoubleInput("Enter an integer");
+                   System.out.println(Console.add(n1,n2));
                 break;
-            case 1:selected="Subtraction of integers";
+            case 2:n2=Console.getDoubleInput(selected="Subtraction of integers");
+                System.out.println(Console.subtraction(n1,n2));
                 break;
-            case 2:selected="Multiplication of integers";
+            case 3:n2=Console.getDoubleInput("Multiplication of integers");
+                System.out.println(Console.multiplication(n1,n2));
                 break;
-            case 3:selected="Division of integers";
+            case 4:n2=Console.getDoubleInput("Division of integers");
+                System.out.println(Console.division(n1,n2));
                 break;
-            case 4:selected="Square of integers";
+            case 5:System.out.println(Console.square(n1));
                 break;
-            case 5:selected="Square root of integers";
+            case 6:System.out.println(Console.squareRoot(n1));
                 break;
-            case 6:selected="Exponents of integers";
+            case 7:n2=Console.getDoubleInput("Exponents of integers");
+                System.out.println(Console.exponents(n1,n2));
                 break;
-            case 7:selected="Inverse of integers";
+            case 8:System.out.println(Console.inverse(n1));
                 break;
 
 
 
         }
-        if(option==0) {
-            int i = Console.getIntegerInput("Enter an integer");
-            int i2 = Console.getIntegerInput("Enter an integer");
-            //Double d = Console.getDoubleInput("Enter a double.");
-            int result = Console.addInt(i, i2);
-            //Console.println("The user input %s as a string", s);
-            Console.println("The result is " + result);
-        }
-        ;
 
         //Console.println("The user input %s as a d", d);
     }
diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java
index 94e8d98..2f4a57b 100644
--- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java
+++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java
@@ -1,7 +1,19 @@
 package com.zipcodewilmington.scientific_calculator;
-
+import com.zipcodewilmington.scientificcalculator.Console;
+import org.junit.Assert;
+import org.junit.Test;
+import static org.junit.Assert.*;
 /**
  * Created by leon on 2/9/18.
  */
 public class TestMainApplication {
+@Test
+    public void addTest()
+{
+    Double result= Console.add(3,5);
+    Double actual=8.0;
+    Assert.assertEquals(actual,result);
+}
+
+
 }

From a2d3c36314dba8cd36439201f4d84b25773bd1d4 Mon Sep 17 00:00:00 2001
From: John <john@Zipcoders-MacBook-Pro-46.local>
Date: Sat, 29 Oct 2022 12:54:24 -0400
Subject: [PATCH 6/8] input test methods

---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 src/.DS_Store                                 | Bin 0 -> 6148 bytes
 src/main/.DS_Store                            | Bin 0 -> 6148 bytes
 src/main/java/.DS_Store                       | Bin 0 -> 6148 bytes
 src/main/java/com/.DS_Store                   | Bin 0 -> 6148 bytes
 src/main/java/com/zipcodewilmington/.DS_Store | Bin 0 -> 6148 bytes
 .../scientificcalculator/Console.java         |   3 +-
 .../TestMainApplication.java                  |  68 ++++++++++++++++--
 8 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 src/.DS_Store
 create mode 100644 src/main/.DS_Store
 create mode 100644 src/main/java/.DS_Store
 create mode 100644 src/main/java/com/.DS_Store
 create mode 100644 src/main/java/com/zipcodewilmington/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..116ef1ffb7b9764e319424477941975aef8e727a
GIT binary patch
literal 6148
zcmeHK!EO^V5FIBe*;R#<14zA8veau7LR&x;mnBUP9D3;@H~<RSZUif~>nNKLq$tv!
z;bXY+CHzkN#&#+~%9U1VMjF5Ic*b5oTlSiWRBx6(CTbB;0A;L&C~gpLXWfvR_iO=`
z?c*z5Q2sJE=SjX1Esnd$0Iyw>#$>Q^9r|tkOoA5P7B8TkODnL5LOP=pc>8n;>>w|7
zD}J5v<ByCwl{BIA^(eJ_b5t@f$4PGc`k9RLtekeczf`T>*t*vYn!$GPKK^9p@pL$y
zmA&EQE!SQdlP4>Cn7qzL^Fiyuu_>m*tQbvfLY9sY^6pJmq-NeTvmz~RZtNO@FbD^&
zoyB7R$x&M$96npN_2Ov1+t!B%PnXLuc)0iI`Ptxeeo>fjOarz&_Pmw*9#`-khM)77
zcv9r1_z2G`dKD!o3<v|l!0j>MPo!Y`_C7&I76ycYJIVl`4;soCd8{1TqXUI~0stFu
zTY=3#jhv%BMjk7NXn`n~3UsN;KQWX`hhO`+$YbTurIYfH59LQz{)M9K=;&YDa8i*&
zDTM)HV4Z=wtG4+5Kl%Ine?3WR!hkUFUooH>{kY%5l>FVgF*&|#HS`0Nh2tuR*C{aU
hRg74^ig%z^;MZ&bBaf9scp&m4U}=y-82G0QTmc|fZ7Bc%

literal 0
HcmV?d00001

diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..53556cdb1377ed1565bf5d970ab1c3533b84a875
GIT binary patch
literal 6148
zcmeHKu};G<5Iwg6QdLMDKw^x<T0v<G2(g4x23CS#08|oMK}3kFCZ$7FDKmTwD__Fz
zz@2R>N?`<1bSIskeZI5f=g9T}fN1pF8vrE$uu%zf1uVW0>L;C&oUvGlg2p(E<W&&K
z0NXSm%im{!_RfMk@F9fw)Bf#Y-`cAZwUDu2Fi5&)pPz$n6eek<@*;A1Yi@qQUa*Vy
zg?A$dUh1d)q~Z6@sC6u56uj5{;3Vt}TBW6Z8K-_2cX}!yY<JM*{4|W)a?p_dxSgn2
zPj}b_yU;4F42RXtow8G_Z;#5(aHm=+JN4SuXjHJ5SJ!usTDQ?%EFU!W0{=@Tiw57}
z5i8^M+<Uz^lJPa#$lrn#I*>s6iH|4j`^X12S(pK4fEk!c2F%%L7iaS8`J<TuX5c3o
zp!2~&C3FpD8r9K(g-QVs=^3d6>+0!`=#T-?HJE8c3yRR8h&oi56hoNILFjPoca49h
zQHO(2GvhdBW??cEVG<AFD0dL9MlP8FW?+(myl$50{y+FW|DO!v7Bj#M{3`~8)%2PT
zT#~t4rxr(dt%G`rN<w~_#&HN%)K!eWbQQ0lDnYwL6-3uyrV%YD{18wyaKQ}xDg$o{
C&tQ=N

literal 0
HcmV?d00001

diff --git a/src/main/.DS_Store b/src/main/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..034c5d6ce94e47581259873014177a9a85810732
GIT binary patch
literal 6148
zcmeHK!AiqG5Z!H~O({YS3OxqA7OibnikDdH!K)EHsMN$1jmB(g()LgaIqMJkCH{`i
z>~0ELJqaRZ24>%8c4ou84Lcde81IaN9mXuim<ftlD8ulL;5zDp6ttxX$Z?O8NZk67
z@ZlLZB>Ddg;Mp1Mfq87qyf5c>2y0vKQe+}?KYx-8^f|x!gD6bWdi{+TipI)n$t;-_
z^V+=^6F2qJQPS~-m-uuhMC9jl&p!|Qlb*GHB;wQy<Ni<vgh3x%t}enj5R;A=#X%xt
zUA17A&2rDGPN$9CcFk_K_GdMF+HTZqcB{EJo0ZLt&FzEJ-edF>i)TeWhwoC#n#LSn
zU^35V><;5d#CKrJ{c}G;Vt^PR29}Wleb<?lWlWB8A_j<oUon99gAI!4Xv`GKs{;nv
z0stCdmI8D6>knw70npKyDFh1$SD}C^l<O9Q>&}6za9DS=f2L4{GcMl@`{*}w-Jx*Z
zcyL>~Gwvv)kr*HbJ~M#5ABctZ|M=(rUpmo13=jj$$pAOHZnp!u>Ds!GCDvLS^ad0K
o{W68~5SYkP48B;3tDsWAZsP>d(U>U&3kdxPNE&D$2L6<R4=PMlwEzGB

literal 0
HcmV?d00001

diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d197e289ceb7a270b78e4de4199fc02b7eb827e3
GIT binary patch
literal 6148
zcmeHK!AiqG5Z!I7O({YS3OxqA7OibnikBGc!K)EHsMMq>8ceg&q~=fxIqMJkCH{`i
z>~4foy?78TGcfx$vojm!ZP>{$#<(*L_82o6V+JT<sRqM0g6pVDQqq<(Ajdt#(2s-<
zPq-b)e_#O5uFQr^u<=>6aDK<IvhyKDCZfIkEP2wW{N_JJVUo65@4Qs5tgTm#s!=y?
z-3O7msh3U@$D3T^(}fU`U(7xKG8|<CbMr*RsTanhi3|vX5xCr3g>fJ<M@-`&k+H5?
zFlt6^U^Zs6_I|Hvb-IW1rZwxeTTQFmIhfCD#@6=k(fQyp8pq;A5zpb9l(M0*fLEC4
zY@Xdo9EtcIEQNRBMMw+~1H{1UGN5lfqrSQ+Qf9;eG4M+U@P4pB5p9jRLV0z-AX@;y
z3Yew9T>kt6T4(^YHRcMz0>V`&pbF)>#o)Sk;3^!}ZS9{cRN;)vH^V;q&0KdVT(=(F
zlJ1P#3TY$;h=D~0u=fKovHqX_-2Y1_8i)a6U^N-wmA>0|AU9oGm$JlKYk}T@qM%={
m@GAr+vJ`_amf{Ae6tG)30kk#d3c&(GKLU~l8i;{EW#AJtDN@t`

literal 0
HcmV?d00001

diff --git a/src/main/java/com/.DS_Store b/src/main/java/com/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..119129fd0e9d3d1c8126292d05c42f16f9684003
GIT binary patch
literal 6148
zcmeHK!D`z;5S?}0MkW+oXd%aiUQO#JX-mjOagsx?RcQ}RajeLsqROtZ<qBd9IwwDr
zFUjvDZ+6$E#VO<zOqqe%H=3OpNpHojhKN*en!P1z6Hx?ZY_u@kBRtQ#B#q!%11eX;
zQbt3nD5qj6S{$p$0I%J1y1<H!=#>6kzjOEuolyy|`B>P~w6H0n`BT}4zP@z=>p>OL
zYBCBHuG3MGPs(ohMm5%&PoAzv>(NH^J^5j)q#TsfNpCRz##f)MEz*TONWbL6s^5Nb
zU`;v5&2a1z@@$BZ<FC2NY}K<<lTBQ1;wPe3)ati4XS1z$yB)o~^I_i6v)!$3NAGOE
zpU+#-%U5sqKJ|YV=f+;TcOivu*~znj3%G*u0Iq%|V^dgjhUi75MFl}&Ko}4PR)c}C
zJ4G9-@i_7n!hkTaLJaW!prMR$z}lnRIxx5v0N8}v32gpB<QyF^4p@7{3`F@<pifny
z#ZW#SejVcCfVD@TPAW7XD%@Fx4n?`UqrP_Gq+*XU3IoEx-wbf?2Wj*9fAsJE-v!Aa
z3<v}NCj+W^m>l--ZsBZQdP_cQHS`3^!g007-zhNMQH)qViZ`K7;MZ&b<AAkCcp&m4
N;AoIR7<g0$?f}ElWaa<>

literal 0
HcmV?d00001

diff --git a/src/main/java/com/zipcodewilmington/.DS_Store b/src/main/java/com/zipcodewilmington/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..2b348639c1c1d7970e697cf32862d8edbd95fb48
GIT binary patch
literal 6148
zcmeHKO;6iE5S<MvIEs*R0Ey#DT%$I8v<PuADI9vmReNYru#>d4FkTcp%^`~9GyEZb
z34f=&+1*sFLZ$WsQ8gpYzVYnLto+v6^$?Njjt4tLEg}k_jI{=aM}+5D7o_GrD?nvy
z<Wy2hU!eVkXmKnf1H5+|RA9eS8q%-(*Qb~=_{SJy?5m;CyUg^H%p}O+59S#9@`n{z
z|4=8H6xY7aU2>hJMcL`xtJ+Ha#p+tH7BqwN=$n~DWn7MnZan(LPw$P%lDQoxAJXBZ
z*V=e%@-j~I;m9VWgCRmbe@yd%nRLxK9~3q>auY!#X!KfJ)9LQ(!?xbrKbW=k^l-P+
z*86*JX0t}Hx&7+staq7R<>tn|5h;AvR@Obv;TFbU^Y%R&<(bL9B4=K2UPn+E5C(*S
z=U~8}MM3j97MC@J0byXN8Q}9lLm5Mll|y@UV6ZI!unxBs*!*kAIof0Bv2utRh;pew
zm#Tb=p<Fur+Q)?+D~B$fly5$iUs?GMMcLI+U)yj}p+gyk0b$^G2DtZwwD|r%{d50s
zgJci}gn|E)0aZVVPP%wEf445YCEv9gdI4qOxXR(r6d3j@Ml4^&TTm<TYc_zP$I2l*
P5cv_XG{_(fJShVYiqdE&

literal 0
HcmV?d00001

diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
index 366715f..f381307 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
@@ -70,7 +70,8 @@ public static double exponents(double i, double j) {
         return Math.pow(i,j);
     }
     public static double inverse(double i) {
-
+        String sNumber = (String) String.format("%.2f", (1 /i));
+        Double newNumber = Double.parseDouble(sNumber);
         return (1 / i);
     }
 
diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java
index 2f4a57b..cfaed0e 100644
--- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java
+++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java
@@ -2,18 +2,76 @@
 import com.zipcodewilmington.scientificcalculator.Console;
 import org.junit.Assert;
 import org.junit.Test;
+
+//import java.io.Console;
+
 import static org.junit.Assert.*;
 /**
  * Created by leon on 2/9/18.
  */
 public class TestMainApplication {
 @Test
-    public void addTest()
-{
-    Double result= Console.add(3,5);
-    Double actual=8.0;
-    Assert.assertEquals(actual,result);
+    public void addTest() {
+    Double result = Console.add(3.7, 5.8);
+    Double actual = 9.5;
+    Assert.assertEquals(actual, result);
+}
+@Test
+    public void subtractionTest() {
+
+    Double result = Console.subtraction(3.6, 5.2);
+    Double actual = -1.6;
+    Assert.assertEquals(actual, result);
+}
+@Test
+    public void multiplicationTest() {
+
+    Double result = Console.multiplication(5, 6);
+    Double actual = 30.0;
+    Assert.assertEquals(actual, result);
+}
+@Test
+    public void divisionTest() {
+
+    Double result = Console.division(10, 5);
+    Double actual = 2.0;
+    Assert.assertEquals(actual, result);
+}
+@Test
+    public void squareTest() {
+
+    Double result = Console.square(10);
+    Double actual = 100.0;
+    Assert.assertEquals(actual, result);
 }
+@Test
+    public void squareRootTest() {
+
+    Double result = Console.squareRoot(100);
+    Double actual = 10.0;
+    Assert.assertEquals(actual, result);
+}
+@Test
+    public void exponentsTest()
+
+    {
+
+        Double result = Console.exponents(5, 2);
+        Double actual = 25.0;
+        Assert.assertEquals(actual, result);
+    }
+@Test
+    public void inverseTest()
+
+    {
+
+        Double result = Console.inverse(5);
+        Double actual = 0.20;
+        Assert.assertEquals(actual, result);
+    }
 
 
 }
+
+
+

From 80ac403b544c4b7fc9dd2811c6dac91ce2aa7294 Mon Sep 17 00:00:00 2001
From: annafu1 <104175541+annafu1@users.noreply.github.com>
Date: Sat, 29 Oct 2022 14:17:17 -0400
Subject: [PATCH 7/8] I have added trig methods, switch cases, and tested them.

---
 .../scientificcalculator/Console.java         | 31 ++++++-
 .../scientificcalculator/MainApplication.java | 92 ++++++++++++-------
 .../TestMainApplication.java                  | 31 +++++++
 3 files changed, 114 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
index f381307..321d639 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
@@ -18,7 +18,7 @@ public static void println(String output, Object... args) {
     public static int getIntegerInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
         println(prompt);
-        int  userInput = scanner.nextInt();
+        int userInput = scanner.nextInt();
         return userInput;
     }
 
@@ -32,7 +32,7 @@ public static String getStringInput(String prompt) {
     public static Double getDoubleInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
         println(prompt);
-        double  userInput = scanner.nextDouble();
+        double userInput = scanner.nextDouble();
         return userInput;
 
     }
@@ -48,6 +48,7 @@ public static double subtraction(double i, double j) {
 
 
     }
+
     public static double multiplication(double i, double j) {
 
         return i * j;
@@ -57,23 +58,43 @@ public static double division(double i, double j) {
 
         return i / j;
     }
+
     public static double square(double i) {
 
         return i * i;
     }
+
     public static double squareRoot(double i) {
 
         return Math.sqrt(i);
     }
+
     public static double exponents(double i, double j) {
 
-        return Math.pow(i,j);
+        return Math.pow(i, j);
     }
+
     public static double inverse(double i) {
-        String sNumber = (String) String.format("%.2f", (1 /i));
+        String sNumber = (String) String.format("%.2f", (1 / i));
         Double newNumber = Double.parseDouble(sNumber);
-        return (1 / i);
+        return (newNumber);
     }
 
+    public static double sin(double i) {
+        String sNumber1 = (String) String.format("%.2f", (Math.sin(i)));
+        Double newSin = Double.parseDouble(sNumber1);
+        return (newSin);
+    }
+
+    public static double cos(double i) {
+        String sNumber2 = (String) String.format("%.2f", (Math.cos(i)));
+        Double newCos = Double.parseDouble(sNumber2);
+        return (newCos);
+    }
 
+    public static double tan(double i) {
+        String sNumber3 = (String) String.format("%.2f", (Math.tan(i)));
+        Double newTan = Double.parseDouble(sNumber3);
+        return (newTan);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
index 38d24b4..a4a867c 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
@@ -6,46 +6,68 @@
 public class MainApplication {
     public static void main(String[] args) {
         Console.println("Welcome to my calculator!");
-        System.out.println("1.Addition of integers");
-        System.out.println("2. Substraction");
+        System.out.println("1.Addition");
+        System.out.println("2.Subtraction");
         System.out.println("3.Multiplication");
         System.out.println("4.Division");
         System.out.println("5.Square");
+        System.out.println("6.Square Root");
+        System.out.println("7.Exponents");
+        System.out.println("8.Inverse");
+        System.out.println("9.Sine");
+        System.out.println("10.Cosine");
+        System.out.println("11.Tangent");
         int option=Console.getIntegerInput("Enter an option");
 
+try {
+    Double n1 = Console.getDoubleInput("Enter an integer");
+    String selected;
+    Double n2;
+    switch (option) {
 
-        Double n1=Console.getDoubleInput("Enter an integer");
-        //String s = Console.getStringInput("Enter a string");
-        String selected;
-        Double n2;
-        switch (option)
-        {
-            case 1:n2=Console.getDoubleInput("Enter an integer");
-                   System.out.println(Console.add(n1,n2));
-                break;
-            case 2:n2=Console.getDoubleInput(selected="Subtraction of integers");
-                System.out.println(Console.subtraction(n1,n2));
-                break;
-            case 3:n2=Console.getDoubleInput("Multiplication of integers");
-                System.out.println(Console.multiplication(n1,n2));
-                break;
-            case 4:n2=Console.getDoubleInput("Division of integers");
-                System.out.println(Console.division(n1,n2));
-                break;
-            case 5:System.out.println(Console.square(n1));
-                break;
-            case 6:System.out.println(Console.squareRoot(n1));
-                break;
-            case 7:n2=Console.getDoubleInput("Exponents of integers");
-                System.out.println(Console.exponents(n1,n2));
-                break;
-            case 8:System.out.println(Console.inverse(n1));
-                break;
-
-
-
-        }
-
-        //Console.println("The user input %s as a d", d);
+        case 1:
+            n2 = Console.getDoubleInput("Enter an integer");
+            System.out.println(Console.add(n1, n2));
+            break;
+        case 2:
+            n2 = Console.getDoubleInput(selected = "Subtraction of integers");
+            System.out.println(Console.subtraction(n1, n2));
+            break;
+        case 3:
+            n2 = Console.getDoubleInput("Multiplication of integers");
+            System.out.println(Console.multiplication(n1, n2));
+            break;
+        case 4:
+            n2 = Console.getDoubleInput("Division of integers");
+            System.out.println(Console.division(n1, n2));
+            break;
+        case 5:
+            System.out.println(Console.square(n1));
+            break;
+        case 6:
+            System.out.println(Console.squareRoot(n1));
+            break;
+        case 7:
+            n2 = Console.getDoubleInput("Exponents of integers");
+            System.out.println(Console.exponents(n1, n2));
+            break;
+        case 8:
+            System.out.println(Console.inverse(n1));
+            break;
+        case 9:
+            System.out.println(Console.sin(n1));
+            break;
+        case 10:
+            System.out.println(Console.cos(n1));
+            break;
+        case 11:
+            System.out.println(Console.tan(n1));
+            break;
+        default:
+            System.out.println("Select option again");
+    }
+} catch (Exception e) {
+    Console.println("Err");
+}
     }
 }
diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java
index cfaed0e..de4b2e1 100644
--- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java
+++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java
@@ -70,6 +70,37 @@ public void inverseTest()
         Assert.assertEquals(actual, result);
     }
 
+    @Test
+    public void inverseTest2()
+
+    {
+
+        Double result = Console.cos(5);
+        Double actual =0.28;
+        Assert.assertEquals(actual, result);
+    }
+
+    @Test
+    public void inverseTest3()
+
+    {
+
+        Double result = Console.tan(5);
+        Double actual =-3.38;
+        Assert.assertEquals(actual, result);
+    }
+
+    @Test
+    public void inverseTest4()
+
+    {
+
+        Double result = Console.sin(5);
+        Double actual =-0.96;
+        Assert.assertEquals(actual, result);
+    }
+
+
 
 }
 

From 95a03995cc86ce508bbb42f4658cc0ebf558aca9 Mon Sep 17 00:00:00 2001
From: annafu1 <104175541+annafu1@users.noreply.github.com>
Date: Sat, 29 Oct 2022 14:49:46 -0400
Subject: [PATCH 8/8] I have added in factorial to the change

---
 .../zipcodewilmington/scientificcalculator/Console.java  | 7 +++++++
 .../scientificcalculator/MainApplication.java            | 4 ++++
 .../scientific_calculator/TestMainApplication.java       | 9 +++++++++
 3 files changed, 20 insertions(+)

diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
index 321d639..6834bdb 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java
@@ -97,4 +97,11 @@ public static double tan(double i) {
         Double newTan = Double.parseDouble(sNumber3);
         return (newTan);
     }
+
+    public static double factorial(double i) {
+        if (i == 0)
+            return 1;
+        else
+        return (i * factorial(i-1));
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
index a4a867c..f1dbc90 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java
@@ -17,6 +17,7 @@ public static void main(String[] args) {
         System.out.println("9.Sine");
         System.out.println("10.Cosine");
         System.out.println("11.Tangent");
+        System.out.println("12.Factorial");
         int option=Console.getIntegerInput("Enter an option");
 
 try {
@@ -63,6 +64,9 @@ public static void main(String[] args) {
         case 11:
             System.out.println(Console.tan(n1));
             break;
+        case 12:
+            System.out.println(Console.factorial(n1));
+            break;
         default:
             System.out.println("Select option again");
     }
diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java
index de4b2e1..a784961 100644
--- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java
+++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java
@@ -100,6 +100,15 @@ public void inverseTest4()
         Assert.assertEquals(actual, result);
     }
 
+    @Test
+    public void inverseTest5()
+
+    {
+
+        Double result = Console.factorial(2);
+        Double actual =2.0;
+        Assert.assertEquals(actual, result);
+    }
 
 
 }