From d86c99d32d8953df54cbe60ab745f8013be142db Mon Sep 17 00:00:00 2001 From: charnaexw Date: Sun, 27 Jun 2021 16:17:16 -0400 Subject: [PATCH 1/5] Added COS SIN TAN + inverse --- .../scientificcalculator/MainApplication.java | 6 +-- .../scientificcalculator/Scientific.java | 43 +++++++++++++++++-- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index 57544b2..d8682a1 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -29,7 +29,7 @@ public static String menuOption1() { System.out.println("Here are some Basic Functions. \n+ \nAddition , - \n-Subtraction , / \n-Division , * \n-Multiplication"); break; case "2": - System.out.println("Here are some Scientific Functions. \nSine() \nCosine()"); + System.out.println("Here are some Scientific Functions. \nSine() \nCosine() \nTangant"); break; case "3": System.out.println("Something Fun!"); @@ -57,13 +57,13 @@ public static String menuOption1() { System.out.println(x); */ -<<<<<<< HEAD:src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +//<<<<<<< HEAD:src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java String s = Console.getStringInput("Enter a string"); ======= String String s = CalculatorEngine.getStringInput("Enter a string"); ->>>>>>> 67032e40a3e1b20aaf10917261cc55a57dbfe45b:src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorInterface.java +//>>>>>>> 67032e40a3e1b20aaf10917261cc55a57dbfe45b:src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorInterface.java diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java index 538cbe6..c24d054 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java @@ -3,10 +3,45 @@ import com.sun.codemodel.internal.JSwitch; public class Scientific { + public static void main(String[]args) { + int firstNum = 0; + double answer = 0.0; + char operator = 0; + + switch (operator) { + case "cos": + answer = Math.cos(firstNum); + break; + case "tan": + answer = Math.sin(firstNum); + break; + + case "sin": + answer = Math.tan(firstNum); + break; + + case "acos": + answer = Math.acos(firstNum); + break; + + case "atan": + answer = Math.atan(firstNum); + break; + + case "asin": + answer = Math.asin(firstNum); + break; + + } + } + public static void long factorial(int n) { + long fact = 1; + for (int i = 2; i <= n; i++) { + fact = fact * i; + } + return fact; + } + - public static Double triganometry(firstNum, secondNum) - switch (operator)( - case "cos": - ) } From 322ed802407197f31b119749d3c41db457f86dfe Mon Sep 17 00:00:00 2001 From: charnaexw Date: Sun, 27 Jun 2021 17:18:05 -0400 Subject: [PATCH 2/5] Added another switch(sqrt, sq, factorial, cubed) --- .../scientificcalculator/Scientific.java | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java index c24d054..ecba18e 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java @@ -3,7 +3,7 @@ import com.sun.codemodel.internal.JSwitch; public class Scientific { - public static void main(String[]args) { + public static void main java.lang.String { int firstNum = 0; double answer = 0.0; char operator = 0; @@ -32,14 +32,42 @@ public static void main(String[]args) { answer = Math.asin(firstNum); break; + default: + System.out.println("ERR"); + } + switch (operator){ + case "x2": + answer= Math.pow(firstNum, 2); + break; + case "x^": + answer = Math.sqrt(firstNum); + break; + + case "x3": + answer = Math.pow(firstNum, 3); + break; + + case "!x": + long fact = 1; + for (int i = 2; i <= firstNum; i++) { + answer = fact * i;} + System.out.println("true"); + break; + + case "": + answer = Math.fact(firstNum); + break; + + default: + System.out.println("ERR"); } } public static void long factorial(int n) { - long fact = 1; + long answer = 1; for (int i = 2; i <= n; i++) { - fact = fact * i; + answer = answer * i; } - return fact; + return answer; } From 103cd7e28204e7e0c53a3a82a5e1ccee12277975 Mon Sep 17 00:00:00 2001 From: charnaexw Date: Sun, 27 Jun 2021 18:13:43 -0400 Subject: [PATCH 3/5] Adding the MR MC M- --- .../scientificcalculator/Scientific.java | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java index ecba18e..5f17d04 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java @@ -3,7 +3,8 @@ import com.sun.codemodel.internal.JSwitch; public class Scientific { - public static void main java.lang.String { + public Scientific + public static void main(String[] args) { int firstNum = 0; double answer = 0.0; char operator = 0; @@ -35,9 +36,9 @@ public class Scientific { default: System.out.println("ERR"); } - switch (operator){ + switch (operator) { case "x2": - answer= Math.pow(firstNum, 2); + answer = Math.pow(firstNum, 2); break; case "x^": answer = Math.sqrt(firstNum); @@ -50,26 +51,20 @@ public class Scientific { case "!x": long fact = 1; for (int i = 2; i <= firstNum; i++) { - answer = fact * i;} - System.out.println("true"); + answer = fact * i; + } break; case "": - answer = Math.fact(firstNum); + answer = math break; default: System.out.println("ERR"); } } - public static void long factorial(int n) { - long answer = 1; - for (int i = 2; i <= n; i++) { - answer = answer * i; - } - return answer; - } - - + public void actionPerformed(ActionEvent e) { + String s = e.getActionCommand(); + } } From 2b8319e66df37be51702e91c7dec499961be90d6 Mon Sep 17 00:00:00 2001 From: charnaexw Date: Sun, 27 Jun 2021 18:44:44 -0400 Subject: [PATCH 4/5] ignore the red. --- .../scientificcalculator/Scientific.java | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java index 5f17d04..2fa514f 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java @@ -3,7 +3,7 @@ import com.sun.codemodel.internal.JSwitch; public class Scientific { - public Scientific + public static void main(String[] args) { int firstNum = 0; double answer = 0.0; @@ -55,16 +55,28 @@ public static void main(String[] args) { } break; - case "": - answer = math - break; - default: System.out.println("ERR"); } } + public void actionPerformed(ActionEvent e) { String s = e.getActionCommand(); + switch (operator) { + case "MC": + m1 = 0; + tfield.setText(""); + break; + case "MR" : + tfield.setText(""); + tfield.setText(tfield.getText() + m1); + break; + case "M-" : + //something I have no clue + break; + } + } + } + + - } -} From 113986613bebda53ac528441782a937e5678edce Mon Sep 17 00:00:00 2001 From: charnaexw Date: Sun, 27 Jun 2021 18:59:57 -0400 Subject: [PATCH 5/5] Making Chnages. --- .../zipcodewilmington/scientificcalculator/Scientific.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java index 2fa514f..5f37269 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java @@ -36,6 +36,7 @@ public static void main(String[] args) { default: System.out.println("ERR"); } + switch (operator) { case "x2": answer = Math.pow(firstNum, 2); @@ -58,6 +59,7 @@ public static void main(String[] args) { default: System.out.println("ERR"); } + public Integer } public void actionPerformed(ActionEvent e) { @@ -74,9 +76,8 @@ public void actionPerformed(ActionEvent e) { case "M-" : //something I have no clue break; + } } - } - - +} \ No newline at end of file