From 5c851b8ceaddfa9aadd35bc89897cbe93e3ad7d0 Mon Sep 17 00:00:00 2001 From: mgawron8 <92128861+mgawron8@users.noreply.github.com> Date: Sat, 30 Oct 2021 17:02:30 -0400 Subject: [PATCH 1/3] Main application and core features --- .DS_Store | Bin 0 -> 6148 bytes src/.DS_Store | Bin 0 -> 6148 bytes src/main/.DS_Store | Bin 0 -> 6148 bytes src/main/java/.DS_Store | Bin 0 -> 6148 bytes src/main/java/com/.DS_Store | Bin 0 -> 6148 bytes src/main/java/com/zipcodewilmington/.DS_Store | Bin 0 -> 6148 bytes .../scientificcalculator/.DS_Store | Bin 0 -> 6148 bytes .../scientificcalculator/Console.java | 22 +++++- .../scientificcalculator/CoreFeatures.java | 66 ++++++++++++++++++ .../scientificcalculator/MainApplication.java | 39 ++++++++--- 10 files changed, 116 insertions(+), 11 deletions(-) create mode 100644 .DS_Store create mode 100644 src/.DS_Store create mode 100644 src/main/.DS_Store create mode 100644 src/main/java/.DS_Store create mode 100644 src/main/java/com/.DS_Store create mode 100644 src/main/java/com/zipcodewilmington/.DS_Store create mode 100644 src/main/java/com/zipcodewilmington/scientificcalculator/.DS_Store create mode 100644 src/main/java/com/zipcodewilmington/scientificcalculator/CoreFeatures.java diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f7f7b2ad01042af453f4e499346b3e1f8010273a GIT binary patch literal 6148 zcmeHK&2G~`5S~p^x(-6*fJ85q_R?DvB`vDT0m%*Np$DW2SLFbxwd;sla=lUPG_)be zuR&je=imu=obv5YqK1@f1ZYQ^{bpxpcI9vF9WN2F?kMgMHHe5q6;?bn4~QC9x+E3r zSpzaX$7i~v^e~m@QMwfE9DgGNYVX!*KoUFGqI>%%BaEomVjtSN(*ldgqqlSbZ;##p zTgZ#ej?Xi`|CUjuoQ8D17{xXpj*7cqHSX@NbK9(|_+hKH)^v9=-XRl>egh|#P>f|KuBjm%oB#Y&^D@R$J z>v;k*z`4i0)5gYRva`3{6rH`@X;VyIZnvA_#m??@>hb4WomYovm)AFwFVnBz6fgJ& z@DXTvYHnZ05#lMcVIalXaUph+iYFCWaV z%D4j6(BZ^*A4YZC!de vRci(G45~!Ml?LZ2Fmx$KtSZGDP%ZEaWdMDPr9pTg?ngk=;2OukN*VYCY4dYw literal 0 HcmV?d00001 diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6853a3ee6c4bdbdc1ce2670cdd9dee60c6618d3d GIT binary patch literal 6148 zcmeHK!AiqG5S^`2w-vDmL65n3E7Gcn9)wuy!J81#gNi1$Xdq^#NiA9{`3?OEzr!!^ zb982RE!yf;RAylI&CbqjvTws~1^`68)2soM0YIV>7K+$>Av8`pA_ePl5CzS#6RWc@ zRw4FjLYCjp0PURvmk>Y%$^?t-S8k_nyH@0Hv>`@W$~mu-|H=}Emhpw+G@Yz_SToG6?bKMwcjtwxrN%s>dNZSSss z|6uk);D@SZ#^O6XqA^(Dwck!+m7JrG;vLAK1u0}h1U=!{M}n}+!VEA2%)nn@z#fHi z>My)3zauli4E!hqbUwJKgr3FRpguaV(Io&P{YGj*TmSkay5vCgEanE$gCa~SqDd9D z#1OV}5GEbRJsY1JH0dDplW`vVWML~5VG9r8>TnRAL2j7=X5cdeW2RfC`+xiU`u}qh z_m}}@;9oHyoQB`11*g4`2;?W z&g?EEir$PdWG0#Yrn58K%(u;MhcU)$!*-FeEMrW7A|}!>d?PrIx*!STNdj_QqY=n! zFOVKQH?z<9I$UM#)4|-;wU%g)7528ZhjVF?+mDM#N zG9t5)xpKO4>_l!f9Ms(Y1wNg)QP(r}sg%LocD*ydGj3+Lj$|0Qe%R@&WWU{kkjryF zY|C*?4#W09t>fqkA<`n<%;qMOa-?+k<$+Y8Qy?z7C(z4BnF59VqggvFh`qMUxHew1Y&>~_+19@ ze6TS^&TlxRrpde*FP0bO720V~yYe;W`yir*hL`aML+(oeuN1iH|kv zbjH=2VIA{kZaNfh8V_!%aK>$oG!g^Ez-I=q_XEk|{eS#(|F42*AO?tmQ21| zwVAthp-Q}KEzlMy3dY46=P6*Qs~BSOD$ao_0l$R?plvYL2p$mn5l}SHKn(mT10SsX BTJ-<` literal 0 HcmV?d00001 diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f00ff0780d9fdc6613cf3d9e684e7a1f13bb92a4 GIT binary patch literal 6148 zcmeHK!AiqG5Z!I7ZYyFBf<5Nqtw>u%^dQ7q54{NyJ*a5X77fI#w5dgFCBLD6j*uaJaQwD?8QQol)5t?$s(~XM1aBG|H>>jp}~$`tI>*_&j=f zwL2l&0IEFVcsJsWS8%H|60na#k9L2~CFaylM+%P}~oLZinintJFfEoBL2Jn1v zKoMQS)S@{$U@$EJU=G|yz&1bsfDSqUUBc8NctE601+=M>S`10OgS6=|?^1kf(WVP& z-VE!|nyzZ<--0Bql=>i?u|D)oIMD}{_O2J&gX?WbE*>_G+~3fD z}~hWaBp|n zH;bp+gT8sPv%6e&^utHPX9q`TpUxK-%gDu<_`Q4h*gZ0JhKhkMD)K0!Fdz*4&H(p* zkRIRvFaO^EyC4~a0b$_(WI(m|?CU0yZAufyj@5qd^8?;GZ(^6QRLtCIA2c literal 0 HcmV?d00001 diff --git a/src/main/java/com/zipcodewilmington/.DS_Store b/src/main/java/com/zipcodewilmington/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c61fb8ec4077ee5279504098eb9960c9334a6e5d GIT binary patch literal 6148 zcmeHK!EVz)5S>i}-2@?WsMH?!!Yx8ci>h)!GNBxLLo$K`pw>@$V{?Rtnv4W^?$QHO{$l(Esm@Dt&A))i?4&jwJr z8Ukh6YQ&{$x&{HX>L>G@CWk*`ryh5 ztUsue&dRe;=Q2IZv$E>-zNyAW^VaQ6t=qbNxBWIgwX?WNs%be$Ca?MFc~YIG!G2+F zeq$%;%WOP5?rc4^MU`a5c;b??(HJ3bUS-9|&IWc`j7nE0_7hsSbnCdYGoSAr>~>B6 zV1Lmy^GCbAu6ek(zgV>N_Wl0jqmvIGKg~ZczI=7BND3dilY0S|Z~^1Di9C-dMQ)4t z$XV7~))5p2gaKh-4Ge^%N8ee)TC#*NAPoFl4Dk72po~$#+M_!`*r{Cf@BZ|gn|E)0o6Q=4+nU+aJR0!CEv9MdIDwPxZ2}Q3JiA@BbKk? b9jFud4I98HVC@kei2MjR8e|X#*2=&&3o34B literal 0 HcmV?d00001 diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/.DS_Store b/src/main/java/com/zipcodewilmington/scientificcalculator/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f20ab09807812687543bc5cee12a571e5f977eee GIT binary patch literal 6148 zcmeHKyG{c!5FA5_NKmAppma+Ui9c{cC@84-0g^yLbmEXmsPCKjL73S!k5jIW5ZaBr zvtIA6&m+YT0BOE^xCABu#%#hQV?g8{96GAO!eljCGfHT~3olnf1;f243_L`n8QT3dM{W|Z=z4%qfiiHXW zf`MQl7zhRq!~oB1$@s)EbTAMM1Owj;Xn)9T!cwtww5@|m*Jq87gc91iDhqSPQn7R7 z2qk$c(Nj}>VkA$eKi9ZYv2*lvB%7Ia>daq{mt?ckpDi4zIED@ef`L8*$KIXj{J-X3 zX7G{UPl;YI5Dfe?2GVG8x0rKL^=#c+p3d6LcF!hJTqlD Date: Sat, 30 Oct 2021 17:10:58 -0400 Subject: [PATCH 2/3] Main application and Core Features v1 --- .../scientificcalculator/MainApplication.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index be5d35f3..c89551f6 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -11,7 +11,7 @@ public class MainApplication { double savedNumber; static double currentNumber; - +//how does git work public static void main(String[] args) { int startingNumber = 0; @@ -30,7 +30,7 @@ public static double getUserInput() { return userInput; } public static void printNumber(){ - + } } From 458a0025c914b067c368bdc37d3cf55c0064d59f Mon Sep 17 00:00:00 2001 From: mgawron8 <92128861+mgawron8@users.noreply.github.com> Date: Sun, 31 Oct 2021 15:09:16 -0400 Subject: [PATCH 3/3] newest intteration of main and core features --- .../scientificcalculator/CoreFeatures.java | 28 +++++++++++++++---- .../scientificcalculator/MainApplication.java | 8 ++++-- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CoreFeatures.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CoreFeatures.java index ecd4a08a..e9adf02f 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/CoreFeatures.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CoreFeatures.java @@ -32,6 +32,11 @@ public static void userChoice(String selection){ exponents(); }else if(selection.equalsIgnoreCase("invert")) { invert(); + }else if(selection.equalsIgnoreCase("Scientific")){ + //scientificFunctions. + }else{ + System.out.println("Invalid Choice, Please try again"); + provideOptions(); } } @@ -40,19 +45,32 @@ public static void basicoperations(){ Scanner scanner = new Scanner(System.in); String selection = String.valueOf(scanner.nextLine()); if(selection.equals("+")){ - System.out.println(MainApplication.currentNumber + MainApplication.getUserInput()); + double output = (MainApplication.currentNumber + MainApplication.getUserInput()); + MainApplication.printNumber(output); provideOptions(); }else if(selection.equals("-")){ - + double output = (MainApplication.currentNumber - MainApplication.getUserInput()); + MainApplication.printNumber((output)); + provideOptions(); }else if(selection.equals("*")){ - + double output = (MainApplication.currentNumber * MainApplication.getUserInput()); + MainApplication.printNumber((output)); + provideOptions(); }else if(selection.equals("/")){ - + double number2 = MainApplication.getUserInput(); + double output = (MainApplication.currentNumber / number2); + MainApplication.printNumber((output)); + provideOptions(); + }else { + System.out.println("invalid choice, please choose again"); + basicoperations(); } } public static void square(){ - + double output = (MainApplication.currentNumber * MainApplication.currentNumber); + MainApplication.printNumber(output); + provideOptions(); } public static void squareroot(){ diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java index c89551f6..0f590be6 100644 --- a/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java +++ b/src/main/java/com/zipcodewilmington/scientificcalculator/MainApplication.java @@ -10,6 +10,7 @@ public class MainApplication { double userInput; double savedNumber; static double currentNumber; + static double output; //how does git work @@ -19,7 +20,7 @@ public static void main(String[] args) { Console.println("Welcome to our calculator!"); System.out.println(startingNumber); currentNumber = getUserInput(); - System.out.println(currentNumber); + printNumber(currentNumber); CoreFeatures.provideOptions(); } @@ -29,7 +30,10 @@ public static double getUserInput() { Double userInput = Double.valueOf(scanner.nextLine()); return userInput; } - public static void printNumber(){ + public static void printNumber(double output){ + + System.out.println(output); + }