From a61f33d332864bc639c1ed420eab8b19989b798e Mon Sep 17 00:00:00 2001 From: megha saxena Date: Sun, 3 Dec 2023 17:24:37 -0600 Subject: [PATCH 01/18] message --- .../src/main/Java/org/launchcode/Area.java | 33 +++++++++++++++++++ .../Java/studios/areaofacircle/Circle.java | 11 +++++++ 2 files changed, 44 insertions(+) create mode 100644 datatypes/datatypes-studio/src/main/Java/org/launchcode/Area.java create mode 100644 datatypes/datatypes-studio/src/main/Java/studios/areaofacircle/Circle.java diff --git a/datatypes/datatypes-studio/src/main/Java/org/launchcode/Area.java b/datatypes/datatypes-studio/src/main/Java/org/launchcode/Area.java new file mode 100644 index 000000000..850309756 --- /dev/null +++ b/datatypes/datatypes-studio/src/main/Java/org/launchcode/Area.java @@ -0,0 +1,33 @@ +package org.launchcode; + +import studios.areaofacircle.Circle; + +import java.util.Scanner; + +public class Area { + public static void main(String[] args) { + Double radius; + double pi = 3.14; + Double area; + Scanner input; + + input = new Scanner(System.in); + System.out.println("Enter a radius: "); + radius = input.nextDouble(); + + if (radius.isNaN()) { + System.out.println("Invalid Input"); + input.close(); + } + + if (radius < 0) { + System.out.println("Enter a radius: "); + radius = input.nextDouble(); + } + input.close(); + + // area = (pi) * radius * radius; + area = Circle.getArea(radius); + System.out.println("The area of a circle of radius " + radius + " is: " + area); + } +} diff --git a/datatypes/datatypes-studio/src/main/Java/studios/areaofacircle/Circle.java b/datatypes/datatypes-studio/src/main/Java/studios/areaofacircle/Circle.java new file mode 100644 index 000000000..f3af4f1f4 --- /dev/null +++ b/datatypes/datatypes-studio/src/main/Java/studios/areaofacircle/Circle.java @@ -0,0 +1,11 @@ +package studios.areaofacircle; + +public class Circle { + + public static Double getArea (Double radius) { + + // public static Double getArea(Double radius) { + return 3.14 * radius * radius; + } + } + From 56bdd9f585d2846ab47f859566d7131284d59265 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Sun, 3 Dec 2023 17:57:49 -0600 Subject: [PATCH 02/18] message --- .../src/main/Java/org/launchcode/Area.java | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/datatypes/datatypes-studio/src/main/Java/org/launchcode/Area.java b/datatypes/datatypes-studio/src/main/Java/org/launchcode/Area.java index 850309756..daf509bcf 100644 --- a/datatypes/datatypes-studio/src/main/Java/org/launchcode/Area.java +++ b/datatypes/datatypes-studio/src/main/Java/org/launchcode/Area.java @@ -6,27 +6,43 @@ public class Area { public static void main(String[] args) { - Double radius; + Double radius = null; double pi = 3.14; Double area; Scanner input; input = new Scanner(System.in); System.out.println("Enter a radius: "); + // input.next(); radius = input.nextDouble(); + /* + while (input.hasNext()) { + + if (input.hasNextDouble()) { + // radius = input.nextDouble(); + if (input.nextDouble() < 0) { + System.out.println("Invalid Input try again"); + input.next(); + } else { + + radius = input.nextDouble(); + // input.next(); + input.close(); + } + } + else { + System.out.println("Invalid Input try again"); + input.next(); +// input.close(); + } + } - if (radius.isNaN()) { - System.out.println("Invalid Input"); input.close(); - } - if (radius < 0) { - System.out.println("Enter a radius: "); - radius = input.nextDouble(); - } - input.close(); // area = (pi) * radius * radius; + + */ area = Circle.getArea(radius); System.out.println("The area of a circle of radius " + radius + " is: " + area); } From 82d2438d2ff08dac7440fb2e49425cf0e0258eb5 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Sun, 3 Dec 2023 18:08:26 -0600 Subject: [PATCH 03/18] message --- .../src/main/java/org/launchcode/TempConverter.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/datatypes/datatype-examples/src/main/java/org/launchcode/TempConverter.java b/datatypes/datatype-examples/src/main/java/org/launchcode/TempConverter.java index d09ac901d..9944f7a79 100644 --- a/datatypes/datatype-examples/src/main/java/org/launchcode/TempConverter.java +++ b/datatypes/datatype-examples/src/main/java/org/launchcode/TempConverter.java @@ -2,18 +2,24 @@ import java.util.Scanner; + public class TempConverter { public static void main(String[] args) { double fahrenheit; - double celsius; + Double celsius; + String Megha; + // double input; Scanner input; input = new Scanner(System.in); System.out.println("Enter the temperature in Fahrenheit: "); fahrenheit = input.nextDouble(); + // fahrenheit = input; input.close(); celsius = (fahrenheit - 32) * 5/9; + Megha = celsius.toString(); + System.out.println(Megha); System.out.println("The temperature in Celsius is: " + celsius + "°C"); } } From 6e902b224873271dae4c4430b0ffe3fe44b65861 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Mon, 4 Dec 2023 15:19:30 -0600 Subject: [PATCH 04/18] message --- .../org/launchcode/ArrayGradebook.class | Bin 0 -> 2101 bytes .../org/launchcode/ArrayListGradebook.class | Bin 0 -> 2596 bytes .../org/launchcode/HashMapGradebook.class | Bin 0 -> 2704 bytes .../exercises/ArrayCollections.java | 15 +++++++ .../exercises/ArrayListCollections.java | 2 + .../exercises/HashMapCollections.java | 2 + .../studio/counting-characters/.gitignore | 38 ++++++++++++++++++ .../studio/counting-characters/pom.xml | 17 ++++++++ .../src/main/java/org/example/Main.java | 19 +++++++++ 9 files changed, 93 insertions(+) create mode 100644 control-flow-and-collections/chapter-example/student-example/src/main/java/org/launchcode/out/production/launchcode/org/launchcode/ArrayGradebook.class create mode 100644 control-flow-and-collections/chapter-example/student-example/src/main/java/org/launchcode/out/production/launchcode/org/launchcode/ArrayListGradebook.class create mode 100644 control-flow-and-collections/chapter-example/student-example/src/main/java/org/launchcode/out/production/launchcode/org/launchcode/HashMapGradebook.class create mode 100644 control-flow-and-collections/exercises/ArrayCollections.java create mode 100644 control-flow-and-collections/exercises/ArrayListCollections.java create mode 100644 control-flow-and-collections/exercises/HashMapCollections.java create mode 100644 control-flow-and-collections/studio/counting-characters/.gitignore create mode 100644 control-flow-and-collections/studio/counting-characters/pom.xml create mode 100644 control-flow-and-collections/studio/counting-characters/src/main/java/org/example/Main.java diff --git a/control-flow-and-collections/chapter-example/student-example/src/main/java/org/launchcode/out/production/launchcode/org/launchcode/ArrayGradebook.class b/control-flow-and-collections/chapter-example/student-example/src/main/java/org/launchcode/out/production/launchcode/org/launchcode/ArrayGradebook.class new file mode 100644 index 0000000000000000000000000000000000000000..d8a1901e2045dcee39ba9042ccdba44bbe291502 GIT binary patch literal 2101 zcmaJ?YjYD-7=BK3IZ3({NC~7A=pwg-TLiJ%1mw~dsI&!1EdpLRO}FXNWVh~aD%BZh zoM8rkf#cWS?p6QRPzuO-ZJ?$DXt@`rt(lQheo_ap*T4(dCy;Qgd%>vf zSOVK}`DQR{wG%iXfD|MS8OR~etXuClRL%b%d9x;^{H-*rcf`O^923}4S98{&>r_;5 z!wzP-^8>}$1P-=yY@>A@Zo$BdI@VYimG=FlftPSfAfYbC zzHfRiE9n)}5O`JlGazuNjn$zxL8sYzC5<_)qim-k!M5A&dR2C0!>P*`*))pqQN)edB-Lnh)nZj&o!>meXX z)9l)LqE{@&2Q3nT^hVEU#%a`_nThxfj#)%4R0TGb167$DQ}baeB(6wYC1aWMP_ZuB zy1d=%lY3k@J_q-L>jr+{srfN0n02T9&2hY&!h5(Qp>zSK1onqB685z1EVy%4p*aZ6 zzPzX^f$J>_e7?3fT8d55%gULqS^oY}7PT>7+8Ejz$vWV~;=I*HeQga^$7UnNpsLl% zc3_nfm}Z8;wlZhPS#uuT*hHw3CA_~#6aR$MrIS& z?@RIB%AcC|W%70n$Vh)OlY9nCo;;RGo>;~!8oDzp^{Fx-?t(Ij%G4;hNwn#kG^M8_4pnrx#nX4;i|%1E(k{Qtu3Q;S&1r229*xf~$O|>pc57 zh>vgxA0v-XiTDaf@D2Ar;5Z&K;lJ~h)Or1o+*M}!B3Tl6of?-h!sq*w)-Fk%CzM~| zH-g6)LEKVyut4x)d;IIi+8i|=ubene^QGh9cRmFvZ~m>?ofKQ7=++K{x~g-Py` zxIxadh_5gxDe;!zPvWNJ4eP$b;MPkeB<26W5Pu{06q_RYOT)KF(}CM~o8N6bze9K> ST&-}e!sbni(z~d^LC=36e)_=x literal 0 HcmV?d00001 diff --git a/control-flow-and-collections/chapter-example/student-example/src/main/java/org/launchcode/out/production/launchcode/org/launchcode/ArrayListGradebook.class b/control-flow-and-collections/chapter-example/student-example/src/main/java/org/launchcode/out/production/launchcode/org/launchcode/ArrayListGradebook.class new file mode 100644 index 0000000000000000000000000000000000000000..8c79590e4352fe035fe0e3a792cbfc88a8a0babd GIT binary patch literal 2596 zcmai0+jA3D82_C%$)?NFLVBSA!9ZI~C=iv4GyxRa0>QK(DM5-CPLplAG}$e?n?mu1 zih`neAH_#sc!q~m%Z$S~$8zdM$++-VL6&5v?y4Cl{Gq2GnTCu7#cL4p*`u`)Qo6CpDNlZ z+f;cWE<;AEu&#}vGhA0Bk`@{|6s$rgnQ0Ws>P4`lrlwcG{8-Hp8Psjn49yrtGi2Gt ztg72qC~TOa!Qqj?V_9v3^Ry)7VBPXhfddhRM)TF~JFC!rhNA!w&3}@Qi|8=wk>h z#R(GRQnA*!|fBAJwY?e z<`fBrjrH8P)K?-n{R##|WV}ucgr^TEIEX_GvM^)7D30aH*Oa*fG7jT;2}uP*7_M<@ zMM|3H`J#GcTzGY$Iyhy4xF1Iun&tjHx2%w9Q0AJHArg)$NMVGSTiS)PvV_=9D>#7{ zNqJ5c`4~=ALoPUkVN^Ke6vM7Mw5wQGf?KuarkG&%vVvCx?PXbqa#}D6P-&kQ;Cu-q z_ojpl!+OKaQNs*5Fk(BxTl%rGX2T0fmIw20IlE*8dAbA&sd4J3^W&!@Sm ziM6}wu_rW&V^{K#$Z>)$a8djn;ZsYQMbZ@7oG^pZuZ!n zd8?>%DvbSxVOzGzr-oE}!pK@JK3tOV9^RL5S!B}{hHj@NIE_owr;SN9TDGxV&Ifpg z+RF^XH`N*K3YI|+aXp(?t?ndcS8*!7lx)>b&BYP&TOIN0z}6`g7owl%^C@b7RLLKb ze;nqaaccZ57V_gG3NH(VS;UWPc$qonuUZm5W9V7phkEoR ze8I5p|3xXs%D%vQj8WZ+p9YXc@X?s1Rg|9eZh&{wEZ9xwSfx=Mi*cMrr7VCPCTP_J z4QFVFF0*-fXbt>*8`8;HG$q~V&~3;kZ$X(wVE7i=1Hls3Y$;)V%oFqkdP;cWTgbgZ zPYGL2xEt5!|LHB^$(T3j{Q=t zzY8TtNJ(>_w{fS`E)muX-(fp#_qLPFaRS-wOy+P>V65r%me+T1xP+H7ecnqFyD|T3 zr&rv(Z1hQVwNskItB$nriwD9lqv)W~Prps{)gfaIeIayVB_e3WHnbr|9}5Fmjni~e zpf|}h*5VDU!$k_f6>Pv&bmMFE;3hWWCz}64H}7H-{-SrX@bx%hPE(hkM4raebh`kZ z;&6?S4NTD#ZcHOG4s=lgQbAS8$>dydn;$jqK zC|3|tQGu|)iYaYQYtLzBrhRx~N>952;T?u)xVr?(6Ui|J5rLJSQrBT#0T0<{Aks$sSFo3nX0<=VP7(-lP& zH8QqU0`-X{Rgz=UL!FA%sArH?o-yA6J7gPX5iEjx1d@HGtK0E;D{sdgH$SPHt`kpK zcD!$Bv~MKtTJht|*U2V3qqrCMDQHr$262I!VtfHe0cBP?$jJo!@I3MuzF}s%l4B99 z6{t)V9CgMeW{ZmT60pKEl^JeSkw8))V(O>d0mIY9z_hFnl!0Tn!|VmI~>k#!Z=9^}c7DUfP0%DY7o^axZ( zdvcoN#BGbcW3xsI`c&-2KC;JB+Vd%$K2{dl^O}^Rt}687fP#Z61~4eF>`n`N1`&g3 znrqntbtSg_zMKHVIHce)6(dLq#O?qTRmf>pbB0KvN8V9s@wkdHj0=P$vx}?hr>fvc zvAeu*d7fI>r1pFj4&#`LCnP{Pqq_%nPxO?Er==)D(U@dE#-psMm_S-!^^7*H_gH3H zbH@!g%a!A5Z1F|B`~7)0$-xr(O0o%b6~|?VR84x_;klLEXH^)OVt$Tsy3jNIF$m;j zG(6dhdcp@(U|er7_qM>VfAV*^%N z%Z+KaA-{cL$jutevU%V?aJvXRqsfU=mpB&4|MrRXj^Rl!4wgBf;deC4?9UD6SJ*Bs zoAjXB83t3cgag7C#|{+&_WmfPb%h}(VCk+uOu5TLdeWaKrSbV0u=$)kxfi`$X>%DS zTFTe_Y>~6Bfcx8Bw_aL&{*6+2ocKuxCZ6OWmFDaL-fccsFx8NyoB0V!vY%RyLkcYHZNeqP+M%% z0ybYjvy?tikUsb$ws(eF+ZsX(*flQI#tUlaZ{3h;-2|!b2(>Pt_X_q4bcP$kS1=@S z9=qjgRNy)ecPi9vP_E#p{A`n}Ck3wJ8G!cnAzyGE9SfLDcZ9yX^;5mX%$&74!ZfW9 zU&XYiD@h1Jk}!f*d{#0=UTAnWD;1V|C2PE+eHsN=)dW4P;v72}&af+VKU<>APnq-qmJd5Y}j^I~3j~7UD4Rd%A zFR^L~e2bUy3d)H;g;!}8B5E~W<0_2TX;nw90@_)k6)@f)#+%%0MCc|O6(|a#e_@+~ zwwq|;^>6r3{t=hsEvl5^ZM?&GHCOM_>|^iwDL$txM%iJU!-a4qzQ9-b1`YoJK=Z}u literal 0 HcmV?d00001 diff --git a/control-flow-and-collections/exercises/ArrayCollections.java b/control-flow-and-collections/exercises/ArrayCollections.java new file mode 100644 index 000000000..279c5bda0 --- /dev/null +++ b/control-flow-and-collections/exercises/ArrayCollections.java @@ -0,0 +1,15 @@ +package org.launchcode; + +import java.util.Scanner; + + public class ArrayCollections { + public static void main(String[] args) { + int[] integerArray = {1, 1, 2, 3, 5, 8}; + } + String phrase = "I would not, could not, in a box. I would not, could not with a fox. I will not eat them in a house. I will not eat them with a mouse."; + String[] words = phrase.split(" "); +System.out.println(Arrays.toString(words)); +} + System.out.println(Arrays.toString(arrayName)); + String[] sentences = phrase.split("\\."); + System.out.println(Arrays.toString(sentences)); \ No newline at end of file diff --git a/control-flow-and-collections/exercises/ArrayListCollections.java b/control-flow-and-collections/exercises/ArrayListCollections.java new file mode 100644 index 000000000..ebe930179 --- /dev/null +++ b/control-flow-and-collections/exercises/ArrayListCollections.java @@ -0,0 +1,2 @@ +public class ArrayListCollections { +} diff --git a/control-flow-and-collections/exercises/HashMapCollections.java b/control-flow-and-collections/exercises/HashMapCollections.java new file mode 100644 index 000000000..4161eb038 --- /dev/null +++ b/control-flow-and-collections/exercises/HashMapCollections.java @@ -0,0 +1,2 @@ +public class HashMapCollections { +} diff --git a/control-flow-and-collections/studio/counting-characters/.gitignore b/control-flow-and-collections/studio/counting-characters/.gitignore new file mode 100644 index 000000000..5ff6309b7 --- /dev/null +++ b/control-flow-and-collections/studio/counting-characters/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/control-flow-and-collections/studio/counting-characters/pom.xml b/control-flow-and-collections/studio/counting-characters/pom.xml new file mode 100644 index 000000000..792c4d470 --- /dev/null +++ b/control-flow-and-collections/studio/counting-characters/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + org.example + counting-characters + 1.0-SNAPSHOT + + + 17 + 17 + UTF-8 + + + \ No newline at end of file diff --git a/control-flow-and-collections/studio/counting-characters/src/main/java/org/example/Main.java b/control-flow-and-collections/studio/counting-characters/src/main/java/org/example/Main.java new file mode 100644 index 000000000..09efe28fe --- /dev/null +++ b/control-flow-and-collections/studio/counting-characters/src/main/java/org/example/Main.java @@ -0,0 +1,19 @@ +package org.example; + +// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`, +// then press Enter. You can now see whitespace characters in your code. +public class Main { + public static void main(String[] args) { + // Press Opt+Enter with your caret at the highlighted text to see how + // IntelliJ IDEA suggests fixing it. + System.out.printf("Hello and welcome!"); + + // Press Ctrl+R or click the green arrow button in the gutter to run the code. + for (int i = 1; i <= 5; i++) { + + // Press Ctrl+D to start debugging your code. We have set one breakpoint + // for you, but you can always add more by pressing Cmd+F8. + System.out.println("i = " + i); + } + } +} \ No newline at end of file From c87b8b99cc9aac2c9141da12a6c5ca9754d55df1 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Mon, 4 Dec 2023 15:24:32 -0600 Subject: [PATCH 05/18] message --- control-flow-and-collections/unnamed.patch | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 control-flow-and-collections/unnamed.patch diff --git a/control-flow-and-collections/unnamed.patch b/control-flow-and-collections/unnamed.patch new file mode 100644 index 000000000..ccd8f89ee --- /dev/null +++ b/control-flow-and-collections/unnamed.patch @@ -0,0 +1,49 @@ +Index: control-flow-and-collections/studio/counting-characters/.gitignore +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/control-flow-and-collections/studio/counting-characters/.gitignore b/control-flow-and-collections/studio/counting-characters/.gitignore +new file mode 100644 +--- /dev/null (revision 9fb2a8efeb08f99a7c98a30b4dc78eb66c59e770) ++++ b/control-flow-and-collections/studio/counting-characters/.gitignore (revision 9fb2a8efeb08f99a7c98a30b4dc78eb66c59e770) +@@ -0,0 +1,38 @@ ++target/ ++!.mvn/wrapper/maven-wrapper.jar ++!**/src/main/**/target/ ++!**/src/test/**/target/ ++ ++### IntelliJ IDEA ### ++.idea/modules.xml ++.idea/jarRepositories.xml ++.idea/compiler.xml ++.idea/libraries/ ++*.iws ++*.iml ++*.ipr ++ ++### Eclipse ### ++.apt_generated ++.classpath ++.factorypath ++.project ++.settings ++.springBeans ++.sts4-cache ++ ++### NetBeans ### ++/nbproject/private/ ++/nbbuild/ ++/dist/ ++/nbdist/ ++/.nb-gradle/ ++build/ ++!**/src/main/**/build/ ++!**/src/test/**/build/ ++ ++### VS Code ### ++.vscode/ ++ ++### Mac OS ### ++.DS_Store +\ No newline at end of file From 80997d6dfcae782e1031b517bed74c5e52c2e87e Mon Sep 17 00:00:00 2001 From: megha saxena Date: Mon, 4 Dec 2023 22:12:11 -0600 Subject: [PATCH 06/18] message --- .../exercises/ArrayCollections.java | 15 --------------- .../exercises/ArrayListCollections.java | 2 -- .../exercises/HashMapCollections.java | 2 -- .../src/main/java/ArrayExercise.java | 2 ++ .../src/main/java/org/example/Main.java | 17 ++++++++++++++++- 5 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 control-flow-and-collections/exercises/ArrayCollections.java delete mode 100644 control-flow-and-collections/exercises/ArrayListCollections.java delete mode 100644 control-flow-and-collections/exercises/HashMapCollections.java create mode 100644 control-flow-and-collections/exercises/collections-exercises/src/main/java/ArrayExercise.java diff --git a/control-flow-and-collections/exercises/ArrayCollections.java b/control-flow-and-collections/exercises/ArrayCollections.java deleted file mode 100644 index 279c5bda0..000000000 --- a/control-flow-and-collections/exercises/ArrayCollections.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.launchcode; - -import java.util.Scanner; - - public class ArrayCollections { - public static void main(String[] args) { - int[] integerArray = {1, 1, 2, 3, 5, 8}; - } - String phrase = "I would not, could not, in a box. I would not, could not with a fox. I will not eat them in a house. I will not eat them with a mouse."; - String[] words = phrase.split(" "); -System.out.println(Arrays.toString(words)); -} - System.out.println(Arrays.toString(arrayName)); - String[] sentences = phrase.split("\\."); - System.out.println(Arrays.toString(sentences)); \ No newline at end of file diff --git a/control-flow-and-collections/exercises/ArrayListCollections.java b/control-flow-and-collections/exercises/ArrayListCollections.java deleted file mode 100644 index ebe930179..000000000 --- a/control-flow-and-collections/exercises/ArrayListCollections.java +++ /dev/null @@ -1,2 +0,0 @@ -public class ArrayListCollections { -} diff --git a/control-flow-and-collections/exercises/HashMapCollections.java b/control-flow-and-collections/exercises/HashMapCollections.java deleted file mode 100644 index 4161eb038..000000000 --- a/control-flow-and-collections/exercises/HashMapCollections.java +++ /dev/null @@ -1,2 +0,0 @@ -public class HashMapCollections { -} diff --git a/control-flow-and-collections/exercises/collections-exercises/src/main/java/ArrayExercise.java b/control-flow-and-collections/exercises/collections-exercises/src/main/java/ArrayExercise.java new file mode 100644 index 000000000..ced103aa5 --- /dev/null +++ b/control-flow-and-collections/exercises/collections-exercises/src/main/java/ArrayExercise.java @@ -0,0 +1,2 @@ +package PACKAGE_NAME;public class ArrayExercise { +} diff --git a/control-flow-and-collections/studio/counting-characters/src/main/java/org/example/Main.java b/control-flow-and-collections/studio/counting-characters/src/main/java/org/example/Main.java index 09efe28fe..3c2e12570 100644 --- a/control-flow-and-collections/studio/counting-characters/src/main/java/org/example/Main.java +++ b/control-flow-and-collections/studio/counting-characters/src/main/java/org/example/Main.java @@ -1,9 +1,24 @@ package org.example; +import java.util.HashMap; +import java.util.Map; +import java.util.Scanner; + // Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`, // then press Enter. You can now see whitespace characters in your code. -public class Main { + +public class CountingCharacters { + public static void main(String[] args) { + + String myString = "If the product of two terms is zero then common sense says at least one of the two terms has to be zero to start with. " + + "So if you move all the terms over to one side, you can put the quadratics into a form that can be factored allowing that side of the equation to equal zero." + + " Once you’ve done that, it’s pretty straightforward from there."; + char[] charactersInString = myString.toCharArray(); + + + + // Press Opt+Enter with your caret at the highlighted text to see how // IntelliJ IDEA suggests fixing it. System.out.printf("Hello and welcome!"); From e912bdce26f88865108963d179938d661aa8b52e Mon Sep 17 00:00:00 2001 From: megha saxena Date: Wed, 6 Dec 2023 17:25:20 -0600 Subject: [PATCH 07/18] message --- .../src/main/java/org/example/Main.java | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/control-flow-and-collections/studio/counting-characters/src/main/java/org/example/Main.java b/control-flow-and-collections/studio/counting-characters/src/main/java/org/example/Main.java index 3c2e12570..919f575a9 100644 --- a/control-flow-and-collections/studio/counting-characters/src/main/java/org/example/Main.java +++ b/control-flow-and-collections/studio/counting-characters/src/main/java/org/example/Main.java @@ -1,34 +1,37 @@ -package org.example; - +char[] charactersInString = myString.toUpperCase().toCharArray(); import java.util.HashMap; import java.util.Map; import java.util.Scanner; -// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`, -// then press Enter. You can now see whitespace characters in your code. - public class CountingCharacters { - public static void main(String[] args) { + public static void main(String[] args){ - String myString = "If the product of two terms is zero then common sense says at least one of the two terms has to be zero to start with. " + - "So if you move all the terms over to one side, you can put the quadratics into a form that can be factored allowing that side of the equation to equal zero." + - " Once you’ve done that, it’s pretty straightforward from there."; - char[] charactersInString = myString.toCharArray(); + Scanner scanner = new Scanner(System.in); + System.out.println("Please enter $$ if you want a file or enter a string to count: "); + String input = scanner.nextLine(); + scanner.close(); + if (input == "$$"){ + Scanner scans = new Scanner(filePath); + } else { + input = "If the product of two terms is zero then common sense says at least one of the two terms has to be zero to start with. " + + "So if you move all the terms over to one side, you can put the quadratics into a form that can be factored allowing that side of the equation to equal zero." + + " Once you've done that, it's pretty straightforward from there."; - // Press Opt+Enter with your caret at the highlighted text to see how - // IntelliJ IDEA suggests fixing it. - System.out.printf("Hello and welcome!"); + String myString = input + } - // Press Ctrl+R or click the green arrow button in the gutter to run the code. - for (int i = 1; i <= 5; i++) { + HashMap chars = new HashMap<>(); + + for(int i = 0; i < charactersInString.length; i++){ + chars.put(charactersInString[i], chars.getOrDefault(charactersInString[i], 0) + 1); + } - // Press Ctrl+D to start debugging your code. We have set one breakpoint - // for you, but you can always add more by pressing Cmd+F8. - System.out.println("i = " + i); + for (Map.Entry letter : chars.entrySet()) { + System.out.println(letter.getKey() + " :" + letter.getValue()); } } } \ No newline at end of file From 2ec777beacc1fe73071659fc94239f89c62b90f1 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Thu, 7 Dec 2023 13:39:58 -0600 Subject: [PATCH 08/18] message --- .../exercises/src/main/java/Student.java | 37 +++++++++++++++ .../exercises/src/main/java/Teacher.java | 47 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 classes-part-one/exercises/src/main/java/Teacher.java diff --git a/classes-part-one/exercises/src/main/java/Student.java b/classes-part-one/exercises/src/main/java/Student.java index d06997866..56860db01 100644 --- a/classes-part-one/exercises/src/main/java/Student.java +++ b/classes-part-one/exercises/src/main/java/Student.java @@ -7,4 +7,41 @@ public class Student { // Drop your getters and setters below for the Student class. // To instantiate the Student class, add your code to the main in the file, SchoolPractice. + public void setName(String name) { + this.name = name; + } + + public void setStudentId(int studentId) { + this.studentId = studentId; + } + + public void setGpa(double gpa) { + this.gpa = gpa; + } + + private void setNumberOfCredits(int numberOfCredits) { + this.numberOfCredits = numberOfCredits; + } + + public String getName() { + return name; + } + + public int getStudentId() { + return studentId; + } + + public int getNumberOfCredits() { + return numberOfCredits; + } + + public double getGpa() { + return gpa; + } + Student student = new Student("Your Name", 12345, 1, 4.0); + public class Course { + private String topic; + private Teacher instructor; + private ArrayList enrolledStudents; + } } diff --git a/classes-part-one/exercises/src/main/java/Teacher.java b/classes-part-one/exercises/src/main/java/Teacher.java new file mode 100644 index 000000000..dc7b0a609 --- /dev/null +++ b/classes-part-one/exercises/src/main/java/Teacher.java @@ -0,0 +1,47 @@ +public class Teacher { + + + private String firstname; + private String lastname; + private String subject; + private String yearsTeaching; + + public static void main(String[] args) { + + } + + public String getFirstname() { + return firstname; + } + + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } + + + public String subject () { + return subject; + } + + public void setsubject(String subject) { + this.subject = subject; + } + + public String yearsTeaching () { + return yearsTeaching; + } + + public void setyearsTeaching(String yearsTeaching) { + this.yearsTeaching = yearsTeaching; + } + } + + From 1cfcaba4834ecc18fe67dc19dbe09daacc6ca00a Mon Sep 17 00:00:00 2001 From: megha saxena Date: Sun, 10 Dec 2023 21:25:05 -0600 Subject: [PATCH 09/18] message --- .../counting-characters1/.gitignore | 38 +++++++++++++++++ .../counting-characters1/pom.xml | 17 ++++++++ .../src/main/java/org/example/Main.java | 42 +++++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 control-flow-and-collections/studio/counting-characters1/counting-characters1/.gitignore create mode 100644 control-flow-and-collections/studio/counting-characters1/counting-characters1/pom.xml create mode 100644 control-flow-and-collections/studio/counting-characters1/counting-characters1/src/main/java/org/example/Main.java diff --git a/control-flow-and-collections/studio/counting-characters1/counting-characters1/.gitignore b/control-flow-and-collections/studio/counting-characters1/counting-characters1/.gitignore new file mode 100644 index 000000000..5ff6309b7 --- /dev/null +++ b/control-flow-and-collections/studio/counting-characters1/counting-characters1/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/control-flow-and-collections/studio/counting-characters1/counting-characters1/pom.xml b/control-flow-and-collections/studio/counting-characters1/counting-characters1/pom.xml new file mode 100644 index 000000000..2704f3cec --- /dev/null +++ b/control-flow-and-collections/studio/counting-characters1/counting-characters1/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + org.example + counting-characters1 + 1.0-SNAPSHOT + + + 17 + 17 + UTF-8 + + + \ No newline at end of file diff --git a/control-flow-and-collections/studio/counting-characters1/counting-characters1/src/main/java/org/example/Main.java b/control-flow-and-collections/studio/counting-characters1/counting-characters1/src/main/java/org/example/Main.java new file mode 100644 index 000000000..bcd864b72 --- /dev/null +++ b/control-flow-and-collections/studio/counting-characters1/counting-characters1/src/main/java/org/example/Main.java @@ -0,0 +1,42 @@ +package org.example; + +import java.util.HashMap; +import java.util.Map; +import java.util.Scanner; + +// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`, +// then press Enter. You can now see whitespace characters in your code. +public class Main { + public static void main(String[] args) { + Scanner scanner = new Scanner(System.in); + System.out.println("Please enter $$ if you want a file or enter a string to count: "); + + + String input = scanner.nextLine(); + scanner.close(); + + char[] charactersInString = new char[0]; + if (input == "$$") { + System.out.println("Filepath"); + // Scanner scans = new Scanner(filePath); + } else { + input = "If the product of two terms is zero then common sense says at least one of the two terms has to be zero to start with. " + + "So if you move all the terms over to one side, you can put the quadratics into a form that can be factored allowing that side of the equation to equal zero." + + " Once you've done that, it's pretty straightforward from there."; + + String myString = input; + charactersInString = myString.toUpperCase().toCharArray(); + } + + HashMap chars = new HashMap<>(); + + for (int i = 0; i < charactersInString.length; i++) { + chars.put(charactersInString[i], chars.getOrDefault(charactersInString[i], 0) + 1); + } + + for (Map.Entry letter : chars.entrySet()) { + System.out.println(letter.getKey() + " :" + letter.getValue()); + } + + } +} \ No newline at end of file From 63dd24d22d4dd4ea209d58e16436446de291afe4 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Mon, 11 Dec 2023 14:21:05 -0600 Subject: [PATCH 10/18] message --- .../src/main/java/org/launchcode/Main.java | 19 ++++++- .../src/main/java/org/launchcode/Menu.java | 28 +++++++++ .../main/java/org/launchcode/MenuItem.java | 57 +++++++++++++++++++ 3 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 classes-part-one/studio/restaurant-menu/src/main/java/org/launchcode/Menu.java create mode 100644 classes-part-one/studio/restaurant-menu/src/main/java/org/launchcode/MenuItem.java diff --git a/classes-part-one/studio/restaurant-menu/src/main/java/org/launchcode/Main.java b/classes-part-one/studio/restaurant-menu/src/main/java/org/launchcode/Main.java index cad5849f1..930d3994c 100644 --- a/classes-part-one/studio/restaurant-menu/src/main/java/org/launchcode/Main.java +++ b/classes-part-one/studio/restaurant-menu/src/main/java/org/launchcode/Main.java @@ -2,7 +2,24 @@ public class Main { - public static void main(String[] args) { + public static void main(String[] args) { // write your code here + MItems dessert = new MItems("ApplePie", 4.99 , "Dessert", true); + MItems mCourse = new MItems("Pasta", 10.99 ,"mainCourse", true); + MItems starter = new MItems("AvocadoTaco", 9.99 , "appetizer", true); + + dessert.setDescription("Made out of apples"); + starter.setDescription("Made out of avocados"); + mCourse.setDescription("Made out of cheese and sauce"); + + + + } + } + + + + + diff --git a/classes-part-one/studio/restaurant-menu/src/main/java/org/launchcode/Menu.java b/classes-part-one/studio/restaurant-menu/src/main/java/org/launchcode/Menu.java new file mode 100644 index 000000000..4b1de25d9 --- /dev/null +++ b/classes-part-one/studio/restaurant-menu/src/main/java/org/launchcode/Menu.java @@ -0,0 +1,28 @@ +package org.launchcode; + +public class Menu2 { + private Date lastUpdated; + private ArrayList MItems ; + + public Menu2(Date lastUpdated, ArrayList MItems) { + this.lastUpdated = lastUpdated; + this.MItems = MItems; + this.lastUpdated = new Date(); + } + + public Date getLastUpdated() { + return lastUpdated; + } + + public ArrayList getMItems() { + return MItems; + } + + public void setLastUpdated(Date lastUpdated) { + this.lastUpdated = lastUpdated; + } + + public void setMItems(ArrayList MItems) { + this.MItems = MItems; + } +} \ No newline at end of file diff --git a/classes-part-one/studio/restaurant-menu/src/main/java/org/launchcode/MenuItem.java b/classes-part-one/studio/restaurant-menu/src/main/java/org/launchcode/MenuItem.java new file mode 100644 index 000000000..4264768f1 --- /dev/null +++ b/classes-part-one/studio/restaurant-menu/src/main/java/org/launchcode/MenuItem.java @@ -0,0 +1,57 @@ +package org.launchcode; + +public class MItems { + private String itemName; + private double price; + private String description; + private String category; + private boolean isItNew; + + public MItems(String itemName, double price, String category, boolean isItNew) { + this.itemName = itemName; + this.price = price; + this.category = category; + this.isItNew = isItNew; + } + + + public String getItemName() { + return itemName; + } + + public double getPrice() { + return price; + } + + public String getDescription() { + return description; + } + + public String getCategory() { + return category; + } + + public boolean isItNew() { + return isItNew; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public void setPrice(double price) { + this.price = price; + } + + public void setDescription(String description) { + this.description = description; + } + + public void setCategory(String category) { + this.category = category; + } + + public void setItNew(boolean itNew) { + isItNew = itNew; + } +} \ No newline at end of file From 87496032396b9ffd19ac20ba9c835134dd376e59 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Mon, 11 Dec 2023 15:22:53 -0600 Subject: [PATCH 11/18] message --- .../src/main/java/org/launchcode/Course.java | 1 + .../src/main/java/org/launchcode/Student.java | 42 ++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/classes-part-2/exercises/src/main/java/org/launchcode/Course.java b/classes-part-2/exercises/src/main/java/org/launchcode/Course.java index ca56bd799..e717fb234 100644 --- a/classes-part-2/exercises/src/main/java/org/launchcode/Course.java +++ b/classes-part-2/exercises/src/main/java/org/launchcode/Course.java @@ -15,3 +15,4 @@ public class Course { // Course objects equal. } + diff --git a/classes-part-2/exercises/src/main/java/org/launchcode/Student.java b/classes-part-2/exercises/src/main/java/org/launchcode/Student.java index 7e368e66e..b95afa0fb 100644 --- a/classes-part-2/exercises/src/main/java/org/launchcode/Student.java +++ b/classes-part-2/exercises/src/main/java/org/launchcode/Student.java @@ -30,13 +30,31 @@ public String studentInfo() { //TODO: Uncomment and complete the getGradeLevel method here: -// public String getGradeLevel() { + public String getGradeLevel() { + public static String getGradeLevel(int credits) { + if (credits <= 29){ + return "freshman"; + } else if (credits <= 59){ + return "sophomore"; + } else if (credits <= 89) { + return "junior"; + } else { + return "senior"; + } + } + } // // Determine the grade level of the student based on numberOfCredits // } // TODO: Complete the addGrade method. public void addGrade(int courseCredits, double grade) { // Update the appropriate fields: numberOfCredits, gpa + public void addGrade(int courseCredits, double grade) { + double totalQualityScore = this.gpa * this.numberOfCredits; + totalQualityScore += courseCredits * grade; + this.numberOfCredits += courseCredits; + this.gpa = totalQualityScore/this.numberOfCredits; + } } // TODO: Add your custom 'toString' method here. Make sure it returns a well-formatted String rather @@ -44,6 +62,28 @@ public void addGrade(int courseCredits, double grade) { // TODO: Add your custom 'equals' method here. Consider which fields should match in order to call two // Student objects equal. + public String toString() { + + String studentReport = String.format("%s is a %s with %d credits and a GPA of %.2f", this.name, this.getGradeLevel(this.numberOfCredits), this.getNumberOfCredits(), this.getGpa()); + return studentReport; + } + + public boolean equals(Object toBeCompared) { + if (toBeCompared == this) { + return true; + } + + if (toBeCompared == null) { + return false; + } + + if (toBeCompared.getClass() != getClass()) { + return false; + } + + Student theStudent = (Student) toBeCompared; + return theStudent.getStudentId() == getStudentId(); + } public String getName() { return name; From f47884397c290c66df62c9a6b509178d52ae8214 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Mon, 18 Dec 2023 14:49:06 -0600 Subject: [PATCH 12/18] message --- .../src/main/java/org/launchcode/Car.java | 10 ++++------ .../src/test/java/org/launchcode/CarTest.java | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/unit-testing/exercises/car-exercises/src/main/java/org/launchcode/Car.java b/unit-testing/exercises/car-exercises/src/main/java/org/launchcode/Car.java index d10c16f72..ba6d39775 100644 --- a/unit-testing/exercises/car-exercises/src/main/java/org/launchcode/Car.java +++ b/unit-testing/exercises/car-exercises/src/main/java/org/launchcode/Car.java @@ -45,7 +45,11 @@ public double getGasTankLevel() { return gasTankLevel; } + public void setGasTankLevel(double gasTankLevel) { + if (gasTankLevel > this.getGasTankSize()) { + throw new IllegalArgumentException("Can't exceed tank size"); + } this.gasTankLevel = gasTankLevel; } @@ -72,12 +76,6 @@ public void drive(double miles) { //adjust fuel based on mpg and miles requested to drive double maxDistance = this.milesPerGallon * this.gasTankLevel; - /**the double below uses some syntax called the ternary operator. - * if the value of miles is greater than the value of maxDistance, - * then milesAbleToTravel = maxDistance. - * otherwise, if miles is not greater than maxDistance, - * then milesAbleToTravel = miles - */ double milesAbleToTravel = miles > maxDistance ? maxDistance : miles; double gallonsUsed = milesAbleToTravel / this.milesPerGallon; this.gasTankLevel = this.gasTankLevel - gallonsUsed; diff --git a/unit-testing/exercises/car-exercises/src/test/java/org/launchcode/CarTest.java b/unit-testing/exercises/car-exercises/src/test/java/org/launchcode/CarTest.java index 1a3f2a04a..0604c9af7 100644 --- a/unit-testing/exercises/car-exercises/src/test/java/org/launchcode/CarTest.java +++ b/unit-testing/exercises/car-exercises/src/test/java/org/launchcode/CarTest.java @@ -26,6 +26,22 @@ public void testInitialGasTank() { } //TODO: gasTankLevel is accurate after driving within tank range + @Test + public void testGasTankAfterDriving() { + test_car.drive(50); + assertEquals(9, test_car.getGasTankLevel(),.001); + } + //TODO: gasTankLevel is accurate after attempting to drive past tank range + @Test + public void testGasTankAfterExceedingTankRange() { + test_car.drive(501); + assertEquals(test_car.getGasTankLevel(), 0, .001); + } + //TODO: can't have more gas than tank size, expect an exception //TODO: can't have more gas than tank size, expect an exception + @Test() + public void testGasOverfillException() { + assertthrows(IllegalArgumentException.class, () -> ); + } } \ No newline at end of file From 17fa10fcbd07d839a5d111b4184947bf83e600f4 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Thu, 4 Jan 2024 10:11:55 -0600 Subject: [PATCH 13/18] message --- .../java/org/launchcode/BalancedBrackets.java | 25 +++++++++++++++++-- .../org/launchcode/BalancedBracketsTest.java | 7 ++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/unit-testing/studio/balanced-brackets/src/main/java/org/launchcode/BalancedBrackets.java b/unit-testing/studio/balanced-brackets/src/main/java/org/launchcode/BalancedBrackets.java index 890783e59..463fcd770 100644 --- a/unit-testing/studio/balanced-brackets/src/main/java/org/launchcode/BalancedBrackets.java +++ b/unit-testing/studio/balanced-brackets/src/main/java/org/launchcode/BalancedBrackets.java @@ -21,7 +21,8 @@ public class BalancedBrackets { */ public static boolean hasBalancedBrackets(String str) { int brackets = 0; - for (char ch : str.toCharArray()) { + final String str1 = str; + for (char ch : str1.toCharArray()) { if (ch == '[') { brackets++; } else if (ch == ']') { @@ -29,5 +30,25 @@ public static boolean hasBalancedBrackets(String str) { } } return brackets == 0; + public boolean isBalanced (String str1){ + if (null == str1 || ((str1.length() % 2) != 0)) { + return false; + } else { + char[] ch = str1.toCharArray(); + for (char c : ch) { + if (!(c == '{' || c == '[' || c == '(' || c == '}' || c == ']' || c == ')')) { + return false; + } + while (str.contains("()") || str.contains("[]") || str.contains("{}")) { + str = str.replaceAll("\\(\\)", "") + .replaceAll("\\[\\]", "") + .replaceAll("\\{\\}", ""); + } + return (str.isEmpty()); + } + } + } } -} \ No newline at end of file +} + + diff --git a/unit-testing/studio/balanced-brackets/src/test/java/org/launchcode/BalancedBracketsTest.java b/unit-testing/studio/balanced-brackets/src/test/java/org/launchcode/BalancedBracketsTest.java index a9d8821b3..9c60c09e1 100644 --- a/unit-testing/studio/balanced-brackets/src/test/java/org/launchcode/BalancedBracketsTest.java +++ b/unit-testing/studio/balanced-brackets/src/test/java/org/launchcode/BalancedBracketsTest.java @@ -10,4 +10,11 @@ class BalancedBracketsTest { public void emptyTest() { assertEquals(true, true); } + + @Test + public void onlyBracketsReturnsTrue() { + assertTrue(BalancedBrackets.hasBalancedBrackets("[]")); + } + + } \ No newline at end of file From 3d4bd51797219beaa42335c5cb1fe9fdd78e4fa3 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Thu, 4 Jan 2024 12:20:29 -0600 Subject: [PATCH 14/18] message --- inheritance/MainHouseCat.java | 2 + .../exercises/Studio/questions/Question.java | 70 +++++++++++++++++++ .../Studio/questions/TrueOrFalse.java | 24 +++++++ .../Studio/questions/package-info.java | 19 +++++ 4 files changed, 115 insertions(+) create mode 100644 inheritance/MainHouseCat.java create mode 100644 inheritance/testing-inheritance/exercises/Studio/questions/Question.java create mode 100644 inheritance/testing-inheritance/exercises/Studio/questions/TrueOrFalse.java create mode 100644 inheritance/testing-inheritance/exercises/Studio/questions/package-info.java diff --git a/inheritance/MainHouseCat.java b/inheritance/MainHouseCat.java new file mode 100644 index 000000000..e2308f8fd --- /dev/null +++ b/inheritance/MainHouseCat.java @@ -0,0 +1,2 @@ +package PACKAGE_NAME;public class MainHouseCat { +} diff --git a/inheritance/testing-inheritance/exercises/Studio/questions/Question.java b/inheritance/testing-inheritance/exercises/Studio/questions/Question.java new file mode 100644 index 000000000..be11de6dc --- /dev/null +++ b/inheritance/testing-inheritance/exercises/Studio/questions/Question.java @@ -0,0 +1,70 @@ +package questions; + + import java.awt.*; + import java.util.HashMap; + + + public abstract class Question { + + private final String question; + private final HashMap choiceMap = new HashMap<>(); + private int maxResponses = 1; + + public Question(String question, Choice[] choiceArray) { + this.question = question; + } + + public String getQuestion() { + return question; + } + + public HashMap getChoiceMap() { + return choiceMap; + } + + public int getMaxResponses() { + return maxResponses; + //return 0; + } + + public void setMaxResponses(int maxResponses) { + this.maxResponses = maxResponses; + } + + //@Override + public abstract String toString(); + + void createRandomizedChoiceMap(Choice[] choiceArray) { + ArrayList choiceList = new ArrayList<>(); + + Collections.addAll(choiceList, choiceArray); + + collections.shuffle(choiceList); + for (int i = 0; i < choiceList.size(); i++) { + choiceMap.put(i+1, choiceList.get(i)); + } + } + + String getFormattedChoices() { + StringBuilde formattedChoices = new StringBuilder(); + String newline = System.lineSeparator(); + for (int choiceNum : choiceMap.keySet()) { + String choice = "\t" + choiceNum + " - " +choiceMap.get(choiceNum).getContent() + newline; + formattedChoices.append(choice); + } + return formattedChoices.toString(); + } + + pubic boolean isInvalid(String resp) { + try { + int respInt = Integer.parseInt(resp); + return respInt <= 0 || respInt >choiceMap.size(); + + } + catch (NumberFormatException e) { + return true; + } + } + } + + diff --git a/inheritance/testing-inheritance/exercises/Studio/questions/TrueOrFalse.java b/inheritance/testing-inheritance/exercises/Studio/questions/TrueOrFalse.java new file mode 100644 index 000000000..46ee4d014 --- /dev/null +++ b/inheritance/testing-inheritance/exercises/Studio/questions/TrueOrFalse.java @@ -0,0 +1,24 @@ +package questions; + +import java.awt.*; + +public class TrueOrFalse extends Question{ + + public TrueOrFalse(String question, Choice[] choiceArray) { + super(question, choiceArray); + } + + void publicTrueOrFalse(String question, Choice[] choiceArray) { + super(question, ChoiceArray); + + } + + @Override + public String toString() { + String newline = System.lineSeparator(); + return newline + "True Or False:" +newline + + getQuestion() + newline + + getFormattedChoices(); + // return null; + } +} diff --git a/inheritance/testing-inheritance/exercises/Studio/questions/package-info.java b/inheritance/testing-inheritance/exercises/Studio/questions/package-info.java new file mode 100644 index 000000000..54e2d9c2d --- /dev/null +++ b/inheritance/testing-inheritance/exercises/Studio/questions/package-info.java @@ -0,0 +1,19 @@ +package questions; + +import java.awt.*; + +public class MultipleChoice extends Question { + + public MultipleChoice(String question, Choice[] choiceArray) { + super(question, choiceArray); + } + + @Override + public String toString() { + String newline = System.lineSeparator(); + return newline "CHOOSE ONE:" + newline + + return getQuestion() + newline + + getFormattedChoices(); + //return null; + } +} \ No newline at end of file From 64f0da2b77cfa6c6a8060d6b68999ac80ac1fb12 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Thu, 4 Jan 2024 15:09:47 -0600 Subject: [PATCH 15/18] message --- .../src/main/java/org/launchcode/Cone.java | 12 +++++++ .../src/main/java/org/launchcode/Flavor.java | 9 +++-- .../src/main/java/org/launchcode/Main.java | 34 +++++++++++++++++-- 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/interfaces/exercises/ice-cream-exercises/src/main/java/org/launchcode/Cone.java b/interfaces/exercises/ice-cream-exercises/src/main/java/org/launchcode/Cone.java index 524d994e4..77565513e 100644 --- a/interfaces/exercises/ice-cream-exercises/src/main/java/org/launchcode/Cone.java +++ b/interfaces/exercises/ice-cream-exercises/src/main/java/org/launchcode/Cone.java @@ -6,4 +6,16 @@ public class Cone extends Ingredient { public Cone(String aName, double aCost, ArrayList someAllergens){ super (aName, aCost, someAllergens); } + public class ConeComparator implements Comparator { + //@Override + public int compare(Cone cone1, Cone cone2) { + if (cone1.getCost() - cone2.getCost() < 0){ + return -1; + } else if (cone1.getCost() - cone2.getCost() > 0) { + return 1; + } else { + return 0; + } + } + } } diff --git a/interfaces/exercises/ice-cream-exercises/src/main/java/org/launchcode/Flavor.java b/interfaces/exercises/ice-cream-exercises/src/main/java/org/launchcode/Flavor.java index 9765144b3..689e05d89 100644 --- a/interfaces/exercises/ice-cream-exercises/src/main/java/org/launchcode/Flavor.java +++ b/interfaces/exercises/ice-cream-exercises/src/main/java/org/launchcode/Flavor.java @@ -1,9 +1,14 @@ package org.launchcode; import java.util.ArrayList; - +import java.util.Comparator; public class Flavor extends Ingredient { - + public class FlavorComparator implements Comparator { + @Override + public int compare(Flavor flavor1, Flavor flavor2) { + return flavor1.getName().compareTo(flavor2.getName()); + } + } public Flavor(String aName, double aCost, ArrayList someAllergens){ super (aName, aCost, someAllergens); diff --git a/interfaces/exercises/ice-cream-exercises/src/main/java/org/launchcode/Main.java b/interfaces/exercises/ice-cream-exercises/src/main/java/org/launchcode/Main.java index 8787f2454..7432599b0 100644 --- a/interfaces/exercises/ice-cream-exercises/src/main/java/org/launchcode/Main.java +++ b/interfaces/exercises/ice-cream-exercises/src/main/java/org/launchcode/Main.java @@ -1,17 +1,47 @@ package org.launchcode; import java.util.ArrayList; +import java.util.Comparator; public class Main { + return o1.getName(). + + void compareTo(o2.getName()); + public class FlavorComparator implements Comparator { + public static void main(String[] args) { Case menu = new Case(); ArrayList flavors = menu.getFlavors(); ArrayList cones = menu.getCones(); // TODO: Use a Comparator class to sort the 'flavors' array alphabetically by the 'name' field. + public static void main(String[] args){ + Case menu = new Case(); + ArrayList flavors = menu.getFlavors(); + ArrayList cones = menu.getCones(); + } // TODO: Use a Comparator class to sort the 'cones' array in increasing order by the 'cost' field. - + public static void main(String[] args){ + Case menu = new Case(); + ArrayList flavors = menu.getFlavors(); + ArrayList cones = menu.getCones(); + Comparator comparator = new FlavorComparator(); + } // TODO: Print the 'flavors' and 'cones' lists (in a clear manner) to verify the sorting. + public static void main(String[] args){ + Case menu = new Case(); + ArrayList flavors = menu.getFlavors(); + ArrayList cones = menu.getCones(); + Comparator comparator = new FlavorComparator(); + + flavors.sort(comparator); + } + } + + @Override + public int compare(Flavor o1, Flavor o2) { + return 0; + } } -} \ No newline at end of file + } \ No newline at end of file From d2975c33dd16d1d01ac26c3fc32d62948885bfe4 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Tue, 9 Jan 2024 14:44:15 -0600 Subject: [PATCH 16/18] update --- .../controllers/HelloController.java | 2 + .../src/main/java/org/launchcode/DVD.java | 121 ++++++++++++++++++ .../src/main/java/org/launchcode/Main.java | 64 +++++++++ 3 files changed, 187 insertions(+) create mode 100644 hello-spring/src/main/java/org/launchcode/hellospring/controllers/HelloController.java diff --git a/hello-spring/src/main/java/org/launchcode/hellospring/controllers/HelloController.java b/hello-spring/src/main/java/org/launchcode/hellospring/controllers/HelloController.java new file mode 100644 index 000000000..ed416a9b3 --- /dev/null +++ b/hello-spring/src/main/java/org/launchcode/hellospring/controllers/HelloController.java @@ -0,0 +1,2 @@ +package org.launchcode.hellospring.controllers;public class HelloController { +} diff --git a/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/DVD.java b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/DVD.java index 7c2442568..e5daad681 100644 --- a/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/DVD.java +++ b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/DVD.java @@ -2,6 +2,127 @@ public class DVD { // TODO: Implement your custom interface. +// Define an abstract BaseDisc class + abstract class BaseDisc { + private T data; + private int capacityMB; + + // Constructor + public BaseDisc(T data, int capacityMB) { + this.data = data; + this.capacityMB = capacityMB; + } + + // Getter for data + public T getData() { + return data; + } + + // Setter for data + public void setData(T data) { + this.data = data; + } + + // Getter for capacity + public int getCapacityMB() { + return capacityMB; + } + + // Setter for capacity + public void setCapacityMB(int capacityMB) { + this.capacityMB = capacityMB; + } + + // Custom method + public void displayInfo() { + System.out.println("Data: " + data.toString()); + System.out.println("Capacity: " + capacityMB + " MB"); + } + + // Abstract method for playing + public abstract void play(); + } + + // OpticalDisc interface + interface OpticalDisc extends Media { + void burn(); + + void write(); + } + + // Media interface + interface Media { + T getData(); + + void setData(T data); + + void play(); + } + + // CD class extending BaseDisc and implementing OpticalDisc interface + class CD extends BaseDisc implements OpticalDisc { + // Constructor + public CD(T data, int capacityMB) { + super(data, capacityMB); + } + + @Override + public void burn() { + System.out.println("Burning data to CD: " + getData().toString()); + } + + @Override + public void write() { + System.out.println("Writing data to CD: " + getData().toString()); + } + + @Override + public void play() { + System.out.println("Playing CD: " + getData().toString()); + } + } + + // DVD class extending BaseDisc and implementing OpticalDisc interface + class DVD extends BaseDisc implements OpticalDisc { + // Constructor + public DVD(T data, int capacityMB) { + super(data, capacityMB); + } + + @Override + public void burn() { + System.out.println("Burning data to DVD: " + getData().toString()); + } + + @Override + public void write() { + System.out.println("Writing data to DVD: " + getData().toString()); + } + + @Override + public void play() { + System.out.println("Playing DVD: " + getData().toString()); + } + } + + public class MediaComparison { + public void main(String[] args) { + // Create a CD with String data + CD cd = new CD<>("CD Data", 700); + cd.displayInfo(); + cd.play(); + cd.burn(); + cd.write(); + + // Create a DVD with Integer data + DVD dvd = new DVD<>(123, 4700); + dvd.displayInfo(); + dvd.play(); + dvd.burn(); + dvd.write(); + } + } + // TODO: Determine which fields, methods, and constructors can be extended from the base class and which ones // need to be declared separately. diff --git a/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/Main.java b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/Main.java index 7d00acf4c..632385f09 100644 --- a/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/Main.java +++ b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/Main.java @@ -4,6 +4,70 @@ public class Main { public static void main(String[] args) { // TODO: Declare and initialize a CD and a DVD object. +// Define an OpticalDisc interface + interface OpticalDisc extends Media { + // Constant fields + int MAX_CAPACITY_MB = 700; // Example: CD capacity in megabytes + int MAX_PLAYING_TIME_MINUTES = 80; // Example: Maximum playing time for CD in minutes + + // Method signatures + void burn(); + + void write(); + } + +// Media interface + interface Media { + T getData(); + + void setData(T data); + + void play(); + } + +// CD class implementing OpticalDisc interface + class CD implements OpticalDisc { + private T data; + + public CD(T data) { + this.data = data; + } + + //@Override + public T getData() { + return data; + } + + //@Override + public void setData(T data) { + this.data = data; + } + + //@Override + public void play() { + System.out.println("Playing CD: " + getData().toString()); + } + + @Override + public void burn() { + System.out.println("Burning data to CD: " + getData().toString()); + } + + @Override + public void write() { + System.out.println("Writing data to CD: " + getData().toString()); + } + } + + class MediaComparison { + public static void main(String[] args) { + // Create a CD with String data + CD cd = new CD<>("CD Data"); + cd.play(); + cd.burn(); + cd.write(); + } + } // TODO: Call each CD and DVD method to verify that they work as expected. } From 71ba154eda63ac08413bad6ab9d254e060de3288 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Wed, 10 Jan 2024 11:33:02 -0600 Subject: [PATCH 17/18] message --- .../src/main/java/org/launchcode/Temperature.java | 8 +++++++- .../main/java/org/launchcode/TemperatureException.java | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/exceptions/chapter-example/temperature-example/src/main/java/org/launchcode/Temperature.java b/exceptions/chapter-example/temperature-example/src/main/java/org/launchcode/Temperature.java index 8eddaf754..24d688785 100644 --- a/exceptions/chapter-example/temperature-example/src/main/java/org/launchcode/Temperature.java +++ b/exceptions/chapter-example/temperature-example/src/main/java/org/launchcode/Temperature.java @@ -12,9 +12,15 @@ public void setFahrenheit(double aFahrenheit) { double absoluteZeroFahrenheit = -459.67; if (aFahrenheit < absoluteZeroFahrenheit) { + try { + throw new TemperatureException("That temperature is too low!"); + } catch (TemperatureException e) { + e.printStackTrace(); + } + } System.out.println("Value is below absolute zero"); } fahrenheit = aFahrenheit; } -} + diff --git a/exceptions/chapter-example/temperature-example/src/main/java/org/launchcode/TemperatureException.java b/exceptions/chapter-example/temperature-example/src/main/java/org/launchcode/TemperatureException.java index b581dc473..aa1c0b00d 100644 --- a/exceptions/chapter-example/temperature-example/src/main/java/org/launchcode/TemperatureException.java +++ b/exceptions/chapter-example/temperature-example/src/main/java/org/launchcode/TemperatureException.java @@ -1,5 +1,8 @@ package org.launchcode; -public class TemperatureException { +public class TemperatureException extends Throwable { // Write code here! + public TemperatureException(String message){ + super(); + } } From e17f851a7790d8673903a6fb7c10b41eb9920af1 Mon Sep 17 00:00:00 2001 From: megha saxena Date: Wed, 10 Jan 2024 17:56:04 -0600 Subject: [PATCH 18/18] update --- .../collections-exercises/.gitignore | 38 +++++ .../exercises/collections-exercises/pom.xml | 17 +++ .../src/main/java/org/example/Main.java | 19 +++ .../main/java/org/launchcode/BaseDisc.java | 56 ++++++++ .../src/main/java/org/launchcode/CD.java | 41 +++++- .../src/main/java/org/launchcode/DVD.java | 135 +++--------------- .../src/main/java/org/launchcode/Main.java | 70 +-------- .../main/java/org/launchcode/OpticalDisc.java | 8 ++ 8 files changed, 201 insertions(+), 183 deletions(-) create mode 100644 control-flow-and-collections/exercises/collections-exercises/.gitignore create mode 100644 control-flow-and-collections/exercises/collections-exercises/pom.xml create mode 100644 control-flow-and-collections/exercises/collections-exercises/src/main/java/org/example/Main.java create mode 100644 interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/BaseDisc.java create mode 100644 interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/OpticalDisc.java diff --git a/control-flow-and-collections/exercises/collections-exercises/.gitignore b/control-flow-and-collections/exercises/collections-exercises/.gitignore new file mode 100644 index 000000000..5ff6309b7 --- /dev/null +++ b/control-flow-and-collections/exercises/collections-exercises/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/control-flow-and-collections/exercises/collections-exercises/pom.xml b/control-flow-and-collections/exercises/collections-exercises/pom.xml new file mode 100644 index 000000000..eaee8bc3a --- /dev/null +++ b/control-flow-and-collections/exercises/collections-exercises/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + org.example + collections-exercises + 1.0-SNAPSHOT + + + 17 + 17 + UTF-8 + + + \ No newline at end of file diff --git a/control-flow-and-collections/exercises/collections-exercises/src/main/java/org/example/Main.java b/control-flow-and-collections/exercises/collections-exercises/src/main/java/org/example/Main.java new file mode 100644 index 000000000..09efe28fe --- /dev/null +++ b/control-flow-and-collections/exercises/collections-exercises/src/main/java/org/example/Main.java @@ -0,0 +1,19 @@ +package org.example; + +// Press Shift twice to open the Search Everywhere dialog and type `show whitespaces`, +// then press Enter. You can now see whitespace characters in your code. +public class Main { + public static void main(String[] args) { + // Press Opt+Enter with your caret at the highlighted text to see how + // IntelliJ IDEA suggests fixing it. + System.out.printf("Hello and welcome!"); + + // Press Ctrl+R or click the green arrow button in the gutter to run the code. + for (int i = 1; i <= 5; i++) { + + // Press Ctrl+D to start debugging your code. We have set one breakpoint + // for you, but you can always add more by pressing Cmd+F8. + System.out.println("i = " + i); + } + } +} \ No newline at end of file diff --git a/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/BaseDisc.java b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/BaseDisc.java new file mode 100644 index 000000000..1bdcbac97 --- /dev/null +++ b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/BaseDisc.java @@ -0,0 +1,56 @@ +package org.launchcode; +import java.util.HashMap; + +public abstract class BaseDisc{ + + +//public class BaseDisc{ + private final int storageCapacity; + + private int discData; + private int spinSpeed; + private boolean isFull; + + private HashMap discInfo; + + public BaseDisc(int storageCapacity, int spinSpeed) { + //Object discData; + this.discData = discData; + this.storageCapacity = storageCapacity; + this.spinSpeed = spinSpeed; + this.isFull = false; + this.discInfo = new HashMap<>(); + + + } + + + public void getDiscData () { + System.out.println("Store it here"); + + } + + public int getStorageCapacity () { + return this.storageCapacity; + + } + + public int getSpinSpeed () { + return spinSpeed; + + + } + + public boolean isFull () { + return isFull; + } + + public HashMap getDiscInfo () { + return discInfo; + + } +} + + + + diff --git a/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/CD.java b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/CD.java index 51781c249..6791928d9 100644 --- a/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/CD.java +++ b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/CD.java @@ -1,8 +1,39 @@ package org.launchcode; +import java.util.HashMap; + + public class CD extends BaseDisc implements OpticalDisc { + public CD(int storageCapacity, int spinSpeed) { + super(storageCapacity, spinSpeed); + } + //public CD(int storageCapacity, int spinSpeed) { + + + @Override + public void spinDisc () { + System.out.println("A CD spins at a rate of" + this.getSpinSpeed() + "rpm."); + + } + + @Override + public void readDisc () { + System.out.println("I am reading the data here"); + + } + + @Override + public void StorageData () { + this.getDiscData(); + + } + } + + + + // TODO: Implement your custom interface. + + + // TODO: Determine which fields, methods, and constructors can be extended from the base class and which ones + // need to be declared separately. + -public class CD { - // TODO: Implement your custom interface. - // TODO: Determine which fields, methods, and constructors can be extended from the base class and which ones - // need to be declared separately. -} diff --git a/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/DVD.java b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/DVD.java index e5daad681..f1bc4a947 100644 --- a/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/DVD.java +++ b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/DVD.java @@ -1,129 +1,34 @@ package org.launchcode; +import java.util.HashMap; -public class DVD { - // TODO: Implement your custom interface. -// Define an abstract BaseDisc class - abstract class BaseDisc { - private T data; - private int capacityMB; + public class DVD extends BaseDisc implements OpticalDisc { + public DVD(int storageCapacity, int spinSpeed) { + super(storageCapacity, spinSpeed); + } - // Constructor - public BaseDisc(T data, int capacityMB) { - this.data = data; - this.capacityMB = capacityMB; - } + @Override + public void spinDisc() { + System.out.println("A DVD spins at a rate of" + this.getSpinSpeed() + "rpm."); + } - // Getter for data - public T getData() { - return data; - } + @Override + public void readDisc() { + System.out.println("Readinggggg!!11"); - // Setter for data - public void setData(T data) { - this.data = data; - } + } - // Getter for capacity - public int getCapacityMB() { - return capacityMB; - } + @Override + public void StorageData() { + this.getDiscData(); - // Setter for capacity - public void setCapacityMB(int capacityMB) { - this.capacityMB = capacityMB; - } + } - // Custom method - public void displayInfo() { - System.out.println("Data: " + data.toString()); - System.out.println("Capacity: " + capacityMB + " MB"); - } + } - // Abstract method for playing - public abstract void play(); - } + // TODO: Implement your custom interface. - // OpticalDisc interface - interface OpticalDisc extends Media { - void burn(); - - void write(); - } - - // Media interface - interface Media { - T getData(); - - void setData(T data); - - void play(); - } - - // CD class extending BaseDisc and implementing OpticalDisc interface - class CD extends BaseDisc implements OpticalDisc { - // Constructor - public CD(T data, int capacityMB) { - super(data, capacityMB); - } - - @Override - public void burn() { - System.out.println("Burning data to CD: " + getData().toString()); - } - - @Override - public void write() { - System.out.println("Writing data to CD: " + getData().toString()); - } - - @Override - public void play() { - System.out.println("Playing CD: " + getData().toString()); - } - } - - // DVD class extending BaseDisc and implementing OpticalDisc interface - class DVD extends BaseDisc implements OpticalDisc { - // Constructor - public DVD(T data, int capacityMB) { - super(data, capacityMB); - } - - @Override - public void burn() { - System.out.println("Burning data to DVD: " + getData().toString()); - } - - @Override - public void write() { - System.out.println("Writing data to DVD: " + getData().toString()); - } - - @Override - public void play() { - System.out.println("Playing DVD: " + getData().toString()); - } - } - - public class MediaComparison { - public void main(String[] args) { - // Create a CD with String data - CD cd = new CD<>("CD Data", 700); - cd.displayInfo(); - cd.play(); - cd.burn(); - cd.write(); - - // Create a DVD with Integer data - DVD dvd = new DVD<>(123, 4700); - dvd.displayInfo(); - dvd.play(); - dvd.burn(); - dvd.write(); - } - } // TODO: Determine which fields, methods, and constructors can be extended from the base class and which ones // need to be declared separately. -} + diff --git a/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/Main.java b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/Main.java index 632385f09..63cc93ba6 100644 --- a/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/Main.java +++ b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/Main.java @@ -4,70 +4,14 @@ public class Main { public static void main(String[] args) { // TODO: Declare and initialize a CD and a DVD object. -// Define an OpticalDisc interface - interface OpticalDisc extends Media { - // Constant fields - int MAX_CAPACITY_MB = 700; // Example: CD capacity in megabytes - int MAX_PLAYING_TIME_MINUTES = 80; // Example: Maximum playing time for CD in minutes + CD myCD = new CD(700,500); + myCD.spinDisc(); + myCD.readDisc(); + myCD.getDiscData(); + DVD myDVD = new DVD(4000,700); + myDVD.spinDisc(); + myDVD.readDisc(); - // Method signatures - void burn(); - - void write(); - } - -// Media interface - interface Media { - T getData(); - - void setData(T data); - - void play(); - } - -// CD class implementing OpticalDisc interface - class CD implements OpticalDisc { - private T data; - - public CD(T data) { - this.data = data; - } - - //@Override - public T getData() { - return data; - } - - //@Override - public void setData(T data) { - this.data = data; - } - - //@Override - public void play() { - System.out.println("Playing CD: " + getData().toString()); - } - - @Override - public void burn() { - System.out.println("Burning data to CD: " + getData().toString()); - } - - @Override - public void write() { - System.out.println("Writing data to CD: " + getData().toString()); - } - } - - class MediaComparison { - public static void main(String[] args) { - // Create a CD with String data - CD cd = new CD<>("CD Data"); - cd.play(); - cd.burn(); - cd.write(); - } - } // TODO: Call each CD and DVD method to verify that they work as expected. } diff --git a/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/OpticalDisc.java b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/OpticalDisc.java new file mode 100644 index 000000000..3bc838f7b --- /dev/null +++ b/interfaces/studio/spinning-discs-studio/src/main/java/org/launchcode/OpticalDisc.java @@ -0,0 +1,8 @@ +package org.launchcode; + +public interface OpticalDisc { + void spinDisc(); + void readDisc(); + void StorageData(); + +}