From 496ba894a755d42dedd68edd2108d56bfcbe6024 Mon Sep 17 00:00:00 2001 From: asanahmadli Date: Sat, 2 Mar 2024 11:16:32 -0500 Subject: [PATCH 1/9] I created simplecalculation --- pom.xml | 21 +-- .../scientificcalculator/Console.java | 17 +- .../scientificcalculator/MainApplication.java | 15 +- .../ScientificCalculator.java | 5 + .../SimpleCalculator.java | 152 ++++++++++++++++++ .../TestMainApplication.java | 26 +++ 6 files changed, 212 insertions(+), 24 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/scientificcalculator/ScientificCalculator.java create mode 100644 src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java diff --git a/pom.xml b/pom.xml index b92b052..cdf84d9 100644 --- a/pom.xml +++ b/pom.xml @@ -25,29 +25,14 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - - junit - junit - 4.12 - test - + junit junit - 4.12 - test - - - junit - junit - 4.12 + 4.13.2 test + diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java index 83f0e97..cd896f4 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java @@ -7,6 +7,11 @@ */ public class Console { + public static void defaultValue (){ + System.out.println(SimpleCalculator.intResult); + } + + public static void print(String output, Object... args) { System.out.printf(output, args); } @@ -23,10 +28,18 @@ public static String getStringInput(String prompt) { } public static Integer getIntegerInput(String prompt) { - return null; + System.out.println(prompt); + Scanner scan = new Scanner(System.in); + int number = scan.nextInt(); + return number; } public static Double getDoubleInput(String prompt) { - return null; + System.out.println(prompt); + Scanner scan = new Scanner(System.in); + double d = scan.nextDouble(); + return d; } + + } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index 5f42132..49ba028 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -6,12 +6,19 @@ 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.defaultValue(); + String s = Console.getStringInput("Enter a string!"); + Integer i = Console.getIntegerInput("Enter an integer!"); + Double d = Console.getDoubleInput("Enter a double!"); 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); + Console.println("The user input %s as a double", d); + + SimpleCalculator simpleCalculation = new SimpleCalculator(); + double dd = simpleCalculation.calculator('*',11,10); + + System.out.println("Result = "+dd); + } } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/ScientificCalculator.java b/src/main/java/com/zipcodewilmington/scientificcalculator/ScientificCalculator.java new file mode 100644 index 0000000..2bac7ed --- /dev/null +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/ScientificCalculator.java @@ -0,0 +1,5 @@ +package com.zipcodewilmington.scientificcalculator; + +public class ScientificCalculator { + +} diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java b/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java new file mode 100644 index 0000000..02ebb1c --- /dev/null +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java @@ -0,0 +1,152 @@ +package com.zipcodewilmington.scientificcalculator; + +public class SimpleCalculator { + + + public static double doubleResult; + public static int intResult; + + public SimpleCalculator(){ + this.intResult = 0; + } + + + + + + public double calculator(char operator, double num1, double num2) { + + if (operator == '+') { + doubleResult = num1 + num2; + } + + + else if (operator == '-') { + if (num1 > num2) { + doubleResult = num1 - num2; + } else { + doubleResult = num2 - num1; + } + } + else if (operator == '*') { + doubleResult = num1 * num2; + } + else if (operator == '%') { + doubleResult = num1 % num2; + } + else { + try { + if (num1 > num2) { + doubleResult = num1 / num2; + } else { + doubleResult = num2 / num1; + } + } catch (ArithmeticException e) { + System.out.println("Exception handled " + e.getMessage()); + } + + } + return doubleResult; + } + + + + public double calculator(char operator, int num1, double num2) { + if (operator == '+') { + doubleResult = num1 + num2; + } else if (operator == '-') { + if (num1 > num2) { + doubleResult = num1 - num2; + } else { + doubleResult = num2 - num1; + } + } + else if (operator == '%') { + doubleResult = num1 % num2; + } + else if (operator == '*') { + doubleResult = num1 * num2; + } else { + try { + if (num1 > num2) { + doubleResult = num1 / num2; + } else { + doubleResult = num2 / num1; + } + } catch (ArithmeticException e) { + System.out.println("Exception handled " + e.getMessage()); + } + + } + return doubleResult; + } + + public double calculator(char operator, double num1, int num2) { + if (operator == '+') { + doubleResult = num1 + num2; + } else if (operator == '-') { + if (num1 > num2) { + doubleResult = num1 - num2; + } + else if (operator == '%') { + doubleResult = num1 % num2; + } + else { + doubleResult = num2 - num1; + } + } else if (operator == '*') { + doubleResult = num1 * num2; + } else { + try { + if (num1 > num2) { + doubleResult = num1 / num2; + } else { + doubleResult = num2 / num1; + } + } catch (ArithmeticException e) { + System.out.println("Exception handled " + e.getMessage()); + } + + } + return doubleResult; + } + + public double calculator(char operator, int num1, int num2) { + if (operator == '+') { + doubleResult = num1 + num2; + } else if (operator == '-') { + if (num1 > num2) { + doubleResult = num1 - num2; + } + else { + doubleResult = num2 - num1; + } + } else if (operator == '*') { + doubleResult = num1 * num2; + } + + else if (num1 > num2) { + try{ + doubleResult = num1 / num2; + } + catch (ArithmeticException e){ + System.out.println("Exception handled "+e.getMessage()); + } + + + } + else if (num2 < num1) { + try{ + doubleResult = num2 / num1; + } + catch (ArithmeticException e){ + System.out.println("Exception handled "+e.getMessage()); + } + } + + return doubleResult; + + + + } +} diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index 94e8d98..4784dff 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -1,7 +1,33 @@ package com.zipcodewilmington.scientific_calculator; +import com.zipcodewilmington.scientificcalculator.SimpleCalculator; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + + /** * Created by leon on 2/9/18. */ public class TestMainApplication { + SimpleCalculator simpleCalculator = new SimpleCalculator(); + + + @Test + public void test_Addition_Double_and_Double_Input(){ + + /** Checking addition! Checking double and double inputs*/ + assertEquals(9.0,simpleCalculator.calculator('+',3.0,5.0),0.0001); + + } + + + @Test + public void test_Subtraction_Double_and_Double_Input() { + /** Checking subtraction! Checking double and double inputs*/ + assertEquals(9.0,simpleCalculator.calculator('-',3.0,5.0),0.0001); + } + + + } From 4ec01477f11bacea04b974f335659e8cef40cdea Mon Sep 17 00:00:00 2001 From: AliceGonzalez Date: Sat, 2 Mar 2024 11:35:13 -0500 Subject: [PATCH 2/9] Alice made changes --- .../scientific_calculator/TestMainApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index 4784dff..865453e 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertEquals; - + //HERE"S MY CHANGE FOR GIT HUB/// /** * Created by leon on 2/9/18. */ From 323c7db1fc798bc1e708ba3169e85f80e799ac80 Mon Sep 17 00:00:00 2001 From: asanahmadli Date: Sat, 2 Mar 2024 11:36:46 -0500 Subject: [PATCH 3/9] added commet --- .../scientificcalculator/SimpleCalculator.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java b/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java index 02ebb1c..ff47885 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java @@ -9,14 +9,14 @@ public class SimpleCalculator { public SimpleCalculator(){ this.intResult = 0; } - - - - +//sasasa public double calculator(char operator, double num1, double num2) { if (operator == '+') { + if(num1<0){ + + } doubleResult = num1 + num2; } @@ -25,11 +25,17 @@ else if (operator == '-') { if (num1 > num2) { doubleResult = num1 - num2; } else { - doubleResult = num2 - num1; + doubleResult = -num2 -(- num1); } } else if (operator == '*') { - doubleResult = num1 * num2; + if(num1<0 || num2<0){ + doubleResult = -num1 * num2; + } + else { + doubleResult = num1 * num2; + } + } else if (operator == '%') { doubleResult = num1 % num2; From 85c13a39458b3082f464e3a1c77da56274f2ef9b Mon Sep 17 00:00:00 2001 From: asanahmadli Date: Sat, 2 Mar 2024 11:50:32 -0500 Subject: [PATCH 4/9] I added comment --- .../scientificcalculator/SimpleCalculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java b/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java index ff47885..11f4c18 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java @@ -55,7 +55,7 @@ else if (operator == '%') { return doubleResult; } - +////asasasasasas public double calculator(char operator, int num1, double num2) { if (operator == '+') { From 9f1524601ad6518beb2d90b5d9e4371452780cc9 Mon Sep 17 00:00:00 2001 From: AliceGonzalez Date: Sat, 2 Mar 2024 11:53:15 -0500 Subject: [PATCH 5/9] Changed comment --- .../scientific_calculator/TestMainApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index 865453e..ce7d1f5 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertEquals; - //HERE"S MY CHANGE FOR GIT HUB/// + //%%%%%%%%%%%%%%/// /** * Created by leon on 2/9/18. */ From cb39b9b5272acb02128bf57fe58229a205a3368d Mon Sep 17 00:00:00 2001 From: AliceGonzalez Date: Sat, 2 Mar 2024 14:07:08 -0500 Subject: [PATCH 6/9] Added additional testing methods --- .../scientificcalculator/MainApplication.java | 1 - .../SimpleCalculator.java | 2 +- .../TestMainApplication.java | 45 ++++++++++--------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index 49ba028..bd573b3 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -19,6 +19,5 @@ public static void main(String[] args) { double dd = simpleCalculation.calculator('*',11,10); System.out.println("Result = "+dd); - } } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java b/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java index 11f4c18..fb69edf 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java @@ -9,7 +9,7 @@ public class SimpleCalculator { public SimpleCalculator(){ this.intResult = 0; } -//sasasa + public double calculator(char operator, double num1, double num2) { diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index ce7d1f5..b4d4707 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -5,29 +5,32 @@ import static org.junit.Assert.assertEquals; - //%%%%%%%%%%%%%%/// -/** - * Created by leon on 2/9/18. - */ +//Created By Alice Gonzalez public class TestMainApplication { SimpleCalculator simpleCalculator = new SimpleCalculator(); - - - @Test - public void test_Addition_Double_and_Double_Input(){ - - /** Checking addition! Checking double and double inputs*/ - assertEquals(9.0,simpleCalculator.calculator('+',3.0,5.0),0.0001); - - } - - - @Test - public void test_Subtraction_Double_and_Double_Input() { - /** Checking subtraction! Checking double and double inputs*/ - assertEquals(9.0,simpleCalculator.calculator('-',3.0,5.0),0.0001); - } - + @Test + public void Addition_Test(){ + assertEquals(8.0,simpleCalculator.calculator('+',3.0,5.0),0.0001); + } + + @Test + public void Multiplication_Test() { + assertEquals(42.0,simpleCalculator.calculator('*',7.0,6.0),0.0001); + } + + @Test + public void Division_Test() { + assertEquals(4.5,simpleCalculator.calculator('/',63.0,14.0),0.0001); + } + + @Test + public void Percentage_Test() { + assertEquals(7.0,simpleCalculator.calculator('-',9.0,2.0),0.0001); + } + @Test + public void Subtraction_Test() { + assertEquals(-7.0,simpleCalculator.calculator('-',7.0,14.0),0.0001); + } } From cbe147931107da006668f1a19cc61db676efd49c Mon Sep 17 00:00:00 2001 From: asanahmadli Date: Sat, 2 Mar 2024 21:00:56 -0500 Subject: [PATCH 7/9] I made last changes --- .../scientificcalculator/Console.java | 6 +- .../scientificcalculator/MainApplication.java | 32 ++++-- .../ScientificCalculator.java | 56 +++++++++++ .../SimpleCalculator.java | 36 +++---- .../StartCalculatorWithType.java | 98 +++++++++++++++++++ .../TestMainApplication.java | 2 +- 6 files changed, 194 insertions(+), 36 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/scientificcalculator/StartCalculatorWithType.java diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java index cd896f4..552492a 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java @@ -27,15 +27,13 @@ public static String getStringInput(String prompt) { return userInput; } - public static Integer getIntegerInput(String prompt) { - System.out.println(prompt); + public static Integer getIntegerInput() { Scanner scan = new Scanner(System.in); int number = scan.nextInt(); return number; } - public static Double getDoubleInput(String prompt) { - System.out.println(prompt); + public static Double getDoubleInput() { Scanner scan = new Scanner(System.in); double d = scan.nextDouble(); return d; diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index 49ba028..683e2aa 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -4,21 +4,35 @@ * Created by leon on 2/9/18. */ public class MainApplication { + public static void main(String[] args) { Console.println("Welcome to my calculator!"); Console.defaultValue(); - String s = Console.getStringInput("Enter a string!"); - Integer i = Console.getIntegerInput("Enter an integer!"); - Double d = Console.getDoubleInput("Enter a double!"); +// String s = Console.getStringInput("Enter a string!"); +// // Integer i = Console.getIntegerInput("Enter an integer!"); +// Double d = Console.getDoubleInput("Enter a double!"); +// +// +// 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 double", d); +// +// +// +//// SimpleCalculator simpleCalculation = new SimpleCalculator(); +//// double dd = simpleCalculation.calculator('*',i,d); +// +// +// +// System.out.println("Result = "+ScientificCalculator.cosine(d)); + +StartCalculatorWithType.start(); +SimpleCalculator a = new SimpleCalculator(); + + - 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 double", d); - SimpleCalculator simpleCalculation = new SimpleCalculator(); - double dd = simpleCalculation.calculator('*',11,10); - System.out.println("Result = "+dd); } } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/ScientificCalculator.java b/src/main/java/com/zipcodewilmington/scientificcalculator/ScientificCalculator.java index 2bac7ed..3e89ec8 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/ScientificCalculator.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/ScientificCalculator.java @@ -2,4 +2,60 @@ public class ScientificCalculator { + public double square(double x){ + return x * x; + } + + public double squareRoot(double x){ + return Math.sqrt(x); + } + + public double inverse(double x) { + return 1 / x; + } + + public double switchSign(double x) { + return -x; + } + + public double sine(double x) { + return Math.sin(x); + } + + public double cosine(double x) { + return Math.cos(x); + } + + public double tangent(double x) { + return Math.tan(x); + } + + public double inverseSine(double x) { + return Math.asin(x); + } + + public double inverseCosine(double x) { + return Math.acos(x); + } + + public double inverseTangent(double x) { + return Math.atan(x); + } + + public double factorial(double x) { + if (x == 0) { + return 1; + } + else{ + int result = 1; + for (int i = 1;i<=x;i++){ + result*=i; + } + return result; + } + + } + + + } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java b/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java index 11f4c18..0dcd42a 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java @@ -9,15 +9,12 @@ public class SimpleCalculator { public SimpleCalculator(){ this.intResult = 0; } -//sasasa + public double calculator(char operator, double num1, double num2) { if (operator == '+') { - if(num1<0){ - - } - doubleResult = num1 + num2; + doubleResult = num1 + num2; } @@ -42,20 +39,19 @@ else if (operator == '%') { } else { try { - if (num1 > num2) { + doubleResult = num1 / num2; - } else { - doubleResult = num2 / num1; - } + + } catch (ArithmeticException e) { - System.out.println("Exception handled " + e.getMessage()); + System.out.println("Error " + e.getMessage()); } } return doubleResult; } -////asasasasasas + public double calculator(char operator, int num1, double num2) { if (operator == '+') { @@ -74,11 +70,8 @@ else if (operator == '*') { doubleResult = num1 * num2; } else { try { - if (num1 > num2) { doubleResult = num1 / num2; - } else { - doubleResult = num2 / num1; - } + } catch (ArithmeticException e) { System.out.println("Exception handled " + e.getMessage()); } @@ -100,15 +93,14 @@ else if (operator == '%') { else { doubleResult = num2 - num1; } - } else if (operator == '*') { + } + else if (operator == '*') { doubleResult = num1 * num2; } else { try { - if (num1 > num2) { + doubleResult = num1 / num2; - } else { - doubleResult = num2 / num1; - } + } catch (ArithmeticException e) { System.out.println("Exception handled " + e.getMessage()); } @@ -136,7 +128,7 @@ else if (num1 > num2) { doubleResult = num1 / num2; } catch (ArithmeticException e){ - System.out.println("Exception handled "+e.getMessage()); + System.out.println("Can't divide by zero"); } @@ -146,7 +138,7 @@ else if (num2 < num1) { doubleResult = num2 / num1; } catch (ArithmeticException e){ - System.out.println("Exception handled "+e.getMessage()); + return Double.parseDouble("Error"); } } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/StartCalculatorWithType.java b/src/main/java/com/zipcodewilmington/scientificcalculator/StartCalculatorWithType.java new file mode 100644 index 0000000..dce14f5 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/StartCalculatorWithType.java @@ -0,0 +1,98 @@ +package com.zipcodewilmington.scientificcalculator; + +import java.util.Scanner; + +public class StartCalculatorWithType { + + static SimpleCalculator sm = new SimpleCalculator(); + static ScientificCalculator sf = new ScientificCalculator(); + public static void start(){ + Scanner scan = new Scanner(System.in); + System.out.println("Please choose a calculator type:"); + System.out.println("Please enter 1 for Simple calculator"); + System.out.println("Please enter 2 for Scientific calculator"); + + int num = scan.nextInt(); + + if(num==1){ + + System.out.println("Please enter operator"); + System.out.println("" + + "addition(+) " + + "subtraction(-) " + + "division(/) " + + "multiplication(*) " + + "modulus(%) "); + + char ch = scan.next().charAt(0); + System.out.println("Please enter first number"); + double dub1 = scan.nextDouble(); + System.out.println("Please enter second number"); + double dub2 = scan.nextDouble(); + System.out.println("Result "+ sm.calculator(ch,dub1,dub2)); + } + + else { + System.out.println("You entered scientific calculator"); + System.out.println("Please enter value"); + double value = scan.nextDouble(); + System.out.println("Please choose calculation method"); + System.out.println("" + + "1-square, " + + "2-squareRoot, " + + "3-inverse, " + + "4-switchSign " + + "5-sine " + + "6-cosine " + + "7-tangent " + + "8-inverseSine " + + "9-inverseCosine " + + "10-inverseTangent " + + "11-factorial "); + int a = scan.nextInt(); + + switch (a){ + case 1: + System.out.println("Result: "+sf.square(value)); + break; + case 2: + System.out.println("Result: "+sf.squareRoot(value)); + break; + case 3: + System.out.println("Result: "+sf.inverse(value)); + break; + case 4: + System.out.println("Result "+sf.switchSign(value)); + + break; + case 5: + System.out.println("Result " + sf.sine(value)); + break; + case 6: + System.out.println("Result "+sf.cosine(value)); + break; + case 7: + System.out.println("Result "+sf.tangent(value)); + break; + case 8: + System.out.println("Result "+sf.inverseSine(value)); + break; + case 9: + System.out.println("Result "+sf.inverseCosine(value)); + break; + case 10: + System.out.println("Result "+sf.inverseTangent(value)); + break; + case 11: + System.out.println("Result "+sf.factorial(value)); + + } + } + + + + + } + + +} diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index ce7d1f5..4784dff 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertEquals; - //%%%%%%%%%%%%%%/// + /** * Created by leon on 2/9/18. */ From c9bfd51ec9312f6674e40b6c41a175427a5544d5 Mon Sep 17 00:00:00 2001 From: AliceGonzalez Date: Sun, 3 Mar 2024 09:22:41 -0500 Subject: [PATCH 8/9] Push update --- .../scientificcalculator/SimpleCalculator.java | 2 +- .../scientific_calculator/TestMainApplication.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java b/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java index fb69edf..d5b3a18 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/SimpleCalculator.java @@ -55,7 +55,7 @@ else if (operator == '%') { return doubleResult; } -////asasasasasas + public double calculator(char operator, int num1, double num2) { if (operator == '+') { diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index b4d4707..2891c1e 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -32,5 +32,4 @@ public void Subtraction_Test() { assertEquals(-7.0,simpleCalculator.calculator('-',7.0,14.0),0.0001); } - } From af08a5026da8972dd5cc3f54cf6d2b164e332e75 Mon Sep 17 00:00:00 2001 From: asanahmadli Date: Sun, 3 Mar 2024 15:22:16 -0500 Subject: [PATCH 9/9] I added some changes --- .../scientificcalculator/MainApplication.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index 683e2aa..555b44d 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -26,8 +26,8 @@ public static void main(String[] args) { // // System.out.println("Result = "+ScientificCalculator.cosine(d)); -StartCalculatorWithType.start(); -SimpleCalculator a = new SimpleCalculator(); + StartCalculatorWithType.start(); +