From e338f01065a9328cb6e52cb392c49c470792adb5 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Fri, 7 Feb 2020 17:39:01 -0500 Subject: [PATCH 01/52] gfg --- pom.xml | 8 ++++++++ .../scientificcalculator/MainApplication.java | 1 + 2 files changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index e7cb4f6b..73de514a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,5 +8,13 @@ scientific_calculator 1.0-SNAPSHOT + + + junit + junit + 4.13 + test + + \ 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 5f421325..cd46d8e3 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -13,5 +13,6 @@ public static void main(String[] args) { 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); + //i did this } } From 7efa3c43167ef1c84fe124b620b879237270b518 Mon Sep 17 00:00:00 2001 From: David Kelly Date: Fri, 7 Feb 2020 18:13:24 -0500 Subject: [PATCH 02/52] added test file --- testfile.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 testfile.md diff --git a/testfile.md b/testfile.md new file mode 100644 index 00000000..e69de29b From 747f9c399e76f84a93f2019cb9e593e6a02aeed2 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Fri, 7 Feb 2020 18:14:45 -0500 Subject: [PATCH 03/52] dsf --- .DS_Store | Bin 0 -> 6148 bytes .gitignore | 2 +- src/.DS_Store | Bin 0 -> 6148 bytes src/main/.DS_Store | Bin 0 -> 6148 bytes src/main/java/.DS_Store | Bin 0 -> 6148 bytes .../scientificcalculator/MainApplication.java | 2 +- 6 files changed, 2 insertions(+), 2 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 diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9a874b5768f336915163bb88cd434575b859f936 GIT binary patch literal 6148 zcmeH~Jr2S!425ml0g0s}V-^m;4I%_5-~tF3k&vj^b9A16778<}(6eNJu~Vz<8=6`~ zboab&MFtUB!i}=AFfm2m$tVxGT*u4pe81nUlA49C} z?O@64YO)2RT{MRe%{!}2F))pG(Sih~)xkgosK7*lF7m<7{{#Hn{6A@7N(HFEpDCdI z{V4u3`M`g7D#EfOgRk)$PGpaPQV2S&>%r5BKkQx-ySzvsH0W%E!l7ES!;KH zv9ktX>-*^w7y&HlPOLmk%$N_j;tOYdpMH*)!|itQBJHgMp3+B5_H$d10#ZNMM4T9irw zDe%t}uwk>?toc%Twm!X{*Y{cVb)%DUIm54?049DEf6&9YUwlE)m< zk%er^j=Knh3!DIf); zz>E~gV|@8Jqi52iNC7D@4+Z@DQ0UH@Y@PAxV2BZb99RzHI%Wy7c!8|R*2xOZa(b|A zwHQOZ9_?hw>uR!f_I6kfAC`AEpJHg%+hK(X&1yhF3P^#80*juHe*W+1ujcQ^n8@Auu4PPqH)~DC=`aY|^Zges(XZZ6Iz{HQ@6+Mjm#TR5vwoX=P`Vj~j6r{kv GD)0dNyb`AX literal 0 HcmV?d00001 diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..35a54bf0595027f28217af82c3d32981e121b5e7 GIT binary patch literal 6148 zcmeH~Jr2S!425mVP>H1@V-^m;4I%_5-~tF3K^+i#j?VMXLSaS~dY0@jc51bKLsN^0 z?w;4J$RHv;+$b9h6I0}!Tx68{^>MkK$MI$*w?)zl@IfZ~xlK?3DnJFO02QDDGg2TA z@_sd=XX2w!0V*&L1?>A!;KrJ4LH~3h_y_tMAK>5S|49o|DnJGPOaWc) zkNX{7D$mxB*R%R5tF~@%&@V@L`w2i|NAVi&hW%m-uqIm&6&Qa6Tm}Xz@KXg|*oF~o literal 0 HcmV?d00001 diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index cd46d8e3..c813fa1a 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -13,6 +13,6 @@ public static void main(String[] args) { 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); - //i did this + //i did thisfdsgsgfs } } From 908610105910f4f32d842e48948fc7a5955a4a0d Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Fri, 7 Feb 2020 19:13:22 -0500 Subject: [PATCH 04/52] added outline of basic functions and some sci functions, test push here. --- .../scientificcalculator/Basic.java | 33 +++++++++++++++++++ .../scientificcalculator/Sci.java | 18 ++++++++++ 2 files changed, 51 insertions(+) create mode 100644 src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java create mode 100644 src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java new file mode 100644 index 00000000..dd918c7b --- /dev/null +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java @@ -0,0 +1,33 @@ +public class Basic{ + public float add(){ + return sum; + } + public float subtract(){ + return difference; + + } + public float multiply(){ + return product; + } + + public float divide(){ + return quotient; + } + + public float square(){ + return squareResult; + + } + public float squareRoot(){ + return squareRootResult; + } + public float exponent(){ + return exponentResult; + } + public float inverse(){ + return inverseResult; + } + public float signChange(){ + return opposite; + } +} \ No newline at end of file diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java new file mode 100644 index 00000000..0834affe --- /dev/null +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -0,0 +1,18 @@ +public class Sci { + public String switchDisplayMode(){ + return displayMode; + } + public class Memory { + public void memPlus(){ + + } + public void memCLear(){ + + + } + public float recall(){ + return memNum; + } + + } +} \ No newline at end of file From a741fd20f5bc69bc807d050a38b5dc506118207d Mon Sep 17 00:00:00 2001 From: Gregory Davis Date: Fri, 7 Feb 2020 19:23:27 -0500 Subject: [PATCH 05/52] testing push --- .DS_Store | Bin 0 -> 6148 bytes .gitignore | 2 +- pom.xml | 9 ++- src/.DS_Store | Bin 0 -> 6148 bytes .../TestMainApplication.java | 68 ++++++++++++++++++ 5 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 .DS_Store create mode 100644 src/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..7656356e717be203465b01dea516027999ab8b99 GIT binary patch literal 6148 zcmeHK!EVz)5S>j@x(-6*P$@m`1&Kpcr4$jNs*)ShLk~y@BYFVT+I2)Nx!x#t8X!&O z&uBlPf5IQ|IWV)kiAYnf5uh1q_RY@D?80zo*qjV{n9e*POw0G+;0F67h1;6c|j&Outi(S;GKaHRT;K5rsfPLt} zYs4+gi|vljGj8u>R3V2UoGwO*=KWF8I3Gl*nd^HrNRzy1w||IAwYK(PUCO$wKdOHU z&h$7a!eW$n!{G<&y$Or6$l33-PUm(Qy-)h%G6T#2Gq5@a+zBKfu5L+Qi5Xx9{t*V~d{C%_ zzQfX@IXbX0R{+Esx{aVsKaG^59QqDRi#UQJY$~En74C{5Y&!ati}M|p7Hv8Rcli)* zW#Mip!mN(-D-#aFx5zCszzi%hP_^9#)&GM(-~ShrxW^1I1OF8RqSgy~U3?^0TbCY= vYOO*&K_#KM(&9V?4O5CSmP+v^suA=nG7x=-rA73h@Q;9@fg5IEr40N6a0GJ{ literal 0 HcmV?d00001 diff --git a/.gitignore b/.gitignore index de469bb3..280ab7a2 100644 --- a/.gitignore +++ b/.gitignore @@ -149,7 +149,7 @@ fabric.properties .project .classpath .settings - +.DS_store #maven build target target/ \ No newline at end of file diff --git a/pom.xml b/pom.xml index e7cb4f6b..e6b4443d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,5 +8,12 @@ scientific_calculator 1.0-SNAPSHOT - + + + junit + junit + 4.13 + test + + \ No newline at end of file diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..e9c9be1dd39c73e7a66d3e76825b859309f30a8a GIT binary patch literal 6148 zcmeHK!A{#i5S;~=Zh|Uus02q}D)o>0+#>cJauT4=U zSuq&eX@{@2cc#;Z zUVpK=x(SS;-7Wlb=Z=N5C zd$jz>`WE;B4PG7~1F{$N>H~at|H_^L&%obhfX{~z$`}dO4(-u_#+CrU0K-;b+h2cR z$OFJguy%+Mh;pewm#U=1P*OQ4mkxg<@wG#jPRc$R^T?BxR47Uc4;9*QQjtU7dImfL z^9(GzZj0~#L+s%{)c^BIzULY63_L0ZRB#X<^spqkTkkE7@7fT00%hU2+M!KBBiFGt f_$uCjT7fTQ0~iU`4lx4pKLVBp-*^W8DFZ(N(i*6| literal 0 HcmV?d00001 diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index 94e8d987..fd0b6f88 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -1,7 +1,75 @@ package com.zipcodewilmington.scientific_calculator; +import org.junit.Before; +import org.junit.Test; + +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; + /** * Created by leon on 2/9/18. */ public class TestMainApplication { + + @Test + public void testAdd1(){ + + } + + @Test + public void testAdd2(){ + + } + + @Test + public void testMinus1(){ + + } + + @Test + public void testMinus2(){ + + } + + @Test + public void testMultiply1(){ + + } + + @Test + public void testMultiply2(){ + + } + + @Test + public void testDivide1(){ + + } + + @Test + public void testDivide2(){ + + } + + @Test + public void testAdd2(){ + + } + + @Test + public void testAdd2(){ + + } + + @Test + public void testAdd2(){ + + } + + @Test + public void testAdd2(){ + + } + + + } From a387876175f3eb859ce7f52c8809818b12f2462b Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Fri, 7 Feb 2020 19:27:00 -0500 Subject: [PATCH 06/52] outlined all basic and sci functions, named all methods --- .../scientificcalculator/Sci.java | 48 +++++++++++++++++-- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index 0834affe..5ee46210 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -1,9 +1,10 @@ public class Sci { public String switchDisplayMode(){ return displayMode; + //binary,octal,decimal,hexadecimal } - public class Memory { - public void memPlus(){ + + public void memPlus(){ } public void memCLear(){ @@ -13,6 +14,45 @@ public void memCLear(){ public float recall(){ return memNum; } - + public float sine(){ + return sin; + } + public float cosine(){ + return cos; + } + public float tangent(){ + return tan; + } + public float inverseSine(){ + return invSin; + } + public float inverseCosine(){ + return invCos; + } + public float inverseTangent(){ + return invTan; + } + public String switchUnitsModeRotate(){ + return unitsMode(); + //degrees,radians } -} \ No newline at end of file + public String switchUnitsModeString(String unitsModeInput){ + return unitsModeInput; + } + public float logarithm(){ + return log; + } + public float inverseLogarithm(){ + return invLog; + } + public float naturalLogarithm(){ + return natLog; + } + public float inverseNaturalLogarithm(){ + return invNatLog; + } + public Integer factorial(){ + return fact; + } +} + From bfd2fcd53010de73796dd67e3da7f0b172b1bbeb Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Fri, 7 Feb 2020 19:27:19 -0500 Subject: [PATCH 07/52] first test commit --- .../scientificcalculator/Console.java | 15 ++++++++++++++ .../scientificcalculator/MainApplication.java | 20 ++++++++++--------- .../scientificcalculator/UserInput.java | 4 ++++ 3 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/scientificcalculator/UserInput.java diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java index 83f0e97f..d789a547 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java @@ -29,4 +29,19 @@ public static Integer getIntegerInput(String prompt) { public static Double getDoubleInput(String prompt) { return null; } + + public static void BasicMenu(){ + + System.out.printf("%-10s %-10s %-10s", "1 - Add |", "2 - Subtract |", "3 - Multiply \n"); + System.out.printf("%-10s %-10s %-10s", "4 - Divide |", "5 - Square |", "6 - Square Root \n"); + System.out.printf("%-10s %-10s %-10s", "7 - Exponent |", "8 - Inverse |", "9 - Inverse Sign"); + } + public static void SciMenu(){ + System.out.println("Display"); + System.out.println("Trig Functions"); + System.out.printf("%-10s %-10s %-10s", "1 - Sine |", "2 - Cosine |", "3 - Tangent \n"); + System.out.printf("%-10s %-10s %-10s", "4 - Inverse Sine |", "5 - Inverse Cosine |", "6 - Inverse Tangent \n"); + System.out.println("Memory"); + System.out.printf("%-10s %-10s %-10s", "7 - M+ |", "8 - MC |", "9 - MRC \n"); + } } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index c813fa1a..5d00e881 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -5,14 +5,16 @@ */ 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("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); - //i did thisfdsgsgfs +// 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("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); + System.out.printf("%-10s %-10s %-10s", "1 - Add |", "2 - Subtract |" , "3 - Multiply \n"); + System.out.printf("%-10s %-10s %-10s", "4 - Divide |", "5 - Square |" , "6 - Square Root \n"); + System.out.printf("%-10s %-10s %-10s", "7 - Exponent |", "8 - Inverse |" , "9 - Inverse Sign"); } } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/UserInput.java b/src/main/java/com/zipcodewilmington/scientificcalculator/UserInput.java new file mode 100644 index 00000000..3f363be7 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/UserInput.java @@ -0,0 +1,4 @@ +package com.zipcodewilmington.scientificcalculator; + +public class UserInput { +} From ebb6473d911d954f1c6aed0446b7c78b804bf27a Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Fri, 7 Feb 2020 19:36:19 -0500 Subject: [PATCH 08/52] gitignore DS --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 75d96cd2..5e39e6d5 100644 --- a/.gitignore +++ b/.gitignore @@ -149,7 +149,7 @@ fabric.properties .project .classpath .settings - +.DS_store #maven build target target/ From 50afc4da75bd2405ccdcf53aa6798a0aca9287e4 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Fri, 7 Feb 2020 19:48:26 -0500 Subject: [PATCH 09/52] delete ds_Store --- .DS_Store | Bin 6148 -> 0 bytes src/.DS_Store | Bin 6148 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 src/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 9a874b5768f336915163bb88cd434575b859f936..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425ml0g0s}V-^m;4I%_5-~tF3k&vj^b9A16778<}(6eNJu~Vz<8=6`~ zboab&MFtUB!i}=AFfm2m$tVxGT*u4pe81nUlA49C} z?O@64YO)2RT{MRe%{!}2F))pG(Sih~)xkgosK7*lF7m<7{{#Hn{6A@7N(HFEpDCdI z{V4u3`M`g7D#EfOgRk)$PGpaPQV2S&>%r5BKkQx-ySzvsH0W%E!l7ES!;KH zv9ktX>-*^w7y&HlPOLmk%$N_j;tOYdpMH*)!|itQBJHgMp3+B5_H$d10#ZNMM4T9irw zDe%t}uwk>?toc%Twm!X{*Y{cVb)%DUIm54?049DEf6&9YUwlE Date: Sat, 8 Feb 2020 10:11:21 -0500 Subject: [PATCH 10/52] Added more test fields --- .../TestMainApplication.java | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index fd0b6f88..d9088547 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -51,25 +51,59 @@ public void testDivide2(){ } @Test - public void testAdd2(){ + public void testDivideByZero(){ } @Test - public void testAdd2(){ + public void testSquare1(){ } @Test - public void testAdd2(){ + public void testSquare2(){ } @Test - public void testAdd2(){ + public void testSquareRoot1(){ + + } + + @Test + public void testSquareRoot2(){ + + } + + @Test + public void testInverse1(){ + + } + + @Test + public void testInverse2(){ } + @Test + public void testPosToNeg1(){ + + } + + @Test + public void testPosToNeg2(){ + + } + + @Test + public void test(){ + + } + + @Test + public void test(){ + + } } From 6008541e085d8d5f20fc941b078ecc1abd526811 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sat, 8 Feb 2020 10:13:25 -0500 Subject: [PATCH 11/52] added more menu options --- .gitignore | 2 +- .../scientificcalculator/Console.java | 34 ++++++++++++++----- .../scientificcalculator/MainApplication.java | 31 +++++++++++++---- 3 files changed, 52 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 5e39e6d5..c1cd3941 100644 --- a/.gitignore +++ b/.gitignore @@ -149,7 +149,7 @@ fabric.properties .project .classpath .settings -.DS_store +.DS_Store #maven build target target/ diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java index d789a547..3fc14dfe 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java @@ -22,26 +22,44 @@ public static String getStringInput(String prompt) { return userInput; } - public static Integer getIntegerInput(String prompt) { - return null; - } - public static Double getDoubleInput(String prompt) { - return null; - } +// public static Integer getIntegerInput(String prompt) { +// +// } + + //public static Double getDoubleInput(String prompt) { + // return null; + //} public static void BasicMenu(){ System.out.printf("%-10s %-10s %-10s", "1 - Add |", "2 - Subtract |", "3 - Multiply \n"); System.out.printf("%-10s %-10s %-10s", "4 - Divide |", "5 - Square |", "6 - Square Root \n"); - System.out.printf("%-10s %-10s %-10s", "7 - Exponent |", "8 - Inverse |", "9 - Inverse Sign"); + System.out.printf("%-10s %-10s %-10s", "7 - Exponent |", "8 - Inverse |", "9 - Pos <--> Neg \n"); + ForAllMenus(); } public static void SciMenu(){ System.out.println("Display"); System.out.println("Trig Functions"); System.out.printf("%-10s %-10s %-10s", "1 - Sine |", "2 - Cosine |", "3 - Tangent \n"); System.out.printf("%-10s %-10s %-10s", "4 - Inverse Sine |", "5 - Inverse Cosine |", "6 - Inverse Tangent \n"); + ForAllMenus(); + } + public static void ForAllMenus() { + System.out.println("**********"); System.out.println("Memory"); - System.out.printf("%-10s %-10s %-10s", "7 - M+ |", "8 - MC |", "9 - MRC \n"); + System.out.println("**********"); + System.out.printf("%-10s %-10s %-10s", "a - M+ |", "b - MC |", "c - MRC \n"); + System.out.println("**********"); + System.out.println("Clear"); + System.out.println("**********"); + System.out.printf("%-10s %-10s", "d - Error |", "e - Display | \n"); + System.out.println("**********"); + System.out.println("Back - f"); + System.out.println("**********"); + System.out.println("Main Menu - g"); + System.out.println("**********"); + System.out.println("Exit - h"); + System.out.println("**********"); } } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index 5d00e881..f804b65e 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -1,20 +1,39 @@ package com.zipcodewilmington.scientificcalculator; + +import static com.zipcodewilmington.scientificcalculator.Console.*; + + /** * Created by leon on 2/9/18. */ 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"); + Console.println("Welcome to my calculator!"); + String s = Console.getStringInput("1 - Basic | 2 - Scientific | 3 - Exit"); + if(s.equals("1")) { + BasicMenu(); + s = Console.getStringInput("Please select an option"); + } + else if(s.equals("2")) { + SciMenu(); + s = Console.getStringInput("Please select an option"); + } + else if(s.equals("3")) { + System.exit(0); + } + else { + System.out.println("Please enter a valid response"); + } + + //Integer i = Console.getIntegerInput("1 - Basic | 2 - Scientific | 3 - Exit"); // 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); - System.out.printf("%-10s %-10s %-10s", "1 - Add |", "2 - Subtract |" , "3 - Multiply \n"); - System.out.printf("%-10s %-10s %-10s", "4 - Divide |", "5 - Square |" , "6 - Square Root \n"); - System.out.printf("%-10s %-10s %-10s", "7 - Exponent |", "8 - Inverse |" , "9 - Inverse Sign"); +// System.out.printf("%-10s %-10s %-10s", "1 - Add |", "2 - Subtract |" , "3 - Multiply \n"); +// System.out.printf("%-10s %-10s %-10s", "4 - Divide |", "5 - Square |" , "6 - Square Root \n"); +// System.out.printf("%-10s %-10s %-10s", "7 - Exponent |", "8 - Inverse |" , "9 - Inverse Sign"); } } From af394d6b21da57cd53dc4ef3f1b773f6d05f86f8 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 8 Feb 2020 10:27:26 -0500 Subject: [PATCH 12/52] added Classes trying to push --- .gitignore | 1 + src/.idea/.gitignore | 2 ++ src/.idea/misc.xml | 6 ++++++ src/.idea/modules.xml | 8 ++++++++ src/.idea/vcs.xml | 6 ++++++ 5 files changed, 23 insertions(+) create mode 100644 src/.idea/.gitignore create mode 100644 src/.idea/misc.xml create mode 100644 src/.idea/modules.xml create mode 100644 src/.idea/vcs.xml diff --git a/.gitignore b/.gitignore index c1cd3941..1d24f508 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ .idea/**/sqlDataSources.xml .idea/**/dynamic.xml .idea/**/uiDesigner.xml +.DS_Store # Gradle: .idea/**/gradle.xml diff --git a/src/.idea/.gitignore b/src/.idea/.gitignore new file mode 100644 index 00000000..e7e9d11d --- /dev/null +++ b/src/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml new file mode 100644 index 00000000..28a804d8 --- /dev/null +++ b/src/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/src/.idea/modules.xml b/src/.idea/modules.xml new file mode 100644 index 00000000..f669a0e5 --- /dev/null +++ b/src/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml new file mode 100644 index 00000000..6c0b8635 --- /dev/null +++ b/src/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 36a04e3748d5d9c7cca03e839dbea752fd8c42aa Mon Sep 17 00:00:00 2001 From: Gregory Davis Date: Sat, 8 Feb 2020 10:29:56 -0500 Subject: [PATCH 13/52] Even more test shells --- .../TestMainApplication.java | 93 ++++++++++++++++++- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index d9088547..ae087965 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -96,14 +96,103 @@ public void testPosToNeg2(){ } @Test - public void test(){ + public void testSine1(){ } @Test - public void test(){ + public void testTestSine2(){ } + @Test + public void testCosine1(){ + + } + + @Test + public void testCosine2(){ + + } + + @Test + public void testTangent1(){ + + } + + @Test + public void testTangent2(){ + + } + + @Test + public void testArcsine1(){ + + } + + @Test + public void testArcsine2(){ + + } + + @Test + public void testArccosine1(){ + + } + + @Test + public void testArccosine2(){ + + } + + @Test + public void testArctangent1(){ + + } + + @Test + public void testArctangent2(){ + + } + + @Test + public void testLog1(){ + + } + + @Test + public void testLog2(){ + + } + + @Test + public void testInverseLog1(){ + + } + + @Test + public void testInverseLog2(){ + + } + + @Test + public void testNaturalLog1(){ + + } + + @Test + public void testNaturalLog2(){ + + } + + @Test + public void testEPower1(){ + + } + + @Test + public void testEPower2(){ + + } } From d74a46ba94be70541595c518f4ae165b2edd1b7c Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 8 Feb 2020 10:48:49 -0500 Subject: [PATCH 14/52] completed Basic methods. --- .../scientificcalculator/Basic.java | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java index dd918c7b..3b2440d8 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java @@ -1,33 +1,50 @@ public class Basic{ - public float add(){ + public float add(float a, float b){ + float sum = a+b; return sum; } - public float subtract(){ + public float subtract(float a, float b){ + float difference = a-b; return difference; } - public float multiply(){ + public float multiply(float a, float b){ + float product = a*b; return product; } - public float divide(){ + public float divide(float a, float b){ + float quotient = a/b; return quotient; } - public float square(){ + public float square(float a){ + float squareResult = (float) Math.pow(a,2); return squareResult; } - public float squareRoot(){ + public float squareRoot(float a){ + float squareRootResult = (float) Math.sqrt(a); return squareRootResult; } - public float exponent(){ + public float exponent(float a, float b){ + float exponentResult = (float) Math.pow(a,b); return exponentResult; } - public float inverse(){ + public float inverse(float a){ + float inverseResult = 1/a; return inverseResult; } - public float signChange(){ + public float signChange(float a){ + float opposite = 0; + if (a > 0){ + opposite = a - (2 * Math.abs(a)); + } else if(a < 0){ + opposite = a + (2 * Math.abs(b)); + } else { + opposite = 0; + } + return opposite; } } \ No newline at end of file From 5118876999753e8ac809719478812bc136af6ce8 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 8 Feb 2020 10:59:50 -0500 Subject: [PATCH 15/52] completed Basic methods --- .../com/zipcodewilmington/scientificcalculator/Basic.java | 4 +++- .../java/com/zipcodewilmington/scientificcalculator/Sci.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java index 3b2440d8..c4686c88 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java @@ -1,3 +1,5 @@ +package com.zipcodewilmington.scientificcalculator; + public class Basic{ public float add(float a, float b){ float sum = a+b; @@ -40,7 +42,7 @@ public float signChange(float a){ if (a > 0){ opposite = a - (2 * Math.abs(a)); } else if(a < 0){ - opposite = a + (2 * Math.abs(b)); + opposite = a + (2 * Math.abs(a)); } else { opposite = 0; } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index 5ee46210..39145616 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -1,3 +1,5 @@ +package com.zipcodewilmington.scientificcalculator; + public class Sci { public String switchDisplayMode(){ return displayMode; From 933a359409e5f5b4ecadaf625f618d78dac19600 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sat, 8 Feb 2020 11:35:52 -0500 Subject: [PATCH 16/52] string calc methods --- .../scientificcalculator/Console.java | 14 +++++--- .../scientificcalculator/EmmaTestMethods.java | 32 +++++++++++++++++++ .../scientificcalculator/MainApplication.java | 14 +++++++- .../scientificcalculator/UserInput.java | 4 --- 4 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/zipcodewilmington/scientificcalculator/EmmaTestMethods.java delete mode 100644 src/main/java/com/zipcodewilmington/scientificcalculator/UserInput.java diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java index 3fc14dfe..044c4c74 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java @@ -23,9 +23,7 @@ public static String getStringInput(String prompt) { } -// public static Integer getIntegerInput(String prompt) { -// -// } + //public static Double getDoubleInput(String prompt) { // return null; @@ -53,7 +51,7 @@ public static void ForAllMenus() { System.out.println("**********"); System.out.println("Clear"); System.out.println("**********"); - System.out.printf("%-10s %-10s", "d - Error |", "e - Display | \n"); + System.out.printf("%-10s %-10s", "d - Error |", "e - Display \n"); System.out.println("**********"); System.out.println("Back - f"); System.out.println("**********"); @@ -62,4 +60,12 @@ public static void ForAllMenus() { System.out.println("Exit - h"); System.out.println("**********"); } + + public static void ExitCalc(){ + System.exit(0); + } + + public static void GoToMainMenu(){ + System.exit(0); + } } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/EmmaTestMethods.java b/src/main/java/com/zipcodewilmington/scientificcalculator/EmmaTestMethods.java new file mode 100644 index 00000000..af8683e3 --- /dev/null +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/EmmaTestMethods.java @@ -0,0 +1,32 @@ +package com.zipcodewilmington.scientificcalculator; + + +import java.util.stream.IntStream; + +public class EmmaTestMethods { + public int a; + public int b; + public String result; + + public static String Addition(String x) { + int[] intArray = stringArrayToIntArray(x); + int sum = IntStream.of(intArray).sum(); + String result = String.valueOf(sum); + return result; + } + + + + public static int[] stringArrayToIntArray(String intString) { + String[] intStringSplit = intString.split(" "); //Split by spaces + int[] result = new int[intStringSplit.length]; //Used to store our ints + + for (int i = 0; i < intStringSplit.length; i++) { + //parse and store each value into int[] to be returned + result[i] = Integer.parseInt(intStringSplit[i]); + } + return result; + } + } + + diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index f804b65e..9cfe741c 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -1,6 +1,6 @@ package com.zipcodewilmington.scientificcalculator; - +import static com.zipcodewilmington.scientificcalculator.EmmaTestMethods.*; import static com.zipcodewilmington.scientificcalculator.Console.*; @@ -14,10 +14,22 @@ public static void main(String[] args) { if(s.equals("1")) { BasicMenu(); s = Console.getStringInput("Please select an option"); + switch (s) { + case "1": +// s = Console.getStringInput("First number to add"); +// String num1 = s; +// s = Console.getStringInput("Second number to add"); +// String num2 = s; +// System.out.println(Addition(num1, num2)); + s = Console.getStringInput(" Enter in following format \n a a a a \n Press enter when done"); + String sumString = s; + System.out.println((Addition(sumString)); + } } else if(s.equals("2")) { SciMenu(); s = Console.getStringInput("Please select an option"); + } else if(s.equals("3")) { System.exit(0); diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/UserInput.java b/src/main/java/com/zipcodewilmington/scientificcalculator/UserInput.java deleted file mode 100644 index 3f363be7..00000000 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/UserInput.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.zipcodewilmington.scientificcalculator; - -public class UserInput { -} From 78da705d51d3223a21edd098390345ad3e61116f Mon Sep 17 00:00:00 2001 From: Gregory Davis Date: Sat, 8 Feb 2020 11:37:36 -0500 Subject: [PATCH 17/52] Changing test code --- src/main/.DS_Store | Bin 6148 -> 6148 bytes src/main/java/.DS_Store | Bin 6148 -> 6148 bytes .../TestMainApplication.java | 11 +++++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/.DS_Store b/src/main/.DS_Store index 55c1fcbeb4ba2bef02771ea2748f3e4b0ea5c07d..697099d5c0f4bb5bdfe9acffa3c02325d67aa3cb 100644 GIT binary patch delta 385 zcmZoMXfc=|#>B)qF;R?_gMop8V`8F+EEA9c0?a_n$iN`L;F*)3oRpKF1mp{BOkB=b z50YVF$YMxjC}T)OmIaDi1F^<`FaWZU)FqV{7eGxpkyMbASzKaZaGjBfnT3^&or8mm zgNv6dHaH`{Jh&vWq_o&6u_zkE3rH-r7fQWN`UP)qR zUTP6ocV|8pkRmu2L~qyXS{%Tb+x6rj)IZ7ajlL*wYj;0 zj)IA?S#2#Rhq$Vtt!F}RWmR=eZQTs87Z@0U!2kyQU{VRn15z`A7#AjHu~68Ik%57Mg&~U}k)ezsF{L;;Cn-Na2P6mtOc06z#06pj2DtoY sL*{ENn;n=hFl}b%;O79E1r+(tJeglakrSjk0i<)X36JvT7?Bms0OXbyQ2+n{ diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store index 35a54bf0595027f28217af82c3d32981e121b5e7..ae0f618cbbca7e0d14397a44b22062da8d6d2b43 100644 GIT binary patch delta 378 zcmZoMXfc=|#>B)qF;R?_gMop8V`8F+G!u{k0?a_n$iN`Lke{5Clb;0S32aPU$yg5( zXJ$xd$Y;p)%t6QjMXiBY<3AVxS#VWJ<;4Y16HX)*A@+T7egN5RC{ zthSbuLtNF+)-xfuvZ}hKwr&R40}PD7000AiD9yki3t`O!QqWK+3ogpb$bUrPW0 delta 111 zcmZoMXfc=|#>AjHu~68Ak%57MnIV}WpCLD;I5{UNKR*W~1O`k{8YBS30t`_3&4$d^ pST;K_Ut-$K&cV+CGzlp3oq009h$1IQZ30N&WD_3c%`qY?m;s7H6&3&h diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index ae087965..14c866fe 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -12,12 +12,14 @@ public class TestMainApplication { @Test public void testAdd1(){ - + Basic calculator = new Basic; + assertEquals("11", calculator.Addition("5 6")); } @Test public void testAdd2(){ - + Basic calculator = new Basic(); + assertEquals("15", calculator.Addition("1 2 3 4 5")); } @Test @@ -40,6 +42,11 @@ public void testMultiply2(){ } + @Test + public void testMultiplyByZero(){ + + } + @Test public void testDivide1(){ From 8737a56f2ccffbdfecc88a5d0a3187aca24d0fc8 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 8 Feb 2020 11:44:05 -0500 Subject: [PATCH 18/52] completed Sci methods --- .../scientificcalculator/Sci.java | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index 39145616..f8a25562 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -16,22 +16,28 @@ public void memCLear(){ public float recall(){ return memNum; } - public float sine(){ + public float sine(float a){ + float sin = (float) Math.sin(a); return sin; } - public float cosine(){ + public float cosine(float a){ + float cos = (float) Math.cos(a); return cos; } - public float tangent(){ + public float tangent(float a){ + float tan = (float) Math.tan(a); return tan; } - public float inverseSine(){ + public float inverseSine(float a){ + float invSin = (float) Math.asin(a); return invSin; } - public float inverseCosine(){ + public float inverseCosine(float a){ + float invCos = (float) Math.acos(a); return invCos; } - public float inverseTangent(){ + public float inverseTangent(float a){ + float invTan = (float) Math.atan(a); return invTan; } public String switchUnitsModeRotate(){ @@ -41,19 +47,27 @@ public String switchUnitsModeRotate(){ public String switchUnitsModeString(String unitsModeInput){ return unitsModeInput; } - public float logarithm(){ + public float logarithm(float a){ + float log = (float) Math.log10(a); return log; } - public float inverseLogarithm(){ + public float inverseLogarithm(float a){ + float invLog = (float) 1 / Math.log10(a); return invLog; } - public float naturalLogarithm(){ + public float naturalLogarithm(float a){ + float naturalLogarithm = (float) Math.log(a); return natLog; } - public float inverseNaturalLogarithm(){ + public float inverseNaturalLogarithm(float a){ + float invNatLog = (float) (1/Math.log(a)); return invNatLog; } - public Integer factorial(){ + public Integer factorial(float a){ + float fact = 0; + for (int i = 0; i< a;a++){ + fact *= a-1; + } return fact; } } From 4f4ec5b75853da971e418b3ca0890a1e0899e0fe Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sat, 8 Feb 2020 11:47:05 -0500 Subject: [PATCH 19/52] ff --- .../scientificcalculator/MainApplication.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index 9cfe741c..34735e98 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -16,11 +16,7 @@ public static void main(String[] args) { s = Console.getStringInput("Please select an option"); switch (s) { case "1": -// s = Console.getStringInput("First number to add"); -// String num1 = s; -// s = Console.getStringInput("Second number to add"); -// String num2 = s; -// System.out.println(Addition(num1, num2)); + s = Console.getStringInput(" Enter in following format \n a a a a \n Press enter when done"); String sumString = s; System.out.println((Addition(sumString)); @@ -38,14 +34,5 @@ else if(s.equals("3")) { System.out.println("Please enter a valid response"); } - //Integer i = Console.getIntegerInput("1 - Basic | 2 - Scientific | 3 - Exit"); -// 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); -// System.out.printf("%-10s %-10s %-10s", "1 - Add |", "2 - Subtract |" , "3 - Multiply \n"); -// System.out.printf("%-10s %-10s %-10s", "4 - Divide |", "5 - Square |" , "6 - Square Root \n"); -// System.out.printf("%-10s %-10s %-10s", "7 - Exponent |", "8 - Inverse |" , "9 - Inverse Sign"); - } + } From c8b5fe261d22dd364a9e47b18b7b8ab5f35deae3 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 8 Feb 2020 11:56:06 -0500 Subject: [PATCH 20/52] reverted Basic to float methods --- .../java/com/zipcodewilmington/scientificcalculator/Basic.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java index c4686c88..25fa1521 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.scientificcalculator; +import java.util.stream.IntStream; + public class Basic{ public float add(float a, float b){ float sum = a+b; From b10377e9ad5133476f3adce2a7e4908537e9f5a2 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 8 Feb 2020 12:05:08 -0500 Subject: [PATCH 21/52] error-free Basic --- .../com/zipcodewilmington/scientificcalculator/Basic.java | 2 -- .../com/zipcodewilmington/scientificcalculator/Sci.java | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java index 25fa1521..c4686c88 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java @@ -1,7 +1,5 @@ package com.zipcodewilmington.scientificcalculator; -import java.util.stream.IntStream; - public class Basic{ public float add(float a, float b){ float sum = a+b; diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index f8a25562..ac49c606 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -2,6 +2,7 @@ public class Sci { public String switchDisplayMode(){ + return displayMode; //binary,octal,decimal,hexadecimal } @@ -52,7 +53,7 @@ public float logarithm(float a){ return log; } public float inverseLogarithm(float a){ - float invLog = (float) 1 / Math.log10(a); + float invLog = (float) (1 / Math.log10(a)); return invLog; } public float naturalLogarithm(float a){ @@ -63,8 +64,8 @@ public float inverseNaturalLogarithm(float a){ float invNatLog = (float) (1/Math.log(a)); return invNatLog; } - public Integer factorial(float a){ - float fact = 0; + public Integer factorial(Integer a){ + Integer fact = a; for (int i = 0; i< a;a++){ fact *= a-1; } From 0d31b3fcbe4b31df947b0ffd0d58d90baa743d53 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 8 Feb 2020 12:14:06 -0500 Subject: [PATCH 22/52] error-free Sci --- .../com/zipcodewilmington/scientificcalculator/Sci.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index ac49c606..d7862a9a 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -2,7 +2,7 @@ public class Sci { public String switchDisplayMode(){ - + String displayMode = ""; return displayMode; //binary,octal,decimal,hexadecimal } @@ -15,6 +15,7 @@ public void memCLear(){ } public float recall(){ + float memNum = 0; return memNum; } public float sine(float a){ @@ -42,7 +43,8 @@ public float inverseTangent(float a){ return invTan; } public String switchUnitsModeRotate(){ - return unitsMode(); + String unitsMode = ""; + return unitsMode; //degrees,radians } public String switchUnitsModeString(String unitsModeInput){ @@ -57,7 +59,7 @@ public float inverseLogarithm(float a){ return invLog; } public float naturalLogarithm(float a){ - float naturalLogarithm = (float) Math.log(a); + float natLog = (float) Math.log(a); return natLog; } public float inverseNaturalLogarithm(float a){ From 8a907e1ae2c5a3f5b3f202daac7ab77fc1f19675 Mon Sep 17 00:00:00 2001 From: Gregory Davis Date: Sat, 8 Feb 2020 12:14:35 -0500 Subject: [PATCH 23/52] more test fixing --- .../zipcodewilmington/scientificcalculator/Basic.java | 2 ++ .../scientific_calculator/TestMainApplication.java | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java index dd918c7b..5dc9d2ed 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java @@ -1,3 +1,5 @@ +package com.zipcodewilmington.scientificcalculator; + public class Basic{ public float add(){ return sum; diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index 14c866fe..a28fd6f2 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.scientific_calculator; +import com.zipcodewilmington.scientificcalculator.Basic; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -13,15 +15,15 @@ public class TestMainApplication { @Test public void testAdd1(){ Basic calculator = new Basic; - assertEquals("11", calculator.Addition("5 6")); + Assert.assertEquals("11", calculator.add("5 6")); } @Test public void testAdd2(){ Basic calculator = new Basic(); - assertEquals("15", calculator.Addition("1 2 3 4 5")); + Assert.assertEquals("15", calculator.add("1 2 3 4 5")); } - +/* @Test public void testMinus1(){ @@ -201,5 +203,5 @@ public void testEPower1(){ public void testEPower2(){ } - +*/ } From 46c4d1fb7f2dfd94c079bff4d7d3bfb3f44dba8c Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sat, 8 Feb 2020 12:23:23 -0500 Subject: [PATCH 24/52] fd --- .../scientificcalculator/EmmaTestMethods.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/EmmaTestMethods.java b/src/main/java/com/zipcodewilmington/scientificcalculator/EmmaTestMethods.java index af8683e3..87fcdfe9 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/EmmaTestMethods.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/EmmaTestMethods.java @@ -8,11 +8,8 @@ public class EmmaTestMethods { public int b; public String result; - public static String Addition(String x) { - int[] intArray = stringArrayToIntArray(x); - int sum = IntStream.of(intArray).sum(); - String result = String.valueOf(sum); - return result; + public static Integer Addition(int x, int y) { + return x + y; } From 1c0ca77650fda047b1fd7996af06f6f6a932bddf Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sat, 8 Feb 2020 12:26:24 -0500 Subject: [PATCH 25/52] dfsa --- .../scientificcalculator/MainApplication.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index 34735e98..3d2bac4f 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -13,14 +13,29 @@ public static void main(String[] args) { String s = Console.getStringInput("1 - Basic | 2 - Scientific | 3 - Exit"); if(s.equals("1")) { BasicMenu(); + s = Console.getStringInput("Please select an option"); - switch (s) { - case "1": + if(s.equals("1")){ + Integer curInt = 0; + Integer pastInt = 0; + curInt = Console.getIntInput("Please enter a number\nEnter x when done"); + while(curInt != -0){ + System.out.println(curInt); + Addition(pastInt, curInt); + pastInt = curInt; - s = Console.getStringInput(" Enter in following format \n a a a a \n Press enter when done"); - String sumString = s; - System.out.println((Addition(sumString)); + } } +// else if(s.equals("2")) { +// s = Console.getStringInput(" Enter in following format \n a a a a \n Press enter when done"); +// String resString = s; +// System.out.println((Addition(resString)); +// } +// else if(s.equals("3")) { +// s = Console.getStringInput(" Enter in following format \n a a a a \n Press enter when done"); +// String resString = s; +// System.out.println((Addition(resString))); +// } } else if(s.equals("2")) { SciMenu(); @@ -35,4 +50,5 @@ else if(s.equals("3")) { } + } } From c7e0337a391d0e6639e3fa2a72eff3d5639c19f5 Mon Sep 17 00:00:00 2001 From: Gregory Davis Date: Sat, 8 Feb 2020 12:28:43 -0500 Subject: [PATCH 26/52] attempting to fix mistakes --- .../scientific_calculator/TestMainApplication.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index a28fd6f2..168c58b4 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -15,13 +15,13 @@ public class TestMainApplication { @Test public void testAdd1(){ Basic calculator = new Basic; - Assert.assertEquals("11", calculator.add("5 6")); + Assert.assertEquals(5, calculator.add(2, 3)); } @Test public void testAdd2(){ Basic calculator = new Basic(); - Assert.assertEquals("15", calculator.add("1 2 3 4 5")); + Assert.assertEquals(15, calculator.add(7, 8)); } /* @Test From 2016177588a2649f57ae69865e9c8f2c95e50da9 Mon Sep 17 00:00:00 2001 From: Gregory Davis Date: Sat, 8 Feb 2020 12:36:59 -0500 Subject: [PATCH 27/52] updating tests --- .../scientific_calculator/TestMainApplication.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index 168c58b4..a1809904 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -15,13 +15,13 @@ public class TestMainApplication { @Test public void testAdd1(){ Basic calculator = new Basic; - Assert.assertEquals(5, calculator.add(2, 3)); + Assert.assertEquals(5, calculator.add(2, 3), 0); } @Test public void testAdd2(){ Basic calculator = new Basic(); - Assert.assertEquals(15, calculator.add(7, 8)); + Assert.assertEquals(15, calculator.add(7, 8), 0); } /* @Test From 04e19f9423f9b75320859931c3be996af319d7cd Mon Sep 17 00:00:00 2001 From: Gregory Davis Date: Sat, 8 Feb 2020 12:51:37 -0500 Subject: [PATCH 28/52] trying to get tests to work --- .../scientific_calculator/TestBasic.java | 21 +++++++++++++++++++ .../TestMainApplication.java | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/zipcodewilmington/scientific_calculator/TestBasic.java diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestBasic.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestBasic.java new file mode 100644 index 00000000..539c033e --- /dev/null +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestBasic.java @@ -0,0 +1,21 @@ +package com.zipcodewilmington.scientific_calculator; + +import com.zipcodewilmington.scientificcalculator.Basic; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +public class TestBasic { + + @Test + public void testAdd1(){ + Basic calculator = new Basic(); + Assert.assertEquals(5, calculator.add(2, 3), 0); + } + + @Test + public void testAdd2(){ + Basic calculator = new Basic(); + Assert.assertEquals(15, calculator.add(7, 8), 0); + } +} diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index a1809904..5c3aecd6 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -14,7 +14,7 @@ public class TestMainApplication { @Test public void testAdd1(){ - Basic calculator = new Basic; + Basic calculator = new Basic(); Assert.assertEquals(5, calculator.add(2, 3), 0); } From e4e6ecbd6109c06577870ad45137571de60c8cc0 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sat, 8 Feb 2020 13:00:15 -0500 Subject: [PATCH 29/52] 1:00 --- .../scientificcalculator/Console.java | 17 +++++++++++------ .../scientificcalculator/MainApplication.java | 13 +++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java index 044c4c74..653bd3fb 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java @@ -21,20 +21,25 @@ public static String getStringInput(String prompt) { String userInput = scanner.nextLine(); return userInput; } - + public static Integer getIntInput(String prompt) { + Scanner scanner = new Scanner(System.in); + println(prompt); + Integer userInput = scanner.nextInt(); + return userInput; + } //public static Double getDoubleInput(String prompt) { - // return null; + // return null; //} public static void BasicMenu(){ - System.out.printf("%-10s %-10s %-10s", "1 - Add |", "2 - Subtract |", "3 - Multiply \n"); - System.out.printf("%-10s %-10s %-10s", "4 - Divide |", "5 - Square |", "6 - Square Root \n"); - System.out.printf("%-10s %-10s %-10s", "7 - Exponent |", "8 - Inverse |", "9 - Pos <--> Neg \n"); - ForAllMenus(); + System.out.printf("%-10s %-10s %-10s", "1 - Add |", "2 - Subtract |", "3 - Multiply \n"); + System.out.printf("%-10s %-10s %-10s", "4 - Divide |", "5 - Square |", "6 - Square Root \n"); + System.out.printf("%-10s %-10s %-10s", "7 - Exponent |", "8 - Inverse |", "9 - Pos <--> Neg \n"); + ForAllMenus(); } public static void SciMenu(){ System.out.println("Display"); diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index 3d2bac4f..d2234ee5 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -16,12 +16,13 @@ public static void main(String[] args) { s = Console.getStringInput("Please select an option"); if(s.equals("1")){ - Integer curInt = 0; - Integer pastInt = 0; - curInt = Console.getIntInput("Please enter a number\nEnter x when done"); - while(curInt != -0){ - System.out.println(curInt); - Addition(pastInt, curInt); + int curInt = 0; + int pastInt = 0; + s = Console.getStringInput("Please enter a number\nEnter x when done"); + while(!s.equals("x")){ + System.out.print("Please enter a number\nEnter x when done"); + curInt = Integer.parseInt(s); + System.out.println(Addition(pastInt, curInt)); pastInt = curInt; } From 34fa0c98a6eade0c6def8a1e82f04a332ee9a448 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 8 Feb 2020 13:01:58 -0500 Subject: [PATCH 30/52] 1:00 update --- .../scientificcalculator/Sci.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index d7862a9a..1dc4fe48 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -1,21 +1,25 @@ package com.zipcodewilmington.scientificcalculator; public class Sci { - public String switchDisplayMode(){ + public String switchDisplayModeToBinary(float a){ String displayMode = ""; - return displayMode; + String converted = ""; + return converted; //binary,octal,decimal,hexadecimal } - public void memPlus(){ + float memNum = 0; + public void memPlus(float a){ + memNum = a; } - public void memCLear(){ + public void memClear(){ //needs work + } public float recall(){ - float memNum = 0; + return memNum; } public float sine(float a){ From 6875c90baf9107cf190795f6ffc8c232dd285b23 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 8 Feb 2020 13:06:08 -0500 Subject: [PATCH 31/52] 1:06 update --- .../java/com/zipcodewilmington/scientificcalculator/Sci.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index 1dc4fe48..a8419036 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -1,9 +1,10 @@ package com.zipcodewilmington.scientificcalculator; public class Sci { - public String switchDisplayModeToBinary(float a){ + public String switchDisplayModeToBinary(Integer a){ String displayMode = ""; - String converted = ""; + String converted = Integer.toString(a,2); + return converted; //binary,octal,decimal,hexadecimal } From a01c89e248ffa8def7dfbd263865d729f9622bba Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 8 Feb 2020 13:53:17 -0500 Subject: [PATCH 32/52] updated Sci --- .../scientificcalculator/Sci.java | 56 ++++++++++++++++--- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index a8419036..2a3cdacd 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -6,7 +6,29 @@ public String switchDisplayModeToBinary(Integer a){ String converted = Integer.toString(a,2); return converted; - //binary,octal,decimal,hexadecimal + + } + public String switchDisplayModeToHexadecimal(Integer a){ + String displayMode = ""; + String converted = Integer.toString(a,16); + + + return converted; + + } + public String switchDisplayModeToOctal(Integer a){ + String displayMode = ""; + String converted = Integer.toString(a,8); + + return converted; + + } + public String switchDisplayModeToDecimal(Integer a){ + String displayMode = ""; + String converted = Integer.toString(a,10); + + return converted; + } float memNum = 0; @@ -14,7 +36,7 @@ public void memPlus(float a){ memNum = a; } - public void memClear(){ //needs work + public void memClear(){ //needs work @@ -47,13 +69,33 @@ public float inverseTangent(float a){ float invTan = (float) Math.atan(a); return invTan; } - public String switchUnitsModeRotate(){ - String unitsMode = ""; - return unitsMode; + String unitsMode = "Radians"; + public float switchUnitsModeRotate(float a){ + float converted = 0; + if (unitsMode.equals("Radians")) { + unitsMode = "Degrees"; + converted = (float) Math.toDegrees(a); + } else { + unitsMode = "Radians"; + converted = (float) Math.toRadians(a); + } + return converted; //degrees,radians } - public String switchUnitsModeString(String unitsModeInput){ - return unitsModeInput; + + public float switchUnitsModeString(String unitsModeInput, float a){ + float converted = 0; + if (unitsModeInput.equals("Degrees")){ + converted = (float) Math.toDegrees(a); + return converted; + } else if (unitsModeInput.equals("Radians")){ + converted = (float) Math.toRadians(a); + return converted; + } else { + System.out.println("Invalid unit type, try again."); + return converted; + } + } public float logarithm(float a){ float log = (float) Math.log10(a); From dff6d9d8035664c6a09aa1e3c1ccaae713f1bd09 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sat, 8 Feb 2020 14:24:58 -0500 Subject: [PATCH 33/52] most of menu created --- .../scientificcalculator/Console.java | 81 +++++-- .../scientificcalculator/MainApplication.java | 203 ++++++++++++++++-- 2 files changed, 238 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java index 653bd3fb..7fb646d3 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java @@ -2,6 +2,8 @@ import java.util.Scanner; +import static com.zipcodewilmington.scientificcalculator.EmmaTestMethods.Addition; + /** * Created by leon on 2/9/18. */ @@ -41,36 +43,69 @@ public static void BasicMenu(){ System.out.printf("%-10s %-10s %-10s", "7 - Exponent |", "8 - Inverse |", "9 - Pos <--> Neg \n"); ForAllMenus(); } - public static void SciMenu(){ - System.out.println("Display"); - System.out.println("Trig Functions"); - System.out.printf("%-10s %-10s %-10s", "1 - Sine |", "2 - Cosine |", "3 - Tangent \n"); - System.out.printf("%-10s %-10s %-10s", "4 - Inverse Sine |", "5 - Inverse Cosine |", "6 - Inverse Tangent \n"); + public static void SciMenuHome(){ + System.out.println("Rotate Display - 1"); + System.out.println("Memory - 2"); + System.out.println("Trig Functions - 3"); + System.out.println("Mode Change - 4"); + System.out.println("Log Functions - 5"); + System.out.println("Factorial Functions - 6"); + ForAllMenus(); + } + public static void RotateDisplay(){ + System.out.println("Binary - 1"); + System.out.println("Octal - 2"); + System.out.println("Decimal - 3"); + System.out.println("Hexadecimal - 4"); + ForAllMenus(); + } + public static void Memory(){ + System.out.println("M+ - 1"); + System.out.println("MC - 2"); + System.out.println("MRC - 3"); + ForAllMenus(); + } + public static void TrigFunctions(){ + System.out.println("Sin - 1"); + System.out.println("Cos - 2"); + System.out.println("Tan - 3"); + System.out.println("Arcsin - 4"); + System.out.println("Arccos - 5"); + System.out.println("Arctan - 6"); + ForAllMenus(); + } + public static void ModeChange(){ + System.out.println("Rotate Degrees - 1"); + System.out.println("Rotate Radius - 2"); + ForAllMenus(); + } + public static void LogFunctions(){ + System.out.println("Log - 1"); + System.out.println("Inverse Log - 2"); + System.out.println("Ln - 3"); + System.out.println("e^x - 4"); ForAllMenus(); } public static void ForAllMenus() { - System.out.println("**********"); - System.out.println("Memory"); - System.out.println("**********"); - System.out.printf("%-10s %-10s %-10s", "a - M+ |", "b - MC |", "c - MRC \n"); - System.out.println("**********"); - System.out.println("Clear"); - System.out.println("**********"); - System.out.printf("%-10s %-10s", "d - Error |", "e - Display \n"); - System.out.println("**********"); - System.out.println("Back - f"); - System.out.println("**********"); - System.out.println("Main Menu - g"); - System.out.println("**********"); - System.out.println("Exit - h"); - System.out.println("**********"); + System.out.println("Clear Error - a"); + System.out.println("Clear Display - b"); + System.out.println("Back - c"); + System.out.println("Main Menu - d"); + System.out.println("Exit - e"); } public static void ExitCalc(){ System.exit(0); } - public static void GoToMainMenu(){ - System.exit(0); + public static String Greeting(){ + Console.println("Welcome to my calculator!"); + String choice = Console.getStringInput("1 - Basic | 2 - Scientific | 3 - Exit"); + return choice; } -} + + + } + + //System.out.printf("%-10s %-10s %-10s", "1 - Sine |", "2 - Cosine |", "3 - Tangent \n"); + // System.out.printf("%-10s %-10s %-10s", "4 - Inverse Sine |", "5 - Inverse Cosine |", "6 - Inverse Tangent \n"); \ 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 d2234ee5..0cbfc299 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -9,47 +9,204 @@ */ public class MainApplication { public static void main(String[] args) { - Console.println("Welcome to my calculator!"); - String s = Console.getStringInput("1 - Basic | 2 - Scientific | 3 - Exit"); - if(s.equals("1")) { + String s = Greeting(); + if (s.equals("1")) { BasicMenu(); - +//Basic Menu s = Console.getStringInput("Please select an option"); - if(s.equals("1")){ + if (s.equals("1")) { int curInt = 0; int pastInt = 0; - s = Console.getStringInput("Please enter a number\nEnter x when done"); - while(!s.equals("x")){ - System.out.print("Please enter a number\nEnter x when done"); + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } curInt = Integer.parseInt(s); System.out.println(Addition(pastInt, curInt)); pastInt = curInt; } + + } else if (s.equals("2")) { + int curInt = 0; + int pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Integer.parseInt(s); + System.out.println(Subtraction(pastInt, curInt)); + pastInt = curInt; + + } + } else if (s.equals("3")) { + int curInt = 0; + int pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Integer.parseInt(s); + System.out.println(Multiply(pastInt, curInt)); + pastInt = curInt; + + } + } else if (s.equals("4")) { + int curInt = 0; + int pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Integer.parseInt(s); + System.out.println(Divide(pastInt, curInt)); + pastInt = curInt; + + } + } else if (s.equals("5")) { + int curInt = 0; + int pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Integer.parseInt(s); + System.out.println(Square(pastInt, curInt)); + pastInt = curInt; + + } + } else if (s.equals("6")) { + int curInt = 0; + int pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Integer.parseInt(s); + System.out.println(Square_Root(pastInt, curInt)); + pastInt = curInt; + + } + } else if (s.equals("7")) { + int curInt = 0; + int pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Integer.parseInt(s); + System.out.println(Exponent(pastInt, curInt)); + pastInt = curInt; + + } + } else if (s.equals("8")) { + int curInt = 0; + int pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Integer.parseInt(s); + System.out.println(Inverse(pastInt, curInt)); + pastInt = curInt; + + } + } else if (s.equals("9")) { + int curInt = 0; + int pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Integer.parseInt(s); + System.out.println(Pos_Neg(pastInt, curInt)); + pastInt = curInt; + + } + } + else if (s.equals("a")) { + //Clear Error + } + else if (s.equals("b")) { + //Clear Display + } + else if (s.equals("c")) { + //Back + } + else if (s.equals("d")) { + //Main Menu + Greeting(); + } + else if (s.equals("e")) { + //Exit + ExitCalc(); + } + else { + System.out.println("Please enter a valid response"); } -// else if(s.equals("2")) { -// s = Console.getStringInput(" Enter in following format \n a a a a \n Press enter when done"); -// String resString = s; -// System.out.println((Addition(resString)); -// } -// else if(s.equals("3")) { -// s = Console.getStringInput(" Enter in following format \n a a a a \n Press enter when done"); -// String resString = s; -// System.out.println((Addition(resString))); -// } + //End Basic } - else if(s.equals("2")) { - SciMenu(); - s = Console.getStringInput("Please select an option"); +//Start Scientific + else if (s.equals("2")) { + SciMenuHome(); + s = Console.getStringInput("Please select an option"); + //Start Rotate Display + if(s.equals("1")) { + RotateDisplay(); + s = Console.getStringInput("Please select an option"); + if(s.equals("1")) { + //bin + } + else if(s.equals("2")){ + //oct + } + else if(s.equals("3")){ + //dec + } + else if(s.equals("4")){ + //hex + } + else { + System.out.println("Please enter a valid response"); + } + } +//End Rotate Display + else if(s.equals("2")) { + Memory(); + } } - else if(s.equals("3")) { +//End Scientific + else if (s.equals("3")) { System.exit(0); } else { System.out.println("Please enter a valid response"); } + BasicMenu(); + s = Console.getStringInput("Please select an option"); + } - } } + + + From 92ceb65e9639dfc58df9ba2964f9c69341dd61cc Mon Sep 17 00:00:00 2001 From: Gregory Davis Date: Sat, 8 Feb 2020 14:26:15 -0500 Subject: [PATCH 34/52] 2:25 All basic tests and most sci tests working --- .../TestMainApplication.java | 81 +++++++++++++------ 1 file changed, 58 insertions(+), 23 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index 5c3aecd6..8171247e 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -1,6 +1,8 @@ package com.zipcodewilmington.scientific_calculator; +import com.sun.corba.se.impl.interceptors.PICurrent; import com.zipcodewilmington.scientificcalculator.Basic; +import com.zipcodewilmington.scientificcalculator.Sci; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -23,95 +25,124 @@ public void testAdd2(){ Basic calculator = new Basic(); Assert.assertEquals(15, calculator.add(7, 8), 0); } -/* + @Test public void testMinus1(){ - + Basic calculator = new Basic(); + Assert.assertEquals(15, calculator.subtract(19, 4), 0); } @Test public void testMinus2(){ - + Basic calculator = new Basic(); + Assert.assertEquals(99, calculator.subtract(123, 24), 0); } @Test public void testMultiply1(){ - + Basic calculator = new Basic(); + Assert.assertEquals(20, calculator.multiply(5, 4), 0); } @Test public void testMultiply2(){ - + Basic calculator = new Basic(); + Assert.assertEquals(15, calculator.multiply(5, 3), 0); } @Test public void testMultiplyByZero(){ - + Basic calculator = new Basic(); + Assert.assertEquals(0, calculator.multiply(5, 0), 0); } @Test public void testDivide1(){ - + Basic calculator = new Basic(); + Assert.assertEquals(5, calculator.divide(10, 2), 0); } @Test public void testDivide2(){ - + Basic calculator = new Basic(); + Assert.assertEquals(3.33, calculator.divide(10, 3), 0.01); } @Test public void testDivideByZero(){ - + Basic calculator = new Basic(); + Assert.assertEquals(15, calculator.divide(5, 0), 0); } @Test public void testSquare1(){ - + Basic calculator = new Basic(); + Assert.assertEquals(100, calculator.square(10), 0); } @Test public void testSquare2(){ - + Basic calculator = new Basic(); + Assert.assertEquals(25, calculator.square(5), 0); } @Test public void testSquareRoot1(){ - + Basic calculator = new Basic(); + Assert.assertEquals(5, calculator.squareRoot(25), 0); } @Test public void testSquareRoot2(){ - + Basic calculator = new Basic(); + Assert.assertEquals(1.4142135, calculator.squareRoot(2), 0.1); } @Test public void testInverse1(){ - + Basic calculator = new Basic(); + Assert.assertEquals(1/25, calculator.inverse(25), 0.1); } @Test public void testInverse2(){ - + Basic calculator = new Basic(); + Assert.assertEquals(0.5, calculator.inverse(2), 0.1); } @Test public void testPosToNeg1(){ - + Basic calculator = new Basic(); + Assert.assertEquals(-2, calculator.signChange(2), 0.1); } @Test public void testPosToNeg2(){ + Basic calculator = new Basic(); + Assert.assertEquals(12345, calculator.signChange(-12345), 0.1); + } + @Test + public void testExponent1(){ + Basic calculator = new Basic(); + Assert.assertEquals(343, calculator.exponent(7, 3), 0.1); + } + @Test + public void testExponent2() { + Basic calculator = new Basic(); + Assert.assertEquals(343, calculator.exponent(0, 0), 0.1); } @Test public void testSine1(){ - + Sci calculator = new Sci(); + Assert.assertEquals(1, calculator.sine(90), 0); } @Test public void testTestSine2(){ - + Sci calculator = new Sci(); + Assert.assertEquals(1, calculator.sine(45), 0); } @Test @@ -166,17 +197,20 @@ public void testArctangent2(){ @Test public void testLog1(){ - + Sci calculator = new Sci(); + Assert.assertEquals(0.77815, calculator.logarithm(6), 0.01); } @Test public void testLog2(){ - + Sci calculator = new Sci(); + Assert.assertEquals(2, calculator.logarithm(100), 0.01); } @Test public void testInverseLog1(){ - + Sci calculator = new Sci(); + Assert.assertEquals(2, calculator.inverseLogarithm(100), 0.01); } @Test @@ -186,7 +220,8 @@ public void testInverseLog2(){ @Test public void testNaturalLog1(){ - + Sci calculator = new Sci(); + Assert.assertEquals(1, calculator.naturalLogarithm(5), 0.01); } @Test @@ -203,5 +238,5 @@ public void testEPower1(){ public void testEPower2(){ } -*/ + } From 4e75a56084b9ca33d47f337f7906aed5ccd05781 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sat, 8 Feb 2020 14:45:24 -0500 Subject: [PATCH 35/52] most of ui done --- .../scientificcalculator/MainApplication.java | 211 +++++++++++++++++- 1 file changed, 210 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index 0cbfc299..c186f208 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -144,12 +144,15 @@ public static void main(String[] args) { } else if (s.equals("a")) { //Clear Error + s = ""; } else if (s.equals("b")) { //Clear Display + s = ""; } else if (s.equals("c")) { //Back + Greeting(); } else if (s.equals("d")) { //Main Menu @@ -185,13 +188,219 @@ else if(s.equals("3")){ else if(s.equals("4")){ //hex } + else if (s.equals("a")) { + //Clear Error + s = ""; + } + else if (s.equals("b")) { + //Clear Display + s = ""; + } + else if (s.equals("c")) { + //Back + SciMenuHome(); + } + else if (s.equals("d")) { + //Main Menu + Greeting(); + } + else if (s.equals("e")) { + //Exit + ExitCalc(); + } else { System.out.println("Please enter a valid response"); } } //End Rotate Display +//Start Memory else if(s.equals("2")) { Memory(); + s = Console.getStringInput("Please select an option"); + if(s.equals("1")) { + //M+ + } + else if(s.equals("2")){ + //MC + } + else if(s.equals("3")){ + //MRC + } + else if (s.equals("a")) { + //Clear Error + s = ""; + } + else if (s.equals("b")) { + //Clear Display + s = ""; + } + else if (s.equals("c")) { + //Back + SciMenuHome(); + } + else if (s.equals("d")) { + //Main Menu + Greeting(); + } + else if (s.equals("e")) { + //Exit + ExitCalc(); + } + else { + System.out.println("Please enter a valid response"); + } + } +//End Memory +//Start Trig + else if(s.equals("3")) { + TrigFunctions(); + s = Console.getStringInput("Please select an option"); + if(s.equals("1")) { + //sin + } + else if(s.equals("2")){ + //cos + } + else if(s.equals("3")){ + //tan + } + else if(s.equals("4")){ + //arcsin + } + else if(s.equals("5")){ + //arccos + } + else if(s.equals("6")){ + //arctan + } + else if (s.equals("a")) { + //Clear Error + s = ""; + } + else if (s.equals("b")) { + //Clear Display + s = ""; + } + else if (s.equals("c")) { + //Back + SciMenuHome(); + } + else if (s.equals("d")) { + //Main Menu + Greeting(); + } + else if (s.equals("e")) { + //Exit + ExitCalc(); + } + else { + System.out.println("Please enter a valid response"); + } + } +//End Trig +//Start Mode Change + else if(s.equals("4")) { + ModeChange(); + s = Console.getStringInput("Please select an option"); + if(s.equals("1")) { + //deg + } + else if(s.equals("2")){ + //rad + } + else if (s.equals("a")) { + //Clear Error + s = ""; + } + else if (s.equals("b")) { + //Clear Display + s = ""; + } + else if (s.equals("c")) { + //Back + SciMenuHome(); + } + else if (s.equals("d")) { + //Main Menu + Greeting(); + } + else if (s.equals("e")) { + //Exit + ExitCalc(); + } + else { + System.out.println("Please enter a valid response"); + } + } +//End Mode Change +//Start Log Function + else if(s.equals("5")) { + LogFunctions(); + s = Console.getStringInput("Please select an option"); + if(s.equals("1")) { + //log + } + else if(s.equals("2")){ + //inverse log + } + else if(s.equals("3")){ + //ln + } + else if(s.equals("4")){ + //e^x + } + else if (s.equals("a")) { + //Clear Error + s = ""; + } + else if (s.equals("b")) { + //Clear Display + s = ""; + } + else if (s.equals("c")) { + //Back + SciMenuHome(); + } + else if (s.equals("d")) { + //Main Menu + Greeting(); + } + else if (s.equals("e")) { + //Exit + ExitCalc(); + } + else { + System.out.println("Please enter a valid response"); + } + } +//End Log Function +//Start Factorial Function + else if(s.equals("6")) { + //Factorial Functions + } +//End Factorial Function + else if (s.equals("a")) { + //Clear Error + s = ""; + } + else if (s.equals("b")) { + //Clear Display + s = ""; + } + else if (s.equals("c")) { + //Back + Greeting(); + } + else if (s.equals("d")) { + //Main Menu + Greeting(); + } + else if (s.equals("e")) { + //Exit + ExitCalc(); + } + else { + System.out.println("Please enter a valid response"); } } //End Scientific @@ -201,7 +410,7 @@ else if (s.equals("3")) { else { System.out.println("Please enter a valid response"); } - BasicMenu(); + Greeting(); s = Console.getStringInput("Please select an option"); } From c511a498a69c085d795be4024e3797fcdd070066 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 8 Feb 2020 14:48:03 -0500 Subject: [PATCH 36/52] 247 commit --- .../java/com/zipcodewilmington/scientificcalculator/Sci.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index 2a3cdacd..48130a6d 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -1,5 +1,6 @@ package com.zipcodewilmington.scientificcalculator; +//converts currently-displayed number to binary public class Sci { public String switchDisplayModeToBinary(Integer a){ String displayMode = ""; From 9f1cbd9f000e7225bf4bc49172f056fd77db1a23 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sat, 8 Feb 2020 15:03:28 -0500 Subject: [PATCH 37/52] changed float to double --- .../scientificcalculator/Basic.java | 36 +++++------ .../scientificcalculator/Sci.java | 62 +++++++++---------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java index c4686c88..b84bfa5c 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java @@ -1,44 +1,44 @@ package com.zipcodewilmington.scientificcalculator; public class Basic{ - public float add(float a, float b){ - float sum = a+b; + public double add(double a, double b){ + double sum = a+b; return sum; } - public float subtract(float a, float b){ - float difference = a-b; + public double subtract(double a, double b){ + double difference = a-b; return difference; } - public float multiply(float a, float b){ - float product = a*b; + public double multiply(double a, double b){ + double product = a*b; return product; } - public float divide(float a, float b){ - float quotient = a/b; + public double divide(double a, double b){ + double quotient = a/b; return quotient; } - public float square(float a){ - float squareResult = (float) Math.pow(a,2); + public double square(double a){ + double squareResult = (double) Math.pow(a,2); return squareResult; } - public float squareRoot(float a){ - float squareRootResult = (float) Math.sqrt(a); + public double squareRoot(double a){ + double squareRootResult = (double) Math.sqrt(a); return squareRootResult; } - public float exponent(float a, float b){ - float exponentResult = (float) Math.pow(a,b); + public double exponent(double a, double b){ + double exponentResult = (double) Math.pow(a,b); return exponentResult; } - public float inverse(float a){ - float inverseResult = 1/a; + public double inverse(double a){ + double inverseResult = 1/a; return inverseResult; } - public float signChange(float a){ - float opposite = 0; + public double signChange(double a){ + double opposite = 0; if (a > 0){ opposite = a - (2 * Math.abs(a)); } else if(a < 0){ diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index 48130a6d..06eb9029 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -32,8 +32,8 @@ public String switchDisplayModeToDecimal(Integer a){ } - float memNum = 0; - public void memPlus(float a){ + double memNum = 0; + public void memPlus(double a){ memNum = a; } @@ -42,55 +42,55 @@ public void memClear(){ //needs work } - public float recall(){ + public double recall(){ return memNum; } - public float sine(float a){ - float sin = (float) Math.sin(a); + public double sine(double a){ + double sin = (double) Math.sin(a); return sin; } - public float cosine(float a){ - float cos = (float) Math.cos(a); + public double cosine(double a){ + double cos = (double) Math.cos(a); return cos; } - public float tangent(float a){ - float tan = (float) Math.tan(a); + public double tangent(double a){ + double tan = (double) Math.tan(a); return tan; } - public float inverseSine(float a){ - float invSin = (float) Math.asin(a); + public double inverseSine(double a){ + double invSin = (double) Math.asin(a); return invSin; } - public float inverseCosine(float a){ - float invCos = (float) Math.acos(a); + public double inverseCosine(double a){ + double invCos = (double) Math.acos(a); return invCos; } - public float inverseTangent(float a){ - float invTan = (float) Math.atan(a); + public double inverseTangent(double a){ + double invTan = (double) Math.atan(a); return invTan; } String unitsMode = "Radians"; - public float switchUnitsModeRotate(float a){ - float converted = 0; + public double switchUnitsModeRotate(double a){ + double converted = 0; if (unitsMode.equals("Radians")) { unitsMode = "Degrees"; - converted = (float) Math.toDegrees(a); + converted = (double) Math.toDegrees(a); } else { unitsMode = "Radians"; - converted = (float) Math.toRadians(a); + converted = (double) Math.toRadians(a); } return converted; //degrees,radians } - public float switchUnitsModeString(String unitsModeInput, float a){ - float converted = 0; + public double switchUnitsModeString(String unitsModeInput, double a){ + double converted = 0; if (unitsModeInput.equals("Degrees")){ - converted = (float) Math.toDegrees(a); + converted = (double) Math.toDegrees(a); return converted; } else if (unitsModeInput.equals("Radians")){ - converted = (float) Math.toRadians(a); + converted = (double) Math.toRadians(a); return converted; } else { System.out.println("Invalid unit type, try again."); @@ -98,20 +98,20 @@ public float switchUnitsModeString(String unitsModeInput, float a){ } } - public float logarithm(float a){ - float log = (float) Math.log10(a); + public double logarithm(double a){ + double log = (double) Math.log10(a); return log; } - public float inverseLogarithm(float a){ - float invLog = (float) (1 / Math.log10(a)); + public double inverseLogarithm(double a){ + double invLog = (double) (1 / Math.log10(a)); return invLog; } - public float naturalLogarithm(float a){ - float natLog = (float) Math.log(a); + public double naturalLogarithm(double a){ + double natLog = (double) Math.log(a); return natLog; } - public float inverseNaturalLogarithm(float a){ - float invNatLog = (float) (1/Math.log(a)); + public double inverseNaturalLogarithm(double a){ + double invNatLog = (double) (1/Math.log(a)); return invNatLog; } public Integer factorial(Integer a){ From c922925aeb1f01d9dd5f3e839e2441344d2e0e4f Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sat, 8 Feb 2020 15:06:23 -0500 Subject: [PATCH 38/52] int to double --- .../scientificcalculator/MainApplication.java | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index c186f208..d3ffd271 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -1,8 +1,8 @@ package com.zipcodewilmington.scientificcalculator; -import static com.zipcodewilmington.scientificcalculator.EmmaTestMethods.*; -import static com.zipcodewilmington.scientificcalculator.Console.*; +import static com.zipcodewilmington.scientificcalculator.Console.*; +import static com.zipcodewilmington.scientificcalculator.Basic.*; /** * Created by leon on 2/9/18. @@ -15,128 +15,128 @@ public static void main(String[] args) { //Basic Menu s = Console.getStringInput("Please select an option"); if (s.equals("1")) { - int curInt = 0; - int pastInt = 0; + double curInt = 0; + double pastInt = 0; while (!s.equals("x")) { s = Console.getStringInput("Please enter a number\nEnter x when done"); if (s.equals("x")) { break; } - curInt = Integer.parseInt(s); - System.out.println(Addition(pastInt, curInt)); + curInt = Double.parseDouble(s); + System.out.println(add(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("2")) { - int curInt = 0; - int pastInt = 0; + double curInt = 0; + double pastInt = 0; while (!s.equals("x")) { s = Console.getStringInput("Please enter a number\nEnter x when done"); if (s.equals("x")) { break; } - curInt = Integer.parseInt(s); + curInt = Double.parseDouble(s); System.out.println(Subtraction(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("3")) { - int curInt = 0; - int pastInt = 0; + double curInt = 0; + double pastInt = 0; while (!s.equals("x")) { s = Console.getStringInput("Please enter a number\nEnter x when done"); if (s.equals("x")) { break; } - curInt = Integer.parseInt(s); + curInt = Double.parseDouble(s); System.out.println(Multiply(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("4")) { - int curInt = 0; - int pastInt = 0; + double curInt = 0; + double pastInt = 0; while (!s.equals("x")) { s = Console.getStringInput("Please enter a number\nEnter x when done"); if (s.equals("x")) { break; } - curInt = Integer.parseInt(s); + curInt = Double.parseDouble(s); System.out.println(Divide(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("5")) { - int curInt = 0; - int pastInt = 0; + double curInt = 0; + double pastInt = 0; while (!s.equals("x")) { s = Console.getStringInput("Please enter a number\nEnter x when done"); if (s.equals("x")) { break; } - curInt = Integer.parseInt(s); + curInt = Double.parseDouble(s); System.out.println(Square(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("6")) { - int curInt = 0; - int pastInt = 0; + double curInt = 0; + double pastInt = 0; while (!s.equals("x")) { s = Console.getStringInput("Please enter a number\nEnter x when done"); if (s.equals("x")) { break; } - curInt = Integer.parseInt(s); + curInt = Double.parseDouble(s); System.out.println(Square_Root(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("7")) { - int curInt = 0; - int pastInt = 0; + double curInt = 0; + double pastInt = 0; while (!s.equals("x")) { s = Console.getStringInput("Please enter a number\nEnter x when done"); if (s.equals("x")) { break; } - curInt = Integer.parseInt(s); + curInt = Double.parseDouble(s); System.out.println(Exponent(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("8")) { - int curInt = 0; - int pastInt = 0; + double curInt = 0; + double pastInt = 0; while (!s.equals("x")) { s = Console.getStringInput("Please enter a number\nEnter x when done"); if (s.equals("x")) { break; } - curInt = Integer.parseInt(s); + curInt = Double.parseDouble(s); System.out.println(Inverse(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("9")) { - int curInt = 0; - int pastInt = 0; + double curInt = 0; + double pastInt = 0; while (!s.equals("x")) { s = Console.getStringInput("Please enter a number\nEnter x when done"); if (s.equals("x")) { break; } - curInt = Integer.parseInt(s); + curInt = Double.parseDouble(s); System.out.println(Pos_Neg(pastInt, curInt)); pastInt = curInt; From 419b411f05e523655ef78ef97203f354d68e7fc4 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sun, 9 Feb 2020 09:50:10 -0500 Subject: [PATCH 39/52] mostly working --- .../scientificcalculator/Basic.java | 36 +- .../scientificcalculator/MainApplication.java | 392 +++++++++--------- .../scientificcalculator/Sci.java | 46 +- 3 files changed, 239 insertions(+), 235 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java index c4686c88..1e816a9c 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Basic.java @@ -1,44 +1,44 @@ package com.zipcodewilmington.scientificcalculator; public class Basic{ - public float add(float a, float b){ - float sum = a+b; + public static double add(double a, double b){ + double sum = a+b; return sum; } - public float subtract(float a, float b){ - float difference = a-b; + public static double subtract(double a, double b){ + double difference = a-b; return difference; } - public float multiply(float a, float b){ - float product = a*b; + public static double multiply(double a, double b){ + double product = a*b; return product; } - public float divide(float a, float b){ - float quotient = a/b; + public static double divide(double a, double b){ + double quotient = a/b; return quotient; } - public float square(float a){ - float squareResult = (float) Math.pow(a,2); + public static double square(double a){ + double squareResult = (double) Math.pow(a,2); return squareResult; } - public float squareRoot(float a){ - float squareRootResult = (float) Math.sqrt(a); + public static double squareRoot(double a){ + double squareRootResult = (double) Math.sqrt(a); return squareRootResult; } - public float exponent(float a, float b){ - float exponentResult = (float) Math.pow(a,b); + public static double exponent(double a, double b){ + double exponentResult = (double) Math.pow(a,b); return exponentResult; } - public float inverse(float a){ - float inverseResult = 1/a; + public static double inverse(double a){ + double inverseResult = 1/a; return inverseResult; } - public float signChange(float a){ - float opposite = 0; + public static double signChange(double a){ + double opposite = 0; if (a > 0){ opposite = a - (2 * Math.abs(a)); } else if(a < 0){ diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index d3ffd271..9ab0c3c0 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -3,18 +3,19 @@ import static com.zipcodewilmington.scientificcalculator.Console.*; import static com.zipcodewilmington.scientificcalculator.Basic.*; - +import static com.zipcodewilmington.scientificcalculator.Sci.*; /** * Created by leon on 2/9/18. */ public class MainApplication { public static void main(String[] args) { - String s = Greeting(); + String s = Greeting(); if (s.equals("1")) { BasicMenu(); //Basic Menu s = Console.getStringInput("Please select an option"); if (s.equals("1")) { + //+ double curInt = 0; double pastInt = 0; @@ -24,12 +25,14 @@ public static void main(String[] args) { break; } curInt = Double.parseDouble(s); + System.out.println(add(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("2")) { + //- double curInt = 0; double pastInt = 0; @@ -39,11 +42,12 @@ public static void main(String[] args) { break; } curInt = Double.parseDouble(s); - System.out.println(Subtraction(pastInt, curInt)); + System.out.println(subtract(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("3")) { + //* double curInt = 0; double pastInt = 0; @@ -53,11 +57,12 @@ public static void main(String[] args) { break; } curInt = Double.parseDouble(s); - System.out.println(Multiply(pastInt, curInt)); + System.out.println(multiply(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("4")) { + //divide double curInt = 0; double pastInt = 0; @@ -67,39 +72,26 @@ public static void main(String[] args) { break; } curInt = Double.parseDouble(s); - System.out.println(Divide(pastInt, curInt)); + System.out.println(divide(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("5")) { + //square double curInt = 0; - double pastInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Double.parseDouble(s); + System.out.println(square(curInt)); - while (!s.equals("x")) { - s = Console.getStringInput("Please enter a number\nEnter x when done"); - if (s.equals("x")) { - break; - } - curInt = Double.parseDouble(s); - System.out.println(Square(pastInt, curInt)); - pastInt = curInt; - - } } else if (s.equals("6")) { + //square root double curInt = 0; - double pastInt = 0; - - while (!s.equals("x")) { - s = Console.getStringInput("Please enter a number\nEnter x when done"); - if (s.equals("x")) { - break; - } - curInt = Double.parseDouble(s); - System.out.println(Square_Root(pastInt, curInt)); - pastInt = curInt; + s = Console.getStringInput("Please enter a number"); + curInt = Double.parseDouble(s); + System.out.println(squareRoot(curInt)); - } } else if (s.equals("7")) { + //exponent double curInt = 0; double pastInt = 0; @@ -109,313 +101,323 @@ public static void main(String[] args) { break; } curInt = Double.parseDouble(s); - System.out.println(Exponent(pastInt, curInt)); + System.out.println(exponent(pastInt, curInt)); pastInt = curInt; } } else if (s.equals("8")) { + //inverse double curInt = 0; - double pastInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Double.parseDouble(s); + System.out.println(inverse(curInt)); - while (!s.equals("x")) { - s = Console.getStringInput("Please enter a number\nEnter x when done"); - if (s.equals("x")) { - break; - } - curInt = Double.parseDouble(s); - System.out.println(Inverse(pastInt, curInt)); - pastInt = curInt; - - } } else if (s.equals("9")) { + //sign change double curInt = 0; - double pastInt = 0; - - while (!s.equals("x")) { - s = Console.getStringInput("Please enter a number\nEnter x when done"); - if (s.equals("x")) { - break; - } - curInt = Double.parseDouble(s); - System.out.println(Pos_Neg(pastInt, curInt)); - pastInt = curInt; + s = Console.getStringInput("Please enter a number"); + curInt = Double.parseDouble(s); + System.out.println(signChange(curInt)); - } - } - else if (s.equals("a")) { + } else if (s.equals("a")) { //Clear Error s = ""; - } - else if (s.equals("b")) { + } else if (s.equals("b")) { //Clear Display s = ""; - } - else if (s.equals("c")) { + } else if ((s.equals("c")) || ((s.equals("d")))) { //Back Greeting(); - } - else if (s.equals("d")) { - //Main Menu - Greeting(); - } - else if (s.equals("e")) { + } else if (s.equals("e")) { //Exit ExitCalc(); - } - else { + } else { System.out.println("Please enter a valid response"); } //End Basic - } + }//end greeting option 1 (basic) //Start Scientific else if (s.equals("2")) { SciMenuHome(); s = Console.getStringInput("Please select an option"); - //Start Rotate Display - if(s.equals("1")) { + //Start Rotate Display + if (s.equals("1")) { RotateDisplay(); s = Console.getStringInput("Please select an option"); - if(s.equals("1")) { - //bin - } - else if(s.equals("2")){ - //oct - } - else if(s.equals("3")){ - //dec - } - else if(s.equals("4")){ - //hex - } - else if (s.equals("a")) { - //Clear Error - s = ""; - } - else if (s.equals("b")) { - //Clear Display - s = ""; - } - else if (s.equals("c")) { - //Back - SciMenuHome(); - } - else if (s.equals("d")) { - //Main Menu - Greeting(); - } - else if (s.equals("e")) { - //Exit - ExitCalc(); - } - else { - System.out.println("Please enter a valid response"); - } + if (s.equals("1")) { + //bin + int curInt = 0; + + s = Console.getStringInput("Please enter a number"); + curInt = Integer.parseInt(s); + + System.out.println(switchDisplayModeToBinary(curInt)); + + } else if (s.equals("2")) { + //oct + int curInt = 0; + + s = Console.getStringInput("Please enter a number"); + curInt = Integer.parseInt(s); + + System.out.println(switchDisplayModeToOctal(curInt)); + } else if (s.equals("3")) { + //dec + int curInt = 0; + + s = Console.getStringInput("Please enter a number"); + curInt = Integer.parseInt(s); + + System.out.println(switchDisplayModeToDecimal(curInt)); + } else if (s.equals("4")) { + //hex + int curInt = 0; + + s = Console.getStringInput("Please enter a number"); + curInt = Integer.parseInt(s); + + System.out.println(switchDisplayModeToHexadecimal(curInt)); + } else if (s.equals("a")) { + //Clear Error + s = ""; + } else if (s.equals("b")) { + //Clear Display + s = ""; + } else if (s.equals("c")) { + //Back + SciMenuHome(); + } else if (s.equals("d")) { + //Main Menu + Greeting(); + } else if (s.equals("e")) { + //Exit + ExitCalc(); + } else { + System.out.println("Please enter a valid response"); + } } + //End Rotate Display //Start Memory - else if(s.equals("2")) { + else if (s.equals("2")) { Memory(); s = Console.getStringInput("Please select an option"); - if(s.equals("1")) { + if (s.equals("1")) { //M+ - } - else if(s.equals("2")){ + float curInt = 0; + + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + + System.out.println(memPlus(curInt)); + } else if (s.equals("2")) { //MC - } - else if(s.equals("3")){ + } else if (s.equals("3")) { //MRC - } - else if (s.equals("a")) { + } else if (s.equals("a")) { //Clear Error s = ""; - } - else if (s.equals("b")) { + } else if (s.equals("b")) { //Clear Display s = ""; - } - else if (s.equals("c")) { + } else if (s.equals("c")) { //Back SciMenuHome(); - } - else if (s.equals("d")) { + } else if (s.equals("d")) { //Main Menu Greeting(); - } - else if (s.equals("e")) { + } else if (s.equals("e")) { //Exit ExitCalc(); - } - else { + } else { System.out.println("Please enter a valid response"); } } //End Memory //Start Trig - else if(s.equals("3")) { + else if (s.equals("3")) { TrigFunctions(); s = Console.getStringInput("Please select an option"); - if(s.equals("1")) { + if (s.equals("1")) { //sin - } - else if(s.equals("2")){ + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(sine(curInt)); + } else if (s.equals("2")) { //cos - } - else if(s.equals("3")){ + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(cosine(curInt)); + } else if (s.equals("3")) { //tan - } - else if(s.equals("4")){ + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(tangent(curInt)); + } else if (s.equals("4")) { //arcsin - } - else if(s.equals("5")){ + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(inverseSine(curInt)); + } else if (s.equals("5")) { //arccos - } - else if(s.equals("6")){ + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(inverseCosine(curInt)); + } else if (s.equals("6")) { //arctan - } - else if (s.equals("a")) { + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(inverseTangent(curInt)); + } else if (s.equals("a")) { //Clear Error s = ""; - } - else if (s.equals("b")) { + } else if (s.equals("b")) { //Clear Display s = ""; - } - else if (s.equals("c")) { + } else if (s.equals("c")) { //Back SciMenuHome(); - } - else if (s.equals("d")) { + } else if (s.equals("d")) { //Main Menu Greeting(); - } - else if (s.equals("e")) { + } else if (s.equals("e")) { //Exit ExitCalc(); - } - else { + } else { System.out.println("Please enter a valid response"); } } //End Trig //Start Mode Change - else if(s.equals("4")) { + else if (s.equals("4")) { ModeChange(); s = Console.getStringInput("Please select an option"); - if(s.equals("1")) { + if (s.equals("1")) { //deg - } - else if(s.equals("2")){ + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(inverseTangent(curInt)); + } else if (s.equals("2")) { //rad - } - else if (s.equals("a")) { + } else if (s.equals("a")) { //Clear Error s = ""; - } - else if (s.equals("b")) { + } else if (s.equals("b")) { //Clear Display s = ""; - } - else if (s.equals("c")) { + } else if (s.equals("c")) { //Back SciMenuHome(); - } - else if (s.equals("d")) { + } else if (s.equals("d")) { //Main Menu Greeting(); - } - else if (s.equals("e")) { + } else if (s.equals("e")) { //Exit ExitCalc(); - } - else { + } else { System.out.println("Please enter a valid response"); } } //End Mode Change //Start Log Function - else if(s.equals("5")) { + else if (s.equals("5")) { LogFunctions(); s = Console.getStringInput("Please select an option"); - if(s.equals("1")) { + if (s.equals("1")) { //log - } - else if(s.equals("2")){ + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(logarithm(curInt)); + } else if (s.equals("2")) { //inverse log - } - else if(s.equals("3")){ + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(inverseLogarithm(curInt)); + } else if (s.equals("3")) { //ln - } - else if(s.equals("4")){ + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(naturalLogarithm(curInt)); + } else if (s.equals("4")) { //e^x - } - else if (s.equals("a")) { + } else if (s.equals("a")) { //Clear Error s = ""; - } - else if (s.equals("b")) { + } else if (s.equals("b")) { //Clear Display s = ""; - } - else if (s.equals("c")) { + } else if (s.equals("c")) { //Back SciMenuHome(); - } - else if (s.equals("d")) { + } else if (s.equals("d")) { //Main Menu Greeting(); - } - else if (s.equals("e")) { + } else if (s.equals("e")) { //Exit ExitCalc(); - } - else { + } else { System.out.println("Please enter a valid response"); } } //End Log Function //Start Factorial Function - else if(s.equals("6")) { + else if (s.equals("6")) { //Factorial Functions + int curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Integer.parseInt(s); + System.out.println(factorial(curInt)); } //End Factorial Function else if (s.equals("a")) { //Clear Error s = ""; - } - else if (s.equals("b")) { + } else if (s.equals("b")) { //Clear Display s = ""; - } - else if (s.equals("c")) { + } else if (s.equals("c")) { //Back Greeting(); - } - else if (s.equals("d")) { + } else if (s.equals("d")) { //Main Menu Greeting(); - } - else if (s.equals("e")) { + } else if (s.equals("e")) { //Exit ExitCalc(); - } - else { + } else { System.out.println("Please enter a valid response"); } } + //End Scientific + else if (s.equals("3")) { System.exit(0); - } - else { + } else { System.out.println("Please enter a valid response"); } + Greeting(); + s = Console.getStringInput("Please select an option"); - } + + } //void main +} //main app + + -} diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index 48130a6d..0903e261 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -2,14 +2,14 @@ //converts currently-displayed number to binary public class Sci { - public String switchDisplayModeToBinary(Integer a){ + public static String switchDisplayModeToBinary(Integer a){ String displayMode = ""; String converted = Integer.toString(a,2); return converted; } - public String switchDisplayModeToHexadecimal(Integer a){ + public static String switchDisplayModeToHexadecimal(Integer a){ String displayMode = ""; String converted = Integer.toString(a,16); @@ -17,14 +17,14 @@ public String switchDisplayModeToHexadecimal(Integer a){ return converted; } - public String switchDisplayModeToOctal(Integer a){ + public static String switchDisplayModeToOctal(Integer a){ String displayMode = ""; String converted = Integer.toString(a,8); return converted; } - public String switchDisplayModeToDecimal(Integer a){ + public static String switchDisplayModeToDecimal(Integer a){ String displayMode = ""; String converted = Integer.toString(a,10); @@ -32,46 +32,48 @@ public String switchDisplayModeToDecimal(Integer a){ } - float memNum = 0; - public void memPlus(float a){ - memNum = a; + public static String memPlus(float a){ + float memNum = a; + String converted = Float.toString(memNum); + return converted; } public void memClear(){ //needs work } - public float recall(){ - - return memNum; + public float recall(float x){ + return x; + //return memNum; } - public float sine(float a){ + public static float sine(float a){ float sin = (float) Math.sin(a); return sin; } - public float cosine(float a){ + public static float cosine(float a){ float cos = (float) Math.cos(a); return cos; } - public float tangent(float a){ + public static float tangent(float a){ float tan = (float) Math.tan(a); return tan; } - public float inverseSine(float a){ + public static float inverseSine(float a){ float invSin = (float) Math.asin(a); return invSin; } - public float inverseCosine(float a){ + public static float inverseCosine(float a){ float invCos = (float) Math.acos(a); return invCos; } - public float inverseTangent(float a){ + public static float inverseTangent(float a){ float invTan = (float) Math.atan(a); return invTan; } - String unitsMode = "Radians"; - public float switchUnitsModeRotate(float a){ + + public static float switchUnitsModeRotate(float a){ + String unitsMode = "Radians"; float converted = 0; if (unitsMode.equals("Radians")) { unitsMode = "Degrees"; @@ -98,15 +100,15 @@ public float switchUnitsModeString(String unitsModeInput, float a){ } } - public float logarithm(float a){ + public static float logarithm(float a){ float log = (float) Math.log10(a); return log; } - public float inverseLogarithm(float a){ + public static float inverseLogarithm(float a){ float invLog = (float) (1 / Math.log10(a)); return invLog; } - public float naturalLogarithm(float a){ + public static float naturalLogarithm(float a){ float natLog = (float) Math.log(a); return natLog; } @@ -114,7 +116,7 @@ public float inverseNaturalLogarithm(float a){ float invNatLog = (float) (1/Math.log(a)); return invNatLog; } - public Integer factorial(Integer a){ + public static Integer factorial(Integer a){ Integer fact = a; for (int i = 0; i< a;a++){ fact *= a-1; From 7a6effa72d50e82e17280d45c50fdbe3249153fc Mon Sep 17 00:00:00 2001 From: Gregory Davis Date: Sun, 9 Feb 2020 10:20:51 -0500 Subject: [PATCH 40/52] changed inverse log and floats to doubles in sci. 10:20 --- .../scientificcalculator/Sci.java | 64 +++++++++---------- .../TestMainApplication.java | 2 +- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index 0903e261..18c34d68 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -33,9 +33,9 @@ public static String switchDisplayModeToDecimal(Integer a){ } - public static String memPlus(float a){ - float memNum = a; - String converted = Float.toString(memNum); + public static String memPlus(double a){ + double memNum = a; + String converted = Double.toString(memNum); return converted; } public void memClear(){ //needs work @@ -43,56 +43,56 @@ public void memClear(){ //needs work } - public float recall(float x){ + public double recall(double x){ return x; //return memNum; } - public static float sine(float a){ - float sin = (float) Math.sin(a); + public static double sine(double a){ + double sin = (double) Math.sin(a); return sin; } - public static float cosine(float a){ - float cos = (float) Math.cos(a); + public static double cosine(double a){ + double cos = (double) Math.cos(a); return cos; } - public static float tangent(float a){ - float tan = (float) Math.tan(a); + public static double tangent(double a){ + double tan = (double) Math.tan(a); return tan; } - public static float inverseSine(float a){ - float invSin = (float) Math.asin(a); + public static double inverseSine(double a){ + double invSin = (double) Math.asin(a); return invSin; } - public static float inverseCosine(float a){ - float invCos = (float) Math.acos(a); + public static double inverseCosine(double a){ + double invCos = (double) Math.acos(a); return invCos; } - public static float inverseTangent(float a){ - float invTan = (float) Math.atan(a); + public static double inverseTangent(double a){ + double invTan = (double) Math.atan(a); return invTan; } - public static float switchUnitsModeRotate(float a){ + public static double switchUnitsModeRotate(double a){ String unitsMode = "Radians"; - float converted = 0; + double converted = 0; if (unitsMode.equals("Radians")) { unitsMode = "Degrees"; - converted = (float) Math.toDegrees(a); + converted = (double) Math.toDegrees(a); } else { unitsMode = "Radians"; - converted = (float) Math.toRadians(a); + converted = (double) Math.toRadians(a); } return converted; //degrees,radians } - public float switchUnitsModeString(String unitsModeInput, float a){ - float converted = 0; + public double switchUnitsModeString(String unitsModeInput, double a){ + double converted = 0; if (unitsModeInput.equals("Degrees")){ - converted = (float) Math.toDegrees(a); + converted = (double) Math.toDegrees(a); return converted; } else if (unitsModeInput.equals("Radians")){ - converted = (float) Math.toRadians(a); + converted = (double) Math.toRadians(a); return converted; } else { System.out.println("Invalid unit type, try again."); @@ -100,20 +100,20 @@ public float switchUnitsModeString(String unitsModeInput, float a){ } } - public static float logarithm(float a){ - float log = (float) Math.log10(a); + public static double logarithm(double a){ + double log = (double) Math.log10(a); return log; } - public static float inverseLogarithm(float a){ - float invLog = (float) (1 / Math.log10(a)); + public static double inverseLogarithm(double a, double b){ + double invLog = (double) (Math.pow(a, b)); return invLog; } - public static float naturalLogarithm(float a){ - float natLog = (float) Math.log(a); + public static double naturalLogarithm(double a){ + double natLog = (double) Math.log(a); return natLog; } - public float inverseNaturalLogarithm(float a){ - float invNatLog = (float) (1/Math.log(a)); + public double inverseNaturalLogarithm(double a, double b){ + double invNatLog = (double) (Math.pow(a, b)); return invNatLog; } public static Integer factorial(Integer a){ diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index 8171247e..f8f28c64 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -136,7 +136,7 @@ public void testExponent2() { @Test public void testSine1(){ Sci calculator = new Sci(); - Assert.assertEquals(1, calculator.sine(90), 0); + Assert.assertEquals(1, calculator.sine(Math.PI), 0); } @Test From 453695fe2e17de7bcabcab470f592a6a094721eb Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sun, 9 Feb 2020 10:35:04 -0500 Subject: [PATCH 41/52] fixed some nav issues --- .../scientificcalculator/MainApplication.java | 288 +++++++++++++----- 1 file changed, 212 insertions(+), 76 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index 9ab0c3c0..22b5f8d9 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -25,13 +25,20 @@ public static void main(String[] args) { break; } curInt = Double.parseDouble(s); + if(pastInt == 0) { + System.out.println(curInt); + } + else{ + System.out.println(add(pastInt, curInt)); + } - System.out.println(add(pastInt, curInt)); pastInt = curInt; } - - } else if (s.equals("2")) { + BasicMenu(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("2")) { //- double curInt = 0; double pastInt = 0; @@ -42,11 +49,20 @@ public static void main(String[] args) { break; } curInt = Double.parseDouble(s); - System.out.println(subtract(pastInt, curInt)); + if(pastInt == 0) { + System.out.println(curInt); + } + else{ + System.out.println(subtract(pastInt, curInt)); + } + pastInt = curInt; } - } else if (s.equals("3")) { + BasicMenu(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("3")) { //* double curInt = 0; double pastInt = 0; @@ -57,11 +73,20 @@ public static void main(String[] args) { break; } curInt = Double.parseDouble(s); - System.out.println(multiply(pastInt, curInt)); + if(pastInt == 0) { + System.out.println(curInt); + } + else{ + System.out.println(multiply(pastInt, curInt)); + } + pastInt = curInt; } - } else if (s.equals("4")) { + BasicMenu(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("4")) { //divide double curInt = 0; double pastInt = 0; @@ -72,25 +97,38 @@ public static void main(String[] args) { break; } curInt = Double.parseDouble(s); - System.out.println(divide(pastInt, curInt)); + if(pastInt == 0) { + System.out.println(curInt); + } + else{ + System.out.println(divide(pastInt, curInt)); + } + pastInt = curInt; } - } else if (s.equals("5")) { + BasicMenu(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("5")) { //square double curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Double.parseDouble(s); System.out.println(square(curInt)); - - } else if (s.equals("6")) { + BasicMenu(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("6")) { //square root double curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Double.parseDouble(s); System.out.println(squareRoot(curInt)); - - } else if (s.equals("7")) { + BasicMenu(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("7")) { //exponent double curInt = 0; double pastInt = 0; @@ -105,34 +143,45 @@ public static void main(String[] args) { pastInt = curInt; } - } else if (s.equals("8")) { + BasicMenu(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("8")) { //inverse double curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Double.parseDouble(s); System.out.println(inverse(curInt)); - - } else if (s.equals("9")) { + BasicMenu(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("9")) { //sign change double curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Double.parseDouble(s); System.out.println(signChange(curInt)); - - } else if (s.equals("a")) { + BasicMenu(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("a")) { //Clear Error s = ""; + } else if (s.equals("b")) { //Clear Display s = ""; } else if ((s.equals("c")) || ((s.equals("d")))) { //Back Greeting(); + s = Console.getStringInput("Please select an option"); } else if (s.equals("e")) { //Exit ExitCalc(); } else { System.out.println("Please enter a valid response"); + BasicMenu(); + s = Console.getStringInput("Please select an option"); } //End Basic }//end greeting option 1 (basic) @@ -148,53 +197,65 @@ else if (s.equals("2")) { if (s.equals("1")) { //bin int curInt = 0; - s = Console.getStringInput("Please enter a number"); curInt = Integer.parseInt(s); - System.out.println(switchDisplayModeToBinary(curInt)); - - } else if (s.equals("2")) { + RotateDisplay(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("2")) { //oct int curInt = 0; - s = Console.getStringInput("Please enter a number"); curInt = Integer.parseInt(s); - System.out.println(switchDisplayModeToOctal(curInt)); - } else if (s.equals("3")) { + RotateDisplay(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("3")) { //dec int curInt = 0; - s = Console.getStringInput("Please enter a number"); curInt = Integer.parseInt(s); - System.out.println(switchDisplayModeToDecimal(curInt)); - } else if (s.equals("4")) { + RotateDisplay(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("4")) { //hex int curInt = 0; - s = Console.getStringInput("Please enter a number"); curInt = Integer.parseInt(s); - System.out.println(switchDisplayModeToHexadecimal(curInt)); - } else if (s.equals("a")) { + RotateDisplay(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("a")) { //Clear Error s = ""; - } else if (s.equals("b")) { + } + else if (s.equals("b")) { //Clear Display s = ""; - } else if (s.equals("c")) { + } + else if (s.equals("c")) { //Back SciMenuHome(); - } else if (s.equals("d")) { + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("d")) { //Main Menu Greeting(); - } else if (s.equals("e")) { + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("e")) { //Exit ExitCalc(); - } else { + } + else { System.out.println("Please enter a valid response"); + RotateDisplay(); + s = Console.getStringInput("Please select an option"); } } @@ -206,32 +267,44 @@ else if (s.equals("2")) { if (s.equals("1")) { //M+ float curInt = 0; - s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); - System.out.println(memPlus(curInt)); - } else if (s.equals("2")) { + Memory(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("2")) { //MC - } else if (s.equals("3")) { + } + else if (s.equals("3")) { //MRC - } else if (s.equals("a")) { + } + else if (s.equals("a")) { //Clear Error s = ""; - } else if (s.equals("b")) { + } + else if (s.equals("b")) { //Clear Display s = ""; - } else if (s.equals("c")) { + } + else if (s.equals("c")) { //Back SciMenuHome(); - } else if (s.equals("d")) { + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("d")) { //Main Menu Greeting(); - } else if (s.equals("e")) { + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("e")) { //Exit ExitCalc(); - } else { + } + else { System.out.println("Please enter a valid response"); + Memory(); + s = Console.getStringInput("Please select an option"); } } //End Memory @@ -245,37 +318,55 @@ else if (s.equals("3")) { s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(sine(curInt)); - } else if (s.equals("2")) { + TrigFunctions(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("2")) { //cos float curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(cosine(curInt)); - } else if (s.equals("3")) { + TrigFunctions(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("3")) { //tan float curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(tangent(curInt)); - } else if (s.equals("4")) { + TrigFunctions(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("4")) { //arcsin float curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(inverseSine(curInt)); - } else if (s.equals("5")) { + TrigFunctions(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("5")) { //arccos float curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(inverseCosine(curInt)); - } else if (s.equals("6")) { + TrigFunctions(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("6")) { //arctan float curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(inverseTangent(curInt)); - } else if (s.equals("a")) { + TrigFunctions(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("a")) { //Clear Error s = ""; } else if (s.equals("b")) { @@ -284,14 +375,18 @@ else if (s.equals("3")) { } else if (s.equals("c")) { //Back SciMenuHome(); + s = Console.getStringInput("Please select an option"); } else if (s.equals("d")) { //Main Menu Greeting(); + s = Console.getStringInput("Please select an option"); } else if (s.equals("e")) { //Exit ExitCalc(); } else { System.out.println("Please enter a valid response"); + TrigFunctions(); + s = Console.getStringInput("Please select an option"); } } //End Trig @@ -305,25 +400,36 @@ else if (s.equals("4")) { s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(inverseTangent(curInt)); - } else if (s.equals("2")) { + } + else if (s.equals("2")) { //rad - } else if (s.equals("a")) { + } + else if (s.equals("a")) { //Clear Error s = ""; - } else if (s.equals("b")) { + } + else if (s.equals("b")) { //Clear Display s = ""; - } else if (s.equals("c")) { + } + else if (s.equals("c")) { //Back SciMenuHome(); - } else if (s.equals("d")) { + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("d")) { //Main Menu Greeting(); - } else if (s.equals("e")) { + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("e")) { //Exit ExitCalc(); - } else { + } + else { System.out.println("Please enter a valid response"); + ModeChange(); + s = Console.getStringInput("Please select an option"); } } //End Mode Change @@ -337,37 +443,56 @@ else if (s.equals("5")) { s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(logarithm(curInt)); - } else if (s.equals("2")) { + LogFunctions(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("2")) { //inverse log float curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(inverseLogarithm(curInt)); - } else if (s.equals("3")) { + LogFunctions(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("3")) { //ln float curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(naturalLogarithm(curInt)); - } else if (s.equals("4")) { + LogFunctions(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("4")) { //e^x - } else if (s.equals("a")) { + } + else if (s.equals("a")) { //Clear Error s = ""; - } else if (s.equals("b")) { + } + else if (s.equals("b")) { //Clear Display s = ""; - } else if (s.equals("c")) { + } + else if (s.equals("c")) { //Back SciMenuHome(); - } else if (s.equals("d")) { + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("d")) { //Main Menu Greeting(); - } else if (s.equals("e")) { + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("e")) { //Exit ExitCalc(); - } else { + } + else { System.out.println("Please enter a valid response"); + LogFunctions(); + s = Console.getStringInput("Please select an option"); } } //End Log Function @@ -378,25 +503,36 @@ else if (s.equals("6")) { s = Console.getStringInput("Please enter a number"); curInt = Integer.parseInt(s); System.out.println(factorial(curInt)); + SciMenuHome(); + s = Console.getStringInput("Please select an option"); } //End Factorial Function else if (s.equals("a")) { //Clear Error s = ""; - } else if (s.equals("b")) { + } + else if (s.equals("b")) { //Clear Display s = ""; - } else if (s.equals("c")) { + } + else if (s.equals("c")) { //Back Greeting(); - } else if (s.equals("d")) { + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("d")) { //Main Menu Greeting(); - } else if (s.equals("e")) { + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("e")) { //Exit ExitCalc(); - } else { + } + else { System.out.println("Please enter a valid response"); + SciMenuHome(); + s = Console.getStringInput("Please select an option"); } } @@ -404,13 +540,13 @@ else if (s.equals("a")) { else if (s.equals("3")) { System.exit(0); - } else { + } + else { System.out.println("Please enter a valid response"); + Greeting(); } - Greeting(); - s = Console.getStringInput("Please select an option"); } //void main } //main app From b1391db8a7a4db5b2362cab954678e360ef37f15 Mon Sep 17 00:00:00 2001 From: Gregory Davis Date: Sun, 9 Feb 2020 10:46:45 -0500 Subject: [PATCH 42/52] added comments 10:46 --- .../java/com/zipcodewilmington/scientificcalculator/Sci.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index 18c34d68..05513edf 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -107,6 +107,7 @@ public static double logarithm(double a){ public static double inverseLogarithm(double a, double b){ double invLog = (double) (Math.pow(a, b)); return invLog; + //Request for first input to be 10 } public static double naturalLogarithm(double a){ double natLog = (double) Math.log(a); @@ -115,6 +116,7 @@ public static double naturalLogarithm(double a){ public double inverseNaturalLogarithm(double a, double b){ double invNatLog = (double) (Math.pow(a, b)); return invNatLog; + //Request for the first input to be the number e } public static Integer factorial(Integer a){ Integer fact = a; From 15d824d46bb7a44673e9dbb54b30da16c50faee5 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sun, 9 Feb 2020 11:02:33 -0500 Subject: [PATCH 43/52] updated memory in Sci --- .../scientificcalculator/Sci.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index 18c34d68..782a46af 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -32,19 +32,28 @@ public static String switchDisplayModeToDecimal(Integer a){ } - + static double memNum; + static String memoryStatus = "not stored"; + public void memStatus(){ + if (memNum == 0 || memNum > 0 || memNum < 0){ + memoryStatus = "stored"; + } else { + memoryStatus = "not stored"; + } + } public static String memPlus(double a){ - double memNum = a; + memNum = a; String converted = Double.toString(memNum); return converted; } - public void memClear(){ //needs work + public void memClear(){ //needs work + memoryStatus = "not stored"; } - public double recall(double x){ - return x; + public double recall(){ + return memNum; //return memNum; } public static double sine(double a){ From 5508030416a3ae5216a18f75a914a13daf250308 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sun, 9 Feb 2020 11:09:51 -0500 Subject: [PATCH 44/52] moved most of main to console --- .../scientificcalculator/Console.java | 532 +++++++++++++++++- .../scientificcalculator/MainApplication.java | 528 +---------------- 2 files changed, 521 insertions(+), 539 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java index 7fb646d3..976f6dc7 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java @@ -2,7 +2,10 @@ import java.util.Scanner; +import static com.zipcodewilmington.scientificcalculator.Basic.*; import static com.zipcodewilmington.scientificcalculator.EmmaTestMethods.Addition; +import static com.zipcodewilmington.scientificcalculator.Sci.*; +import static com.zipcodewilmington.scientificcalculator.Sci.factorial; /** * Created by leon on 2/9/18. @@ -32,18 +35,173 @@ public static Integer getIntInput(String prompt) { - //public static Double getDoubleInput(String prompt) { - // return null; - //} - - public static void BasicMenu(){ + public static void BasicMenu(String s) { System.out.printf("%-10s %-10s %-10s", "1 - Add |", "2 - Subtract |", "3 - Multiply \n"); System.out.printf("%-10s %-10s %-10s", "4 - Divide |", "5 - Square |", "6 - Square Root \n"); System.out.printf("%-10s %-10s %-10s", "7 - Exponent |", "8 - Inverse |", "9 - Pos <--> Neg \n"); ForAllMenus(); + s = Console.getStringInput("Please select an option"); + if (s.equals("1")) { + //+ + double curInt = 0; + double pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Double.parseDouble(s); + if (pastInt == 0) { + System.out.println(curInt); + } else { + System.out.println(add(pastInt, curInt)); + } + + pastInt = curInt; + + } + BasicMenu(s); + s = Console.getStringInput("Please select an option"); + } else if (s.equals("2")) { + //- + double curInt = 0; + double pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Double.parseDouble(s); + if (pastInt == 0) { + System.out.println(curInt); + } else { + System.out.println(subtract(pastInt, curInt)); + } + + pastInt = curInt; + + } + BasicMenu(s); + s = Console.getStringInput("Please select an option"); + } else if (s.equals("3")) { + //* + double curInt = 0; + double pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Double.parseDouble(s); + if (pastInt == 0) { + System.out.println(curInt); + } else { + System.out.println(multiply(pastInt, curInt)); + } + + pastInt = curInt; + + } + BasicMenu(s); + s = Console.getStringInput("Please select an option"); + } else if (s.equals("4")) { + //divide + double curInt = 0; + double pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Double.parseDouble(s); + if (pastInt == 0) { + System.out.println(curInt); + } else { + System.out.println(divide(pastInt, curInt)); + } + + pastInt = curInt; + + } + BasicMenu(s); + s = Console.getStringInput("Please select an option"); + } else if (s.equals("5")) { + //square + double curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Double.parseDouble(s); + System.out.println(square(curInt)); + BasicMenu(s); + s = Console.getStringInput("Please select an option"); + } else if (s.equals("6")) { + //square root + double curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Double.parseDouble(s); + System.out.println(squareRoot(curInt)); + BasicMenu(s); + s = Console.getStringInput("Please select an option"); + } else if (s.equals("7")) { + //exponent + double curInt = 0; + double pastInt = 0; + + while (!s.equals("x")) { + s = Console.getStringInput("Please enter a number\nEnter x when done"); + if (s.equals("x")) { + break; + } + curInt = Double.parseDouble(s); + System.out.println(exponent(pastInt, curInt)); + pastInt = curInt; + + } + BasicMenu(s); + s = Console.getStringInput("Please select an option"); + } else if (s.equals("8")) { + //inverse + double curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Double.parseDouble(s); + System.out.println(inverse(curInt)); + BasicMenu(s); + s = Console.getStringInput("Please select an option"); + } else if (s.equals("9")) { + //sign change + double curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Double.parseDouble(s); + System.out.println(signChange(curInt)); + BasicMenu(s); + s = Console.getStringInput("Please select an option"); + } else if (s.equals("a")) { + //Clear Error + s = ""; + + } else if (s.equals("b")) { + //Clear Display + s = ""; + } else if ((s.equals("c")) || ((s.equals("d")))) { + //Back + Greeting(); + s = Console.getStringInput("Please select an option"); + } else if (s.equals("e")) { + //Exit + ExitCalc(); + } else { + System.out.println("Please enter a valid response"); + BasicMenu(s); + s = Console.getStringInput("Please select an option"); + } + Greeting(); } - public static void SciMenuHome(){ + + public static void SciMenuHome(String s){ System.out.println("Rotate Display - 1"); System.out.println("Memory - 2"); System.out.println("Trig Functions - 3"); @@ -51,21 +209,186 @@ public static void SciMenuHome(){ System.out.println("Log Functions - 5"); System.out.println("Factorial Functions - 6"); ForAllMenus(); + + s = Console.getStringInput("Please select an option"); + //Start Rotate Display + if (s.equals("1")) { + RotateDisplay(s); + } + else if (s.equals("2")) { + Memory(s); + } + else if (s.equals("3")) { + TrigFunctions(s); + } + else if (s.equals("4")) { + ModeChange(s); + } + else if (s.equals("5")) { + LogFunctions(s); + } + else if (s.equals("6")) { + //Factorial Functions + int curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Integer.parseInt(s); + System.out.println(factorial(curInt)); + SciMenuHome(s); + s = Console.getStringInput("Please select an option"); + } +//End Factorial Function + else if (s.equals("a")) { + //Clear Error + s = ""; + } + else if (s.equals("b")) { + //Clear Display + s = ""; + } + else if (s.equals("c")) { + //Back + Greeting(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("d")) { + //Main Menu + Greeting(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("e")) { + //Exit + ExitCalc(); + } + else { + System.out.println("Please enter a valid response"); + SciMenuHome(s); + s = Console.getStringInput("Please select an option"); + } } - public static void RotateDisplay(){ + + public static void RotateDisplay(String s){ System.out.println("Binary - 1"); System.out.println("Octal - 2"); System.out.println("Decimal - 3"); System.out.println("Hexadecimal - 4"); ForAllMenus(); + + s = Console.getStringInput("Please select an option"); + if (s.equals("1")) { + //bin + int curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Integer.parseInt(s); + System.out.println(switchDisplayModeToBinary(curInt)); + RotateDisplay(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("2")) { + //oct + int curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Integer.parseInt(s); + System.out.println(switchDisplayModeToOctal(curInt)); + RotateDisplay(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("3")) { + //dec + int curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Integer.parseInt(s); + System.out.println(switchDisplayModeToDecimal(curInt)); + RotateDisplay(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("4")) { + //hex + int curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Integer.parseInt(s); + System.out.println(switchDisplayModeToHexadecimal(curInt)); + RotateDisplay(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("a")) { + //Clear Error + s = ""; + } + else if (s.equals("b")) { + //Clear Display + s = ""; + } + else if (s.equals("c")) { + //Back + SciMenuHome(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("d")) { + //Main Menu + Greeting(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("e")) { + //Exit + ExitCalc(); + } + else { + System.out.println("Please enter a valid response"); + RotateDisplay(s); + s = Console.getStringInput("Please select an option"); + } } - public static void Memory(){ + public static void Memory(String s){ System.out.println("M+ - 1"); System.out.println("MC - 2"); System.out.println("MRC - 3"); ForAllMenus(); + + s = Console.getStringInput("Please select an option"); + if (s.equals("1")) { + //M+ + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(memPlus(curInt)); + Memory(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("2")) { + //MC + } + else if (s.equals("3")) { + //MRC + } + else if (s.equals("a")) { + //Clear Error + s = ""; + } + else if (s.equals("b")) { + //Clear Display + s = ""; + } + else if (s.equals("c")) { + //Back + SciMenuHome(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("d")) { + //Main Menu + Greeting(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("e")) { + //Exit + ExitCalc(); + } + else { + System.out.println("Please enter a valid response"); + Memory(s); + s = Console.getStringInput("Please select an option"); + } } - public static void TrigFunctions(){ + public static void TrigFunctions(String s){ System.out.println("Sin - 1"); System.out.println("Cos - 2"); System.out.println("Tan - 3"); @@ -73,18 +396,201 @@ public static void TrigFunctions(){ System.out.println("Arccos - 5"); System.out.println("Arctan - 6"); ForAllMenus(); + + s = Console.getStringInput("Please select an option"); + if (s.equals("1")) { + //sin + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(sine(curInt)); + TrigFunctions(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("2")) { + //cos + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(cosine(curInt)); + TrigFunctions(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("3")) { + //tan + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(tangent(curInt)); + TrigFunctions(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("4")) { + //arcsin + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(inverseSine(curInt)); + TrigFunctions(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("5")) { + //arccos + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(inverseCosine(curInt)); + TrigFunctions(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("6")) { + //arctan + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(inverseTangent(curInt)); + TrigFunctions(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("a")) { + //Clear Error + s = ""; + } else if (s.equals("b")) { + //Clear Display + s = ""; + } else if (s.equals("c")) { + //Back + SciMenuHome(s); + s = Console.getStringInput("Please select an option"); + } else if (s.equals("d")) { + //Main Menu + Greeting(); + s = Console.getStringInput("Please select an option"); + } else if (s.equals("e")) { + //Exit + ExitCalc(); + } else { + System.out.println("Please enter a valid response"); + TrigFunctions(s); + s = Console.getStringInput("Please select an option"); + } } - public static void ModeChange(){ + public static void ModeChange(String s){ System.out.println("Rotate Degrees - 1"); System.out.println("Rotate Radius - 2"); ForAllMenus(); + + s = Console.getStringInput("Please select an option"); + if (s.equals("1")) { + //deg + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(inverseTangent(curInt)); + ModeChange(s); + } + else if (s.equals("2")) { + //rad + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(inverseTangent(curInt)); + ModeChange(s); + } + else if (s.equals("a")) { + //Clear Error + s = ""; + } + else if (s.equals("b")) { + //Clear Display + s = ""; + } + else if (s.equals("c")) { + //Back + SciMenuHome(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("d")) { + //Main Menu + Greeting(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("e")) { + //Exit + ExitCalc(); + } + else { + System.out.println("Please enter a valid response"); + ModeChange(s); + s = Console.getStringInput("Please select an option"); + } } - public static void LogFunctions(){ + public static void LogFunctions(String s){ System.out.println("Log - 1"); System.out.println("Inverse Log - 2"); System.out.println("Ln - 3"); System.out.println("e^x - 4"); ForAllMenus(); + + s = Console.getStringInput("Please select an option"); + if (s.equals("1")) { + //log + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(logarithm(curInt)); + LogFunctions(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("2")) { + //inverse log + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(inverseLogarithm(curInt)); + LogFunctions(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("3")) { + //ln + float curInt = 0; + s = Console.getStringInput("Please enter a number"); + curInt = Float.parseFloat(s); + System.out.println(naturalLogarithm(curInt)); + LogFunctions(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("4")) { + //e^x + } + else if (s.equals("a")) { + //Clear Error + s = ""; + } + else if (s.equals("b")) { + //Clear Display + s = ""; + } + else if (s.equals("c")) { + //Back + SciMenuHome(s); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("d")) { + //Main Menu + Greeting(); + s = Console.getStringInput("Please select an option"); + } + else if (s.equals("e")) { + //Exit + ExitCalc(); + } + else { + System.out.println("Please enter a valid response"); + LogFunctions(s); + s = Console.getStringInput("Please select an option"); + } + Greeting(); } public static void ForAllMenus() { System.out.println("Clear Error - a"); @@ -100,12 +606,10 @@ public static void ExitCalc(){ public static String Greeting(){ Console.println("Welcome to my calculator!"); - String choice = Console.getStringInput("1 - Basic | 2 - Scientific | 3 - Exit"); + String choice = Console.getStringInput("1 - Basic | 2 - Scientific | 3 - Exit"); return choice; } } - //System.out.printf("%-10s %-10s %-10s", "1 - Sine |", "2 - Cosine |", "3 - Tangent \n"); - // System.out.printf("%-10s %-10s %-10s", "4 - Inverse Sine |", "5 - Inverse Cosine |", "6 - Inverse Tangent \n"); \ 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 22b5f8d9..344af88b 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -11,533 +11,13 @@ public class MainApplication { public static void main(String[] args) { String s = Greeting(); if (s.equals("1")) { - BasicMenu(); -//Basic Menu - s = Console.getStringInput("Please select an option"); - if (s.equals("1")) { - //+ - double curInt = 0; - double pastInt = 0; - - while (!s.equals("x")) { - s = Console.getStringInput("Please enter a number\nEnter x when done"); - if (s.equals("x")) { - break; - } - curInt = Double.parseDouble(s); - if(pastInt == 0) { - System.out.println(curInt); - } - else{ - System.out.println(add(pastInt, curInt)); - } - - pastInt = curInt; - - } - BasicMenu(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("2")) { - //- - double curInt = 0; - double pastInt = 0; - - while (!s.equals("x")) { - s = Console.getStringInput("Please enter a number\nEnter x when done"); - if (s.equals("x")) { - break; - } - curInt = Double.parseDouble(s); - if(pastInt == 0) { - System.out.println(curInt); - } - else{ - System.out.println(subtract(pastInt, curInt)); - } - - pastInt = curInt; - - } - BasicMenu(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("3")) { - //* - double curInt = 0; - double pastInt = 0; - - while (!s.equals("x")) { - s = Console.getStringInput("Please enter a number\nEnter x when done"); - if (s.equals("x")) { - break; - } - curInt = Double.parseDouble(s); - if(pastInt == 0) { - System.out.println(curInt); - } - else{ - System.out.println(multiply(pastInt, curInt)); - } - - pastInt = curInt; - - } - BasicMenu(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("4")) { - //divide - double curInt = 0; - double pastInt = 0; - - while (!s.equals("x")) { - s = Console.getStringInput("Please enter a number\nEnter x when done"); - if (s.equals("x")) { - break; - } - curInt = Double.parseDouble(s); - if(pastInt == 0) { - System.out.println(curInt); - } - else{ - System.out.println(divide(pastInt, curInt)); - } - - pastInt = curInt; - - } - BasicMenu(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("5")) { - //square - double curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Double.parseDouble(s); - System.out.println(square(curInt)); - BasicMenu(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("6")) { - //square root - double curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Double.parseDouble(s); - System.out.println(squareRoot(curInt)); - BasicMenu(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("7")) { - //exponent - double curInt = 0; - double pastInt = 0; - - while (!s.equals("x")) { - s = Console.getStringInput("Please enter a number\nEnter x when done"); - if (s.equals("x")) { - break; - } - curInt = Double.parseDouble(s); - System.out.println(exponent(pastInt, curInt)); - pastInt = curInt; - - } - BasicMenu(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("8")) { - //inverse - double curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Double.parseDouble(s); - System.out.println(inverse(curInt)); - BasicMenu(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("9")) { - //sign change - double curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Double.parseDouble(s); - System.out.println(signChange(curInt)); - BasicMenu(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("a")) { - //Clear Error - s = ""; - - } else if (s.equals("b")) { - //Clear Display - s = ""; - } else if ((s.equals("c")) || ((s.equals("d")))) { - //Back - Greeting(); - s = Console.getStringInput("Please select an option"); - } else if (s.equals("e")) { - //Exit - ExitCalc(); - } else { - System.out.println("Please enter a valid response"); - BasicMenu(); - s = Console.getStringInput("Please select an option"); - } - //End Basic - }//end greeting option 1 (basic) + BasicMenu(s); + } -//Start Scientific else if (s.equals("2")) { - SciMenuHome(); - s = Console.getStringInput("Please select an option"); - //Start Rotate Display - if (s.equals("1")) { - RotateDisplay(); - s = Console.getStringInput("Please select an option"); - if (s.equals("1")) { - //bin - int curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Integer.parseInt(s); - System.out.println(switchDisplayModeToBinary(curInt)); - RotateDisplay(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("2")) { - //oct - int curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Integer.parseInt(s); - System.out.println(switchDisplayModeToOctal(curInt)); - RotateDisplay(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("3")) { - //dec - int curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Integer.parseInt(s); - System.out.println(switchDisplayModeToDecimal(curInt)); - RotateDisplay(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("4")) { - //hex - int curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Integer.parseInt(s); - System.out.println(switchDisplayModeToHexadecimal(curInt)); - RotateDisplay(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("a")) { - //Clear Error - s = ""; - } - else if (s.equals("b")) { - //Clear Display - s = ""; - } - else if (s.equals("c")) { - //Back - SciMenuHome(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("d")) { - //Main Menu - Greeting(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("e")) { - //Exit - ExitCalc(); - } - else { - System.out.println("Please enter a valid response"); - RotateDisplay(); - s = Console.getStringInput("Please select an option"); - } - } - -//End Rotate Display -//Start Memory - else if (s.equals("2")) { - Memory(); - s = Console.getStringInput("Please select an option"); - if (s.equals("1")) { - //M+ - float curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Float.parseFloat(s); - System.out.println(memPlus(curInt)); - Memory(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("2")) { - //MC - } - else if (s.equals("3")) { - //MRC - } - else if (s.equals("a")) { - //Clear Error - s = ""; - } - else if (s.equals("b")) { - //Clear Display - s = ""; - } - else if (s.equals("c")) { - //Back - SciMenuHome(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("d")) { - //Main Menu - Greeting(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("e")) { - //Exit - ExitCalc(); - } - else { - System.out.println("Please enter a valid response"); - Memory(); - s = Console.getStringInput("Please select an option"); - } - } -//End Memory -//Start Trig - else if (s.equals("3")) { - TrigFunctions(); - s = Console.getStringInput("Please select an option"); - if (s.equals("1")) { - //sin - float curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Float.parseFloat(s); - System.out.println(sine(curInt)); - TrigFunctions(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("2")) { - //cos - float curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Float.parseFloat(s); - System.out.println(cosine(curInt)); - TrigFunctions(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("3")) { - //tan - float curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Float.parseFloat(s); - System.out.println(tangent(curInt)); - TrigFunctions(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("4")) { - //arcsin - float curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Float.parseFloat(s); - System.out.println(inverseSine(curInt)); - TrigFunctions(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("5")) { - //arccos - float curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Float.parseFloat(s); - System.out.println(inverseCosine(curInt)); - TrigFunctions(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("6")) { - //arctan - float curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Float.parseFloat(s); - System.out.println(inverseTangent(curInt)); - TrigFunctions(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("a")) { - //Clear Error - s = ""; - } else if (s.equals("b")) { - //Clear Display - s = ""; - } else if (s.equals("c")) { - //Back - SciMenuHome(); - s = Console.getStringInput("Please select an option"); - } else if (s.equals("d")) { - //Main Menu - Greeting(); - s = Console.getStringInput("Please select an option"); - } else if (s.equals("e")) { - //Exit - ExitCalc(); - } else { - System.out.println("Please enter a valid response"); - TrigFunctions(); - s = Console.getStringInput("Please select an option"); - } - } -//End Trig -//Start Mode Change - else if (s.equals("4")) { - ModeChange(); - s = Console.getStringInput("Please select an option"); - if (s.equals("1")) { - //deg - float curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Float.parseFloat(s); - System.out.println(inverseTangent(curInt)); - } - else if (s.equals("2")) { - //rad - } - else if (s.equals("a")) { - //Clear Error - s = ""; - } - else if (s.equals("b")) { - //Clear Display - s = ""; - } - else if (s.equals("c")) { - //Back - SciMenuHome(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("d")) { - //Main Menu - Greeting(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("e")) { - //Exit - ExitCalc(); - } - else { - System.out.println("Please enter a valid response"); - ModeChange(); - s = Console.getStringInput("Please select an option"); - } - } -//End Mode Change -//Start Log Function - else if (s.equals("5")) { - LogFunctions(); - s = Console.getStringInput("Please select an option"); - if (s.equals("1")) { - //log - float curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Float.parseFloat(s); - System.out.println(logarithm(curInt)); - LogFunctions(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("2")) { - //inverse log - float curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Float.parseFloat(s); - System.out.println(inverseLogarithm(curInt)); - LogFunctions(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("3")) { - //ln - float curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Float.parseFloat(s); - System.out.println(naturalLogarithm(curInt)); - LogFunctions(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("4")) { - //e^x - } - else if (s.equals("a")) { - //Clear Error - s = ""; - } - else if (s.equals("b")) { - //Clear Display - s = ""; - } - else if (s.equals("c")) { - //Back - SciMenuHome(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("d")) { - //Main Menu - Greeting(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("e")) { - //Exit - ExitCalc(); - } - else { - System.out.println("Please enter a valid response"); - LogFunctions(); - s = Console.getStringInput("Please select an option"); - } - } -//End Log Function -//Start Factorial Function - else if (s.equals("6")) { - //Factorial Functions - int curInt = 0; - s = Console.getStringInput("Please enter a number"); - curInt = Integer.parseInt(s); - System.out.println(factorial(curInt)); - SciMenuHome(); - s = Console.getStringInput("Please select an option"); - } -//End Factorial Function - else if (s.equals("a")) { - //Clear Error - s = ""; - } - else if (s.equals("b")) { - //Clear Display - s = ""; - } - else if (s.equals("c")) { - //Back - Greeting(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("d")) { - //Main Menu - Greeting(); - s = Console.getStringInput("Please select an option"); - } - else if (s.equals("e")) { - //Exit - ExitCalc(); - } - else { - System.out.println("Please enter a valid response"); - SciMenuHome(); - s = Console.getStringInput("Please select an option"); - } + SciMenuHome(s); } -//End Scientific - else if (s.equals("3")) { System.exit(0); } @@ -546,8 +26,6 @@ else if (s.equals("3")) { Greeting(); } - - } //void main } //main app From 0d7b5c925b57a0a5f492aba8f28dd98920838e3f Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sun, 9 Feb 2020 11:10:39 -0500 Subject: [PATCH 45/52] fixed merge conflicts 1110sun --- .../scientificcalculator/Sci.java | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index cb8339f9..cb95eb17 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -41,22 +41,15 @@ public void memStatus(){ memoryStatus = "not stored"; } } - public static String memPlus(double a){ + public static String memPlus(double a) { memNum = a; String converted = Double.toString(memNum); return converted; -<<<<<<< HEAD - } -======= } - public void memClear(){ //needs work ->>>>>>> cbea784ea84d22770b8a18b289a6fa37f42b38a8 - public void memClear(){ //needs work + public void memClear(){ //needs work memoryStatus = "not stored"; - -<<<<<<< HEAD } public double recall(){ return memNum; @@ -64,15 +57,6 @@ public double recall(){ } public static double sine(double a){ double sin = (double) Math.sin(a); -======= - } - public float recall(float x){ - return x; - //return memNum; - } - public static float sine(float a){ - float sin = (float) Math.sin(a); ->>>>>>> cbea784ea84d22770b8a18b289a6fa37f42b38a8 return sin; } public static double cosine(double a){ From 4ad050d3d2b67d2be8404bfc408432da50f55e2f Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sun, 9 Feb 2020 11:15:31 -0500 Subject: [PATCH 46/52] fixed arg err --- .../scientificcalculator/Console.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java index 976f6dc7..7f2ce627 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java @@ -536,6 +536,7 @@ public static void LogFunctions(String s){ if (s.equals("1")) { //log float curInt = 0; + s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(logarithm(curInt)); @@ -545,9 +546,18 @@ public static void LogFunctions(String s){ else if (s.equals("2")) { //inverse log float curInt = 0; + float pastInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); - System.out.println(inverseLogarithm(curInt)); + + if (pastInt == 0) { + System.out.println(curInt); + } else { + System.out.println(inverseLogarithm(pastInt, curInt)); + } + + pastInt = curInt; + LogFunctions(s); s = Console.getStringInput("Please select an option"); } From dfc600ad9c1f3024b2dd4eeb21749347b8e8cbba Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sun, 9 Feb 2020 11:36:47 -0500 Subject: [PATCH 47/52] pushing memstuff --- .../java/com/zipcodewilmington/scientificcalculator/Sci.java | 2 +- .../scientific_calculator/TestMainApplication.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index cb95eb17..76e150d3 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -47,7 +47,7 @@ public static String memPlus(double a) { return converted; } - public void memClear(){ //needs work + public void memClear(){ memoryStatus = "not stored"; } diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index f8f28c64..d6e03fa7 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -210,7 +210,7 @@ public void testLog2(){ @Test public void testInverseLog1(){ Sci calculator = new Sci(); - Assert.assertEquals(2, calculator.inverseLogarithm(100), 0.01); + Assert.assertEquals(1000, calculator.inverseLogarithm(10, 3), 0.01); } @Test From bbeb6ce3f0e5302399ab95623b5dd33fd1237190 Mon Sep 17 00:00:00 2001 From: Gregory Davis Date: Sun, 9 Feb 2020 12:03:52 -0500 Subject: [PATCH 48/52] All tests in, math works except when java is stupid. 12:03 --- .../TestMainApplication.java | 50 ++++++++++++------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index f8f28c64..992f7fbe 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -136,63 +136,73 @@ public void testExponent2() { @Test public void testSine1(){ Sci calculator = new Sci(); - Assert.assertEquals(1, calculator.sine(Math.PI), 0); + Assert.assertEquals(1, calculator.sine(Math.PI/2), 0); } @Test public void testTestSine2(){ Sci calculator = new Sci(); - Assert.assertEquals(1, calculator.sine(45), 0); + Assert.assertEquals(-1, calculator.sine(Math.PI*3/2), 0); } @Test public void testCosine1(){ - + Sci calculator = new Sci(); + Assert.assertEquals(0, calculator.cosine(Math.PI/2), 0); } @Test public void testCosine2(){ - + Sci calculator = new Sci(); + Assert.assertEquals(-1, calculator.cosine(Math.PI), 0); } @Test public void testTangent1(){ - + Sci calculator = new Sci(); + Assert.assertEquals(0, calculator.tangent(Math.PI), 0); } @Test public void testTangent2(){ - + Sci calculator = new Sci(); + Assert.assertEquals(0, calculator.tangent(Math.PI*2), 0); } @Test public void testArcsine1(){ - + Sci calculator = new Sci(); + Assert.assertEquals(Math.PI/2, calculator.inverseSine(1), 0); } @Test public void testArcsine2(){ - + Sci calculator = new Sci(); + Assert.assertEquals(Math.PI/2, calculator.inverseSine(1), 0); } @Test public void testArccosine1(){ - + Sci calculator = new Sci(); + Assert.assertEquals(0, calculator.inverseCosine(1), 0); } @Test public void testArccosine2(){ - + Sci calculator = new Sci(); + Assert.assertEquals(0, calculator.inverseCosine(1), 0); } @Test public void testArctangent1(){ - + Sci calculator = new Sci(); + Assert.assertEquals(Math.PI/4, calculator.inverseTangent(1), 0); } @Test public void testArctangent2(){ - + Sci calculator = new Sci(); + Assert.assertEquals(Math.PI/4, calculator.inverseTangent(1), 0); } @Test @@ -210,33 +220,37 @@ public void testLog2(){ @Test public void testInverseLog1(){ Sci calculator = new Sci(); - Assert.assertEquals(2, calculator.inverseLogarithm(100), 0.01); + Assert.assertEquals(1000, calculator.inverseLogarithm(10, 3), 0.01); } @Test public void testInverseLog2(){ - + Sci calculator = new Sci(); + Assert.assertEquals(8, calculator.inverseLogarithm(2, 3), 0.01); } @Test public void testNaturalLog1(){ Sci calculator = new Sci(); - Assert.assertEquals(1, calculator.naturalLogarithm(5), 0.01); + Assert.assertEquals(1, calculator.naturalLogarithm(Math.E), 0.01); } @Test public void testNaturalLog2(){ - + Sci calculator = new Sci(); + Assert.assertEquals(0, calculator.naturalLogarithm(1), 0.01); } @Test public void testEPower1(){ - + Sci calculator = new Sci(); + Assert.assertEquals(1, calculator.inverseNaturalLogarithm(Math.E, 0), 0.01); } @Test public void testEPower2(){ - + Sci calculator = new Sci(); + Assert.assertEquals(Math.E, calculator.inverseNaturalLogarithm(Math.E, 1), 0.01); } } From 1cad6e5ddf819184ec5cf9eb6721e91fba92bcd6 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Sun, 9 Feb 2020 12:58:01 -0500 Subject: [PATCH 49/52] work damn you --- .../scientificcalculator/Console.java | 250 +++++++++--------- .../scientificcalculator/MainApplication.java | 36 +-- 2 files changed, 145 insertions(+), 141 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java index 7f2ce627..b043d063 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java @@ -3,7 +3,6 @@ import java.util.Scanner; import static com.zipcodewilmington.scientificcalculator.Basic.*; -import static com.zipcodewilmington.scientificcalculator.EmmaTestMethods.Addition; import static com.zipcodewilmington.scientificcalculator.Sci.*; import static com.zipcodewilmington.scientificcalculator.Sci.factorial; @@ -26,22 +25,17 @@ public static String getStringInput(String prompt) { String userInput = scanner.nextLine(); return userInput; } - public static Integer getIntInput(String prompt) { - Scanner scanner = new Scanner(System.in); - println(prompt); - Integer userInput = scanner.nextInt(); - return userInput; - } - public static void BasicMenu(String s) { + + public static void BasicMenu() { System.out.printf("%-10s %-10s %-10s", "1 - Add |", "2 - Subtract |", "3 - Multiply \n"); System.out.printf("%-10s %-10s %-10s", "4 - Divide |", "5 - Square |", "6 - Square Root \n"); System.out.printf("%-10s %-10s %-10s", "7 - Exponent |", "8 - Inverse |", "9 - Pos <--> Neg \n"); ForAllMenus(); - s = Console.getStringInput("Please select an option"); + String s = Console.getStringInput("Please select an option"); if (s.equals("1")) { //+ double curInt = 0; @@ -62,9 +56,10 @@ public static void BasicMenu(String s) { pastInt = curInt; } - BasicMenu(s); - s = Console.getStringInput("Please select an option"); - } else if (s.equals("2")) { + BasicMenu(); + } + + else if (s.equals("2")) { //- double curInt = 0; double pastInt = 0; @@ -84,9 +79,9 @@ public static void BasicMenu(String s) { pastInt = curInt; } - BasicMenu(s); - s = Console.getStringInput("Please select an option"); - } else if (s.equals("3")) { + BasicMenu(); + } + else if (s.equals("3")) { //* double curInt = 0; double pastInt = 0; @@ -106,9 +101,9 @@ public static void BasicMenu(String s) { pastInt = curInt; } - BasicMenu(s); - s = Console.getStringInput("Please select an option"); - } else if (s.equals("4")) { + BasicMenu(); + } + else if (s.equals("4")) { //divide double curInt = 0; double pastInt = 0; @@ -128,25 +123,25 @@ public static void BasicMenu(String s) { pastInt = curInt; } - BasicMenu(s); - s = Console.getStringInput("Please select an option"); - } else if (s.equals("5")) { + BasicMenu(); + } + else if (s.equals("5")) { //square double curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Double.parseDouble(s); System.out.println(square(curInt)); - BasicMenu(s); - s = Console.getStringInput("Please select an option"); - } else if (s.equals("6")) { + BasicMenu(); + } + else if (s.equals("6")) { //square root double curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Double.parseDouble(s); System.out.println(squareRoot(curInt)); - BasicMenu(s); - s = Console.getStringInput("Please select an option"); - } else if (s.equals("7")) { + BasicMenu(); + } + else if (s.equals("7")) { //exponent double curInt = 0; double pastInt = 0; @@ -157,51 +152,58 @@ public static void BasicMenu(String s) { break; } curInt = Double.parseDouble(s); - System.out.println(exponent(pastInt, curInt)); + if(pastInt == 0) { + System.out.println(curInt); + } + else { + System.out.println(exponent(pastInt, curInt)); + } + + pastInt = curInt; } - BasicMenu(s); - s = Console.getStringInput("Please select an option"); - } else if (s.equals("8")) { + BasicMenu(); + } + else if (s.equals("8")) { //inverse double curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Double.parseDouble(s); System.out.println(inverse(curInt)); - BasicMenu(s); - s = Console.getStringInput("Please select an option"); + } else if (s.equals("9")) { //sign change double curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Double.parseDouble(s); System.out.println(signChange(curInt)); - BasicMenu(s); - s = Console.getStringInput("Please select an option"); + BasicMenu(); } else if (s.equals("a")) { //Clear Error s = ""; - + BasicMenu(); } else if (s.equals("b")) { //Clear Display s = ""; + BasicMenu(); } else if ((s.equals("c")) || ((s.equals("d")))) { //Back Greeting(); - s = Console.getStringInput("Please select an option"); + } else if (s.equals("e")) { //Exit ExitCalc(); } else { System.out.println("Please enter a valid response"); - BasicMenu(s); - s = Console.getStringInput("Please select an option"); + BasicMenu(); + } - Greeting(); + + } - public static void SciMenuHome(String s){ + public static void SciMenuHome(){ System.out.println("Rotate Display - 1"); System.out.println("Memory - 2"); System.out.println("Trig Functions - 3"); @@ -210,22 +212,22 @@ public static void SciMenuHome(String s){ System.out.println("Factorial Functions - 6"); ForAllMenus(); - s = Console.getStringInput("Please select an option"); + String s = Console.getStringInput("Please select an option"); //Start Rotate Display if (s.equals("1")) { - RotateDisplay(s); + RotateDisplay(); } else if (s.equals("2")) { - Memory(s); + Memory(); } else if (s.equals("3")) { - TrigFunctions(s); + TrigFunctions(); } else if (s.equals("4")) { - ModeChange(s); + ModeChange(); } else if (s.equals("5")) { - LogFunctions(s); + LogFunctions(); } else if (s.equals("6")) { //Factorial Functions @@ -233,27 +235,28 @@ else if (s.equals("6")) { s = Console.getStringInput("Please enter a number"); curInt = Integer.parseInt(s); System.out.println(factorial(curInt)); - SciMenuHome(s); - s = Console.getStringInput("Please select an option"); + SciMenuHome(); } //End Factorial Function else if (s.equals("a")) { //Clear Error s = ""; + SciMenuHome(); } else if (s.equals("b")) { //Clear Display s = ""; + SciMenuHome(); } else if (s.equals("c")) { //Back Greeting(); - s = Console.getStringInput("Please select an option"); + } else if (s.equals("d")) { //Main Menu Greeting(); - s = Console.getStringInput("Please select an option"); + } else if (s.equals("e")) { //Exit @@ -261,27 +264,27 @@ else if (s.equals("e")) { } else { System.out.println("Please enter a valid response"); - SciMenuHome(s); - s = Console.getStringInput("Please select an option"); + SciMenuHome(); + } + } - public static void RotateDisplay(String s){ + public static void RotateDisplay(){ System.out.println("Binary - 1"); System.out.println("Octal - 2"); System.out.println("Decimal - 3"); System.out.println("Hexadecimal - 4"); ForAllMenus(); - s = Console.getStringInput("Please select an option"); + String s = Console.getStringInput("Please select an option"); if (s.equals("1")) { //bin int curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Integer.parseInt(s); System.out.println(switchDisplayModeToBinary(curInt)); - RotateDisplay(s); - s = Console.getStringInput("Please select an option"); + RotateDisplay(); } else if (s.equals("2")) { //oct @@ -289,8 +292,7 @@ else if (s.equals("2")) { s = Console.getStringInput("Please enter a number"); curInt = Integer.parseInt(s); System.out.println(switchDisplayModeToOctal(curInt)); - RotateDisplay(s); - s = Console.getStringInput("Please select an option"); + RotateDisplay(); } else if (s.equals("3")) { //dec @@ -298,8 +300,7 @@ else if (s.equals("3")) { s = Console.getStringInput("Please enter a number"); curInt = Integer.parseInt(s); System.out.println(switchDisplayModeToDecimal(curInt)); - RotateDisplay(s); - s = Console.getStringInput("Please select an option"); + RotateDisplay(); } else if (s.equals("4")) { //hex @@ -307,8 +308,7 @@ else if (s.equals("4")) { s = Console.getStringInput("Please enter a number"); curInt = Integer.parseInt(s); System.out.println(switchDisplayModeToHexadecimal(curInt)); - RotateDisplay(s); - s = Console.getStringInput("Please select an option"); + RotateDisplay(); } else if (s.equals("a")) { //Clear Error @@ -320,13 +320,13 @@ else if (s.equals("b")) { } else if (s.equals("c")) { //Back - SciMenuHome(s); - s = Console.getStringInput("Please select an option"); + SciMenuHome(); + } else if (s.equals("d")) { //Main Menu Greeting(); - s = Console.getStringInput("Please select an option"); + } else if (s.equals("e")) { //Exit @@ -334,25 +334,27 @@ else if (s.equals("e")) { } else { System.out.println("Please enter a valid response"); - RotateDisplay(s); - s = Console.getStringInput("Please select an option"); + RotateDisplay(); + } + RotateDisplay(); + } - public static void Memory(String s){ + public static void Memory(){ System.out.println("M+ - 1"); System.out.println("MC - 2"); System.out.println("MRC - 3"); ForAllMenus(); - s = Console.getStringInput("Please select an option"); + String s = Console.getStringInput("Please select an option"); if (s.equals("1")) { //M+ float curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(memPlus(curInt)); - Memory(s); - s = Console.getStringInput("Please select an option"); + Memory(); + } else if (s.equals("2")) { //MC @@ -363,20 +365,22 @@ else if (s.equals("3")) { else if (s.equals("a")) { //Clear Error s = ""; + Memory(); } else if (s.equals("b")) { //Clear Display s = ""; + Memory(); } else if (s.equals("c")) { //Back - SciMenuHome(s); - s = Console.getStringInput("Please select an option"); + SciMenuHome(); + } else if (s.equals("d")) { //Main Menu Greeting(); - s = Console.getStringInput("Please select an option"); + } else if (s.equals("e")) { //Exit @@ -384,11 +388,12 @@ else if (s.equals("e")) { } else { System.out.println("Please enter a valid response"); - Memory(s); - s = Console.getStringInput("Please select an option"); + Memory(); + } + } - public static void TrigFunctions(String s){ + public static void TrigFunctions(){ System.out.println("Sin - 1"); System.out.println("Cos - 2"); System.out.println("Tan - 3"); @@ -397,15 +402,15 @@ public static void TrigFunctions(String s){ System.out.println("Arctan - 6"); ForAllMenus(); - s = Console.getStringInput("Please select an option"); + String s = Console.getStringInput("Please select an option"); if (s.equals("1")) { //sin float curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(sine(curInt)); - TrigFunctions(s); - s = Console.getStringInput("Please select an option"); + TrigFunctions(); + } else if (s.equals("2")) { //cos @@ -413,8 +418,7 @@ else if (s.equals("2")) { s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(cosine(curInt)); - TrigFunctions(s); - s = Console.getStringInput("Please select an option"); + TrigFunctions(); } else if (s.equals("3")) { //tan @@ -422,8 +426,7 @@ else if (s.equals("3")) { s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(tangent(curInt)); - TrigFunctions(s); - s = Console.getStringInput("Please select an option"); + TrigFunctions(); } else if (s.equals("4")) { //arcsin @@ -431,8 +434,7 @@ else if (s.equals("4")) { s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(inverseSine(curInt)); - TrigFunctions(s); - s = Console.getStringInput("Please select an option"); + TrigFunctions(); } else if (s.equals("5")) { //arccos @@ -440,8 +442,7 @@ else if (s.equals("5")) { s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(inverseCosine(curInt)); - TrigFunctions(s); - s = Console.getStringInput("Please select an option"); + TrigFunctions(); } else if (s.equals("6")) { //arctan @@ -449,53 +450,53 @@ else if (s.equals("6")) { s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(inverseTangent(curInt)); - TrigFunctions(s); - s = Console.getStringInput("Please select an option"); + TrigFunctions(); } else if (s.equals("a")) { //Clear Error s = ""; + TrigFunctions(); } else if (s.equals("b")) { //Clear Display s = ""; + TrigFunctions(); } else if (s.equals("c")) { //Back - SciMenuHome(s); - s = Console.getStringInput("Please select an option"); + SciMenuHome(); + } else if (s.equals("d")) { //Main Menu Greeting(); - s = Console.getStringInput("Please select an option"); + } else if (s.equals("e")) { //Exit ExitCalc(); } else { System.out.println("Please enter a valid response"); - TrigFunctions(s); - s = Console.getStringInput("Please select an option"); + + } + TrigFunctions(); } - public static void ModeChange(String s){ + public static void ModeChange(){ System.out.println("Rotate Degrees - 1"); System.out.println("Rotate Radius - 2"); ForAllMenus(); - s = Console.getStringInput("Please select an option"); + String s = Console.getStringInput("Please select an option"); if (s.equals("1")) { //deg float curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); - System.out.println(inverseTangent(curInt)); - ModeChange(s); + ModeChange(); } else if (s.equals("2")) { //rad float curInt = 0; s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); - System.out.println(inverseTangent(curInt)); - ModeChange(s); + ModeChange(); } else if (s.equals("a")) { //Clear Error @@ -507,13 +508,13 @@ else if (s.equals("b")) { } else if (s.equals("c")) { //Back - SciMenuHome(s); - s = Console.getStringInput("Please select an option"); + SciMenuHome(); + } else if (s.equals("d")) { //Main Menu Greeting(); - s = Console.getStringInput("Please select an option"); + } else if (s.equals("e")) { //Exit @@ -521,18 +522,20 @@ else if (s.equals("e")) { } else { System.out.println("Please enter a valid response"); - ModeChange(s); - s = Console.getStringInput("Please select an option"); + ModeChange(); + } + ModeChange(); + } - public static void LogFunctions(String s){ + public static void LogFunctions(){ System.out.println("Log - 1"); System.out.println("Inverse Log - 2"); System.out.println("Ln - 3"); System.out.println("e^x - 4"); ForAllMenus(); - s = Console.getStringInput("Please select an option"); + String s = Console.getStringInput("Please select an option"); if (s.equals("1")) { //log float curInt = 0; @@ -540,8 +543,7 @@ public static void LogFunctions(String s){ s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(logarithm(curInt)); - LogFunctions(s); - s = Console.getStringInput("Please select an option"); + } else if (s.equals("2")) { //inverse log @@ -558,8 +560,7 @@ else if (s.equals("2")) { pastInt = curInt; - LogFunctions(s); - s = Console.getStringInput("Please select an option"); + } else if (s.equals("3")) { //ln @@ -567,8 +568,7 @@ else if (s.equals("3")) { s = Console.getStringInput("Please enter a number"); curInt = Float.parseFloat(s); System.out.println(naturalLogarithm(curInt)); - LogFunctions(s); - s = Console.getStringInput("Please select an option"); + } else if (s.equals("4")) { //e^x @@ -583,13 +583,13 @@ else if (s.equals("b")) { } else if (s.equals("c")) { //Back - SciMenuHome(s); - s = Console.getStringInput("Please select an option"); + SciMenuHome(); + } else if (s.equals("d")) { //Main Menu - Greeting(); - s = Console.getStringInput("Please select an option"); + Greeting(); + } else if (s.equals("e")) { //Exit @@ -597,10 +597,10 @@ else if (s.equals("e")) { } else { System.out.println("Please enter a valid response"); - LogFunctions(s); - s = Console.getStringInput("Please select an option"); + LogFunctions(); + } - Greeting(); + LogFunctions(); } public static void ForAllMenus() { System.out.println("Clear Error - a"); @@ -614,10 +614,10 @@ public static void ExitCalc(){ System.exit(0); } - public static String Greeting(){ + public static String Greeting() { Console.println("Welcome to my calculator!"); - String choice = Console.getStringInput("1 - Basic | 2 - Scientific | 3 - Exit"); - return choice; + String s = Console.getStringInput("1 - Basic | 2 - Scientific | 3 - Exit"); + return s; } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index 344af88b..b8d8f64e 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -9,22 +9,26 @@ */ public class MainApplication { public static void main(String[] args) { - String s = Greeting(); - if (s.equals("1")) { - BasicMenu(s); - } - - else if (s.equals("2")) { - SciMenuHome(s); - } - - else if (s.equals("3")) { - System.exit(0); - } - else { - System.out.println("Please enter a valid response"); - Greeting(); - } + + + + String s = Greeting(); + if (s.equals("1")) { + BasicMenu(); + } + + else if (s.equals("2")) { + SciMenuHome(); + } + + else if (s.equals("xxx")) { + System.exit(0); + } + else { + System.out.println("Please enter a valid response"); + Greeting(); + } + } //void main } //main app From b63404f1a58e16c66b3c6135eb19c80fccea4798 Mon Sep 17 00:00:00 2001 From: Gregory Davis Date: Sun, 9 Feb 2020 12:58:09 -0500 Subject: [PATCH 50/52] added comments 12:58 --- .../TestMainApplication.java | 91 +++++++++++-------- 1 file changed, 51 insertions(+), 40 deletions(-) diff --git a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java index 992f7fbe..f27f5567 100644 --- a/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java +++ b/src/test/java/com/zipcodewilmington/scientific_calculator/TestMainApplication.java @@ -3,12 +3,16 @@ import com.sun.corba.se.impl.interceptors.PICurrent; import com.zipcodewilmington.scientificcalculator.Basic; import com.zipcodewilmington.scientificcalculator.Sci; +import com.zipcodewilmington.scientificcalculator.Console; +import com.zipcodewilmington.scientificcalculator.MainApplication; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; +import static org.junit.Assert.assertEquals; + /** * Created by leon on 2/9/18. */ @@ -17,240 +21,247 @@ public class TestMainApplication { @Test public void testAdd1(){ Basic calculator = new Basic(); - Assert.assertEquals(5, calculator.add(2, 3), 0); + assertEquals(5, calculator.add(2, 3), 0); } @Test public void testAdd2(){ Basic calculator = new Basic(); - Assert.assertEquals(15, calculator.add(7, 8), 0); + assertEquals(15, calculator.add(7, 8), 0); } @Test public void testMinus1(){ Basic calculator = new Basic(); - Assert.assertEquals(15, calculator.subtract(19, 4), 0); + assertEquals(15, calculator.subtract(19, 4), 0); } @Test public void testMinus2(){ Basic calculator = new Basic(); - Assert.assertEquals(99, calculator.subtract(123, 24), 0); + assertEquals(99, calculator.subtract(123, 24), 0); } @Test public void testMultiply1(){ Basic calculator = new Basic(); - Assert.assertEquals(20, calculator.multiply(5, 4), 0); + assertEquals(20, calculator.multiply(5, 4), 0); } @Test public void testMultiply2(){ Basic calculator = new Basic(); - Assert.assertEquals(15, calculator.multiply(5, 3), 0); + assertEquals(15, calculator.multiply(5, 3), 0); } @Test public void testMultiplyByZero(){ Basic calculator = new Basic(); - Assert.assertEquals(0, calculator.multiply(5, 0), 0); + assertEquals(0, calculator.multiply(5, 0), 0); } @Test public void testDivide1(){ Basic calculator = new Basic(); - Assert.assertEquals(5, calculator.divide(10, 2), 0); + assertEquals(5, calculator.divide(10, 2), 0); } @Test public void testDivide2(){ Basic calculator = new Basic(); - Assert.assertEquals(3.33, calculator.divide(10, 3), 0.01); + assertEquals(3.33, calculator.divide(10, 3), 0.01); } @Test public void testDivideByZero(){ Basic calculator = new Basic(); - Assert.assertEquals(15, calculator.divide(5, 0), 0); + assertEquals(15, calculator.divide(5, 0), 0); } @Test public void testSquare1(){ Basic calculator = new Basic(); - Assert.assertEquals(100, calculator.square(10), 0); + assertEquals(100, calculator.square(10), 0); } @Test public void testSquare2(){ Basic calculator = new Basic(); - Assert.assertEquals(25, calculator.square(5), 0); + assertEquals(25, calculator.square(5), 0); } @Test public void testSquareRoot1(){ Basic calculator = new Basic(); - Assert.assertEquals(5, calculator.squareRoot(25), 0); + assertEquals(5, calculator.squareRoot(25), 0); } @Test public void testSquareRoot2(){ Basic calculator = new Basic(); - Assert.assertEquals(1.4142135, calculator.squareRoot(2), 0.1); + assertEquals(1.4142135, calculator.squareRoot(2), 0.1); } @Test public void testInverse1(){ Basic calculator = new Basic(); - Assert.assertEquals(1/25, calculator.inverse(25), 0.1); + assertEquals(1/25, calculator.inverse(25), 0.1); } @Test public void testInverse2(){ Basic calculator = new Basic(); - Assert.assertEquals(0.5, calculator.inverse(2), 0.1); + assertEquals(0.5, calculator.inverse(2), 0.1); } @Test public void testPosToNeg1(){ Basic calculator = new Basic(); - Assert.assertEquals(-2, calculator.signChange(2), 0.1); + assertEquals(-2, calculator.signChange(2), 0.1); } @Test public void testPosToNeg2(){ Basic calculator = new Basic(); - Assert.assertEquals(12345, calculator.signChange(-12345), 0.1); + assertEquals(12345, calculator.signChange(-12345), 0.1); } @Test public void testExponent1(){ Basic calculator = new Basic(); - Assert.assertEquals(343, calculator.exponent(7, 3), 0.1); + assertEquals(343, calculator.exponent(7, 3), 0.1); } @Test public void testExponent2() { Basic calculator = new Basic(); - Assert.assertEquals(343, calculator.exponent(0, 0), 0.1); + assertEquals(343, calculator.exponent(0, 0), 0.1); } @Test public void testSine1(){ Sci calculator = new Sci(); - Assert.assertEquals(1, calculator.sine(Math.PI/2), 0); + assertEquals(1, calculator.sine(Math.PI/2), 0); } @Test public void testTestSine2(){ Sci calculator = new Sci(); - Assert.assertEquals(-1, calculator.sine(Math.PI*3/2), 0); + assertEquals(-1, calculator.sine(Math.PI*3/2), 0); } @Test public void testCosine1(){ Sci calculator = new Sci(); - Assert.assertEquals(0, calculator.cosine(Math.PI/2), 0); + assertEquals(0, calculator.cosine(Math.PI/2), 0); } @Test public void testCosine2(){ Sci calculator = new Sci(); - Assert.assertEquals(-1, calculator.cosine(Math.PI), 0); + assertEquals(-1, calculator.cosine(Math.PI), 0); } @Test public void testTangent1(){ Sci calculator = new Sci(); - Assert.assertEquals(0, calculator.tangent(Math.PI), 0); + assertEquals(0, calculator.tangent(Math.PI), 0); } @Test public void testTangent2(){ Sci calculator = new Sci(); - Assert.assertEquals(0, calculator.tangent(Math.PI*2), 0); + assertEquals(0, calculator.tangent(Math.PI*2), 0); } @Test public void testArcsine1(){ Sci calculator = new Sci(); - Assert.assertEquals(Math.PI/2, calculator.inverseSine(1), 0); + assertEquals(Math.PI/2, calculator.inverseSine(1), 0); } @Test public void testArcsine2(){ Sci calculator = new Sci(); - Assert.assertEquals(Math.PI/2, calculator.inverseSine(1), 0); + assertEquals(Math.PI/2, calculator.inverseSine(1), 0); } @Test public void testArccosine1(){ Sci calculator = new Sci(); - Assert.assertEquals(0, calculator.inverseCosine(1), 0); + assertEquals(0, calculator.inverseCosine(1), 0); } @Test public void testArccosine2(){ Sci calculator = new Sci(); - Assert.assertEquals(0, calculator.inverseCosine(1), 0); + assertEquals(0, calculator.inverseCosine(1), 0); } @Test public void testArctangent1(){ Sci calculator = new Sci(); - Assert.assertEquals(Math.PI/4, calculator.inverseTangent(1), 0); + assertEquals(Math.PI/4, calculator.inverseTangent(1), 0); } @Test public void testArctangent2(){ Sci calculator = new Sci(); - Assert.assertEquals(Math.PI/4, calculator.inverseTangent(1), 0); + assertEquals(Math.PI/4, calculator.inverseTangent(1), 0); } @Test public void testLog1(){ Sci calculator = new Sci(); - Assert.assertEquals(0.77815, calculator.logarithm(6), 0.01); + assertEquals(0.77815, calculator.logarithm(6), 0.01); } @Test public void testLog2(){ Sci calculator = new Sci(); - Assert.assertEquals(2, calculator.logarithm(100), 0.01); + assertEquals(2, calculator.logarithm(100), 0.01); } @Test public void testInverseLog1(){ Sci calculator = new Sci(); - Assert.assertEquals(1000, calculator.inverseLogarithm(10, 3), 0.01); + assertEquals(1000, calculator.inverseLogarithm(10, 3), 0.01); } @Test public void testInverseLog2(){ Sci calculator = new Sci(); - Assert.assertEquals(8, calculator.inverseLogarithm(2, 3), 0.01); + assertEquals(8, calculator.inverseLogarithm(2, 3), 0.01); } @Test public void testNaturalLog1(){ Sci calculator = new Sci(); - Assert.assertEquals(1, calculator.naturalLogarithm(Math.E), 0.01); + assertEquals(1, calculator.naturalLogarithm(Math.E), 0.01); } @Test public void testNaturalLog2(){ Sci calculator = new Sci(); - Assert.assertEquals(0, calculator.naturalLogarithm(1), 0.01); + assertEquals(0, calculator.naturalLogarithm(1), 0.01); } @Test public void testEPower1(){ Sci calculator = new Sci(); - Assert.assertEquals(1, calculator.inverseNaturalLogarithm(Math.E, 0), 0.01); + assertEquals(1, calculator.inverseNaturalLogarithm(Math.E, 0), 0.01); } @Test public void testEPower2(){ Sci calculator = new Sci(); - Assert.assertEquals(Math.E, calculator.inverseNaturalLogarithm(Math.E, 1), 0.01); + assertEquals(Math.E, calculator.inverseNaturalLogarithm(Math.E, 1), 0.01); + } +/* + @Test + public void mainApp(){ + MainApplication mainMenu = new MainApplication(); + assertEquals("1", mainMenu.main("1")); } + */ } From 57fdbfeb4d0cc5f13a283b77f31d50d7a5864161 Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sun, 9 Feb 2020 13:34:07 -0500 Subject: [PATCH 51/52] resolved memory with console --- .../scientificcalculator/Console.java | 18 +++++++-- .../scientificcalculator/Sci.java | 37 ++++++++++++++----- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java index b043d063..6100ab74 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java @@ -340,7 +340,7 @@ else if (s.equals("e")) { RotateDisplay(); } - public static void Memory(){ + public static void Memory() { System.out.println("M+ - 1"); System.out.println("MC - 2"); System.out.println("MRC - 3"); @@ -355,12 +355,24 @@ public static void Memory(){ System.out.println(memPlus(curInt)); Memory(); - } - else if (s.equals("2")) { + } else if (s.equals("2")) { //MC + + memClear(); + Memory(); } + else if (s.equals("3")) { //MRC + checkMemStatus(); + if (memoryStatus.equals("stored")) { + System.out.println(memNum); + Memory(); + } else { + System.out.println("no memory stored"); + Memory(); + } + } else if (s.equals("a")) { //Clear Error diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index 76e150d3..b223c64e 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -34,27 +34,46 @@ public static String switchDisplayModeToDecimal(Integer a){ static double memNum; static String memoryStatus = "not stored"; - public void memStatus(){ + public static void checkMemStatus(){ if (memNum == 0 || memNum > 0 || memNum < 0){ memoryStatus = "stored"; } else { memoryStatus = "not stored"; } } - public static String memPlus(double a) { - memNum = a; - String converted = Double.toString(memNum); - return converted; + public static double memPlus(double a) { + checkMemStatus(); + if (memoryStatus.equals("stored")){ + memNum += a; + } else { + memNum = a; + } + + return memNum; } - public void memClear(){ + public static void memClear(){ memoryStatus = "not stored"; + + } + + public static String noMem() { + return "no memory stored"; + } + + public static double yesMem(){ + return memNum; } - public double recall(){ - return memNum; - //return memNum; + + public static void recall() { + checkMemStatus(); + if (memoryStatus.equals("not stored")) { + noMem(); + } else { + yesMem(); } + } public static double sine(double a){ double sin = (double) Math.sin(a); return sin; From 83ceb41c026fac2f0fdad73e656d34c2cbe3d10e Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Sun, 9 Feb 2020 13:55:38 -0500 Subject: [PATCH 52/52] fixed memory erros --- .../zipcodewilmington/scientificcalculator/Console.java | 7 +++++-- .../com/zipcodewilmington/scientificcalculator/Sci.java | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java index 6100ab74..660896b4 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Console.java @@ -354,22 +354,25 @@ public static void Memory() { curInt = Float.parseFloat(s); System.out.println(memPlus(curInt)); Memory(); + memoryStatus = "stored"; } else if (s.equals("2")) { //MC memClear(); Memory(); + memoryStatus = "not stored"; + } else if (s.equals("3")) { //MRC - checkMemStatus(); + if (memoryStatus.equals("stored")) { System.out.println(memNum); Memory(); } else { - System.out.println("no memory stored"); + System.out.println("No memory stored!"); Memory(); } diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java index b223c64e..290707a5 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Sci.java @@ -54,6 +54,7 @@ public static double memPlus(double a) { public static void memClear(){ memoryStatus = "not stored"; + memNum = 0; }