From cf465bce1f1defaf399e60ab923edcb19a7062dc Mon Sep 17 00:00:00 2001 From: Kai Shields Date: Tue, 5 Nov 2019 11:35:47 -0500 Subject: [PATCH 1/5] checkpoint --- src/main/java/io/zipcoder/Classroom.java | 3 ++ src/main/java/io/zipcoder/Student.java | 35 ++++++++++++++++++++++ src/test/java/io/zipcoder/StudentTest.java | 4 +++ 3 files changed, 42 insertions(+) diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index 64566f0..7c9bb9f 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -1,4 +1,7 @@ package io.zipcoder; +import java.util.ArrayList; + public class Classroom { + } diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index b543e36..2965a96 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -1,4 +1,39 @@ package io.zipcoder; +import java.util.ArrayList; + public class Student { + String firstName; + String lastName; + ArrayList examScores; + + public Student(String firstName, String lastName, ArrayList examScores) { + this.firstName = firstName; + this.lastName = lastName; + this.examScores = examScores; + } + + 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 ArrayList getExamScores() { + return examScores; + } + + public int getNumberOfExamsTaken() { + return examScores.size(); + } } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index a9fedec..9b3ce6d 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -1,5 +1,9 @@ package io.zipcoder; +import org.junit.Test; + public class StudentTest { + + } \ No newline at end of file From c63147212eebc7058fd6c1bc49666f18e8b8213a Mon Sep 17 00:00:00 2001 From: kshields412 Date: Wed, 13 Nov 2019 16:18:25 -0500 Subject: [PATCH 2/5] non compiling. restarting local --- src/main/java/io/zipcoder/Student.java | 12 +++++----- src/test/java/io/zipcoder/StudentTest.java | 21 ++++++++++++++++++ target/classes/io/zipcoder/Classroom.class | Bin 0 -> 276 bytes target/classes/io/zipcoder/Student.class | Bin 0 -> 1097 bytes .../io/zipcoder/ClassroomTest.class | Bin 0 -> 288 bytes .../io/zipcoder/StudentTest.class | Bin 0 -> 995 bytes 6 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 target/classes/io/zipcoder/Classroom.class create mode 100644 target/classes/io/zipcoder/Student.class create mode 100644 target/test-classes/io/zipcoder/ClassroomTest.class create mode 100644 target/test-classes/io/zipcoder/StudentTest.class diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index 2965a96..6e2fd20 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -3,11 +3,11 @@ import java.util.ArrayList; public class Student { - String firstName; - String lastName; - ArrayList examScores; + private String firstName; + private String lastName; + private Double[] examScores; - public Student(String firstName, String lastName, ArrayList examScores) { + public Student(String firstName, String lastName, Double[] examScores) { this.firstName = firstName; this.lastName = lastName; this.examScores = examScores; @@ -29,11 +29,11 @@ public void setLastName(String lastName) { this.lastName = lastName; } - public ArrayList getExamScores() { + public Double[] getExamScores() { return examScores; } public int getNumberOfExamsTaken() { - return examScores.size(); + return examScores.length; } } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index 9b3ce6d..3d066e9 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -1,8 +1,29 @@ package io.zipcoder; +import org.junit.Assert; import org.junit.Test; public class StudentTest { + @Test + public void testGetFirstName(){ + Student s = new Student("Bob", "Bobert", null); + String expected = "Bob"; + String actual = s.getFirstName(); + Assert.assertEquals(expected, actual); + } + @Test + public void testSetFirstName(){ + Student s = new Student(null, null, null); + s.setFirstName("Bob"); + Assert.assertTrue(s.setFirstName("Bob"), s.getFirstName()); + } + @Test + public void testGetLastName(){ + Student s = new Student("Bob", "Bobert", null); + String expected = "Bobert"; + String actual = s.getLastName(); + Assert.assertEquals(expected, actual); + } diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class new file mode 100644 index 0000000000000000000000000000000000000000..4e31c9e6517c243644ffd5c117d77124f1b39cc4 GIT binary patch literal 276 zcmZvWKa0XZ5XIlbm}oBkK@e*@wQw7|lWPR4poL<;iHokptZd>H_pPoHuJ8l+p$;b^ zR?fg<-*4tEbNm0h0+^s3pn`^vrjHiEo9av#UxdnFxFNVRvsHvvq%*ZRA7f?LGESLv zB9q8;Bdsp|6S~D-=Y(FQjrh^0gtJ!6Qkm!0nBylQSedg;)LfTeG+&ePL4L~+E~&uG2W~Z<;`X76L6w%uiUb0@Mvq2`Oq9sj^|^q|@Lwv615-#51t~ zsSy&3J^&AeI5Rd$NX_PsXXe~htcL$Pc`&AGI z$$`L&`rLJ9cKsyBqtOwtUPq_oS!)HMJQ@$XGCuL?uLz@_Kj`>zp!V6Jm3#;YRA~iK z^Goot$K06w<5L+XL~{EwIh-}QRc~D9plbAws*;1R$VxP8O$Sn9(rmZFySH-_s?-}f z{SlP9w5#JYr5~O67cvwu>y38;PCFXMJ$V?Ye%-8%r|Mx`xY&15z_N>?3Jywqhn%hj z)@Lty+&!1QMB8^z-4ncPR1EOZ5Ca{fLSyS^9u@*sUxgfW3Crf^&&D2CLVO@P)nCJdnwmqHa Ij#lmd0RiN*RR910 literal 0 HcmV?d00001 diff --git a/target/test-classes/io/zipcoder/ClassroomTest.class b/target/test-classes/io/zipcoder/ClassroomTest.class new file mode 100644 index 0000000000000000000000000000000000000000..94b5da55a312f0b8571ebb6b1f3763ffdf71058d GIT binary patch literal 288 zcmZ`!yKcfj5S%rBfN=oPAu2kc;F@$nG)SqeP=M&q<^+d~FFKnP`75eO6np?56|uHx zQe;;e?ac0swD;fZ4ZtgUAsToI&azSW}CtHHMG&@D;#yVFY=ToBWMkX06 z{n(^3+e)h|{uJHvpbNq<)<%5m&y>AZEHhaY)|k^q73CWtT${5^)w`}^{%mJQ`6VN` z@Cbu{GYGxvPGmCQi&b(|X^9aW{-P@4<^V>YnW#D7O@BZa790eOKFeT3lQF7i4=seu J2yI3O(F2lmKNkQ1 literal 0 HcmV?d00001 diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class new file mode 100644 index 0000000000000000000000000000000000000000..0a778cc53dc635b67688dd5aafdd0272f3301f80 GIT binary patch literal 995 zcmbu7TW=Ck6ouCT3P=Z;a;vr8>a9R8^Wu{jlX|HyV@+&BVthKl2_6D7b>@sQ{wrUs z(ZnC%k206Q0fa^Kj$m3=nw+cvM%PzMIxP!a) zbT5bdIcy7LAL&4w#{%g_vm=ms8upby$=888O2%CkoyhKpk+L85KWCyjzjrD zdLtPOs2S;C!1r0%Gl?A0^K}v!JysnZYXThvL1?7WVL)-$52JxMOxTz=!zj%#e0fe$ zI1ZDjrw+C4&Ru}sx3&&e;RsZgG{#Xq3A;q$sv=`E8xERi<*?&m7kdu&(Gpl+Qfq1G zHgD`zcgS`H9yTs^dol8MA@nRv*mv80G-vSFe5;M-Lf)Uzx$~hM#4*WPC?|*K?>SP= zZF>=7O4eRbnnkSRDjm;9i7i~>?`EGg_zDi!B5xjd!F{E52JxAP6fSekPJ&sKc($ob zfQvQm{N{|LCdDzM8OAohBlV`7E@#9UR{V1M<<1vmk9POIA~%<;GZ~~PlEWoIjWSnx zvlgwX%*>)lgbJ#(n&#DMS0mCo>ZHHIe2cfiT~Og4Fc}MzUk>BaevKw&%2y~={ZE)p IBBgNcH`LnATL1t6 literal 0 HcmV?d00001 From 749d89c661788e5da440b987a0316c2399dbd82e Mon Sep 17 00:00:00 2001 From: kshields412 Date: Thu, 14 Nov 2019 11:55:55 -0500 Subject: [PATCH 3/5] checkpoint --- src/main/java/io/zipcoder/Classroom.java | 15 +++ src/main/java/io/zipcoder/Student.java | 33 ++++++- src/test/java/io/zipcoder/StudentTest.java | 90 ++++++++++++++++-- target/classes/io/zipcoder/Student.class | Bin 1097 -> 2746 bytes .../io/zipcoder/StudentTest.class | Bin 995 -> 3426 bytes 5 files changed, 127 insertions(+), 11 deletions(-) diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index 7c9bb9f..b6b9ab1 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -3,5 +3,20 @@ import java.util.ArrayList; public class Classroom { + Student[] students; + int maxNumberOfStudents; + + public Classroom(int maxNumberOfStudent){ + maxNumberOfStudents = maxNumberOfStudent; + } + public Classroom(Student[] allStudents){ + this.students = allStudents; + } + public Classroom(){ + this.students = new Student[30]; + } + public Student[] getStudents() { + return students; + } } diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index 6e2fd20..4b6931f 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -5,9 +5,9 @@ public class Student { private String firstName; private String lastName; - private Double[] examScores; + private ArrayList examScores; - public Student(String firstName, String lastName, Double[] examScores) { + public Student(String firstName, String lastName, ArrayList examScores) { this.firstName = firstName; this.lastName = lastName; this.examScores = examScores; @@ -29,11 +29,34 @@ public void setLastName(String lastName) { this.lastName = lastName; } - public Double[] getExamScores() { - return examScores; + public String getExamScores(){ + String output = "Exam Scores:\n"; + int counter = 1; + for(int i = 0; i <= examScores.size() - 1; i++){ + output +=" \tExam " + counter + " -> " + examScores.get(i) + "\n"; + counter++; + } + return output; } public int getNumberOfExamsTaken() { - return examScores.length; + return examScores.size(); + } + + public void addExamScore(Double score){ examScores.add(score); } + + public void setExamScores(int examNumber, double newScore) { examScores.set(examNumber, newScore); } + + public Double getAverageExamScore(){ + Double average = 0.0; + for(int i = 0; i < examScores.size(); i++){ + average += examScores.get(i); + } + return average/examScores.size(); + } + + @Override + public String toString(){ + return "Student: " + getFirstName() + " " + getLastName() + ", Average Scores: " + getAverageExamScore() + getExamScores(); } } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index 3d066e9..499437e 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -3,6 +3,10 @@ import org.junit.Assert; import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicReferenceArray; + public class StudentTest { @Test public void testGetFirstName(){ @@ -12,19 +16,93 @@ public void testGetFirstName(){ Assert.assertEquals(expected, actual); } @Test - public void testSetFirstName(){ - Student s = new Student(null, null, null); - s.setFirstName("Bob"); - Assert.assertTrue(s.setFirstName("Bob"), s.getFirstName()); - } - @Test public void testGetLastName(){ Student s = new Student("Bob", "Bobert", null); String expected = "Bobert"; String actual = s.getLastName(); Assert.assertEquals(expected, actual); } + @Test + public void testGetExamScores(){ + String firstName = "Kai"; + String lastName = "Shields"; + ArrayList examScores = new ArrayList(Arrays.asList(80.0, 87.0, 100.0)); + Student s = new Student(firstName, lastName, examScores); + + String expected ="Exam Scores:\n" + + " \tExam 1 -> 80.0\n" + + " \tExam 2 -> 87.0\n" + + " \tExam 3 -> 100.0\n"; + String actual = s.getExamScores(); + + Assert.assertEquals(expected, actual); + } + @Test + public void testAddExamScore(){ + String firstName = "Kai"; + String lastName = "Shields"; + ArrayList examScores = new ArrayList(Arrays.asList(80.0, 87.0, 100.0)); + Student student = new Student(firstName, lastName, examScores); + String expected ="Exam Scores:\n" + + " \tExam 1 -> 80.0\n" + + " \tExam 2 -> 87.0\n" + + " \tExam 3 -> 100.0\n" + + " \tExam 4 -> 90.0\n"; + + student.addExamScore(90.0); + String actual = student.getExamScores(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void testSetExamScore(){ + String firstName = "Kai"; + String lastName = "Shields"; + ArrayList examScores = new ArrayList(Arrays.asList(80.0, 87.0, 100.0, 90.0)); + Student student = new Student(firstName, lastName, examScores); + String expected ="Exam Scores:\n" + + " \tExam 1 -> 70.0\n" + + " \tExam 2 -> 87.0\n" + + " \tExam 3 -> 100.0\n" + + " \tExam 4 -> 90.0\n"; + student.setExamScores(0, 70.0); + String actual = student.getExamScores(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void testAverageExamScore(){ + String firstName = "Kai"; + String lastName = "Shields"; + ArrayList examScores = new ArrayList(Arrays.asList(80.0, 87.0, 100.0, 90.0)); + Student student = new Student(firstName, lastName, examScores); + Double expected = 89.25; + + Double actual = student.getAverageExamScore(); + + Assert.assertEquals(expected, actual); + + } + + @Test + public void testToString(){ + String firstName = "Kai"; + String lastName = "Shields"; + ArrayList examScores = new ArrayList(Arrays.asList(80.0, 87.0, 100.0, 90.0)); + Student student = new Student(firstName, lastName, examScores); + String expected ="Student: Kai Shields" + + ", Average Scores: 89.25" + + "Exam Scores:\n" + + " \tExam 1 -> 80.0\n" + + " \tExam 2 -> 87.0\n" + + " \tExam 3 -> 100.0\n" + + " \tExam 4 -> 90.0\n"; + String actual = student.toString(); + Assert.assertEquals(expected, actual); + } } \ No newline at end of file diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class index 6b441990716bff09a50c51324ec1921904c2fb99..e91f0ace2e19929695d92e8ea474611ebd61a933 100644 GIT binary patch literal 2746 zcmbVOTXz#x7~Ln6WRmH$Kzc!hVnm^7N=X$2p%=Lnv=~~nSOjlOlWCZeCNY_mi^>yg z`8Qnpz>5#MmIRlsr9Ar={3os@xWAc6I%x|JzMS*TIp1Y}-`*$fUr&Gg1HdudH?SY` zNep8_mdmnykidrq7I8(#M+S7v%d(WfRoOpI;F?@smyb^p_*C}Kaq10s-deL2Qu$SD-O81%N-4MK)}2aeQXx^c z+V_Ti$68w~RO@y_VbFJOx=uNFre3%1=ADL1|Ky@ms#tEb&V-}e`AmhX%vPJrWqWdl zaq%gq;tV8dhqxXFZG83e?tF+zylOT#-*c7 z-Wl!Bbzw!aG_F{;?23Yx8D$RBDi%Ar=^Ta^kS*|H4N+0I;(}`yCE897k`v3!%}S6b zKfg3(S+Q?>QY7|Sg?^$svu@X|lHCba=$>JxfNuGod?QTcR(+ANz+$yoFW46xk&79q z;E22l6Nj*7;uWM#yei89yhfl>D(ydrQ-+R;i7KWQc5i-0XPZu$!ZK0AmmF_8=>^Is zXB=3fWP^xyK2{ty;~l z6cxt9DhOWmR&fVI;;Y-2nS0T-My^F#T~0n!26q(;PG6XfirpmCcGPupwQiN0_QHyI z%!bo+#H3NJ3L}}h&~H>b!PXqZJXAc{_y$h1Wg% zAbMyY!U*p(Jh{(3%6%aF7%DsV2$AgJN6@n4j}ZNt=Nd-24k542Su}OkREES%M(qS%N{sIBk>l#p?hL^2A4VglCi;SHYCyEcEZ%u$9O@$Q1^nZ3ePu zTOh}_2cm5TGE5-*p94guCKKQT3xNE|NeN5&R4gBz)@Ft|nP>~~Xz>S}{2ltW$4HE| zkW3j|_O;NHGHHm@a0|UH^rd$2yM>+k2NCr^QxBg#8Iyi|cK7oi08lL&If;>{0kU$2 z?99@>NTsw{)^QHUae{tC5)4km9NzZu#`vpnlD83@;(ae7Poe9WRO%m`WgAnN4w@0B zgx*BZ#E-PY43C8do9Hk+gLi`XHp7O*v+G?~H-_tL&uG2W~Z<;`X76L6w%uiUb0@Mvq2`Oq9sj^|^q|@Lwv615-#51t~ zsSy&3J^&AeI5Rd$NX_PsXXe~htcL$Pc`&AGI z$$`L&`rLJ9cKsyBqtOwtUPq_oS!)HMJQ@$XGCuL?uLz@_Kj`>zp!V6Jm3#;YRA~iK z^Goot$K06w<5L+XL~{EwIh-}QRc~D9plbAws*;1R$VxP8O$Sn9(rmZFySH-_s?-}f z{SlP9w5#JYr5~O67cvwu>y38;PCFXMJ$V?Ye%-8%r|Mx`xY&15z_N>?3Jywqhn%hj z)@Lty+&!1QMB8^z-4ncPR1EOZ5Ca{fLSyS^9u@*sUxgfW3Crf^&&D2CLVO@P)nCJdnwmqHa Ij#lmd0RiN*RR910 diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class index 0a778cc53dc635b67688dd5aafdd0272f3301f80..54a7c63551db1c28346145b994e4f57a6cb7f224 100644 GIT binary patch literal 3426 zcmcJR*>l=f6vjUp5He9}g0UTErCEtLoIPIZKw`&nf|mexLYz$o#g>DS1Hw%@)0zHD zeQ`3)wA1JQ8-49Vr*D1f^t+M}P~)^SNnu91I=c7V@BGfW2Y&hMho1mk!Pg<2!<`^z z72H)Y7eWW_iOc;E(wG;c1qF)=mV$T?L`F{LxQw3=RAlAk^3V2@oXp#InsZnV;Q&?? zJQS-RDagyomGA7=!thwZs+@e#Fg)SwCGYi91<%B^=Rv#(LX#j*8fC+plHiM9Sdrkr zZ5DM2U1_7NFVwcy^h!=!E71~3n+2`3qE!s>>>B;nhEbK!pEk_IH^z2>Yb%MYRV(Uc zE2mej2?=3~_gUS#V^pfvg0@9h5|{L}Tf*sz{$^V*Sb9yhV-U6J&vrJWt0-BN=18{HtaxqTLHb@u0y)eZoys9{ z8)GAvuKph}?g)B)ZK@&1qH4+F;@Tz;u!PBYQ;EChcRx#OQA~(Nq^`I0jA-0FMy>52 z+&Ji|YL(TdCfM#syp8-!_hX;B*V3c9S?BFMtcbEXr-FI_>!$EKHa>xcb=Te zZAj;4vQ`z{K*HJhYMV_QlfA-i8vU+1+jiS5m57c#%qDP@5ZyH|`cr(Uhsdo!9V__;17%7qv$7`T^!wy!#Q+P*C5plF{WX17@^VxBe;tDxP}bl%`?&l zi^m>|haQWZ$6~-^aRN8#O|UrPvdFYyA?EL8k@Q&n>9WuoEP@{|guLto-L@i*2`DV0 zB^hK@P8)C_M5gEPE6(9))_lm|?r9*F(KsEVZczF@GtFSY=Of?(8L4XFUK*))tx2r~_@y6VN zG@rbHq=@^Jow?0nQ#(JmKI&+qMaH);CMRM_LWYGlohEmMRgmzTlIocX|0D%uH%JJ1 O+oZ4c&!i6XB)VUV3nobb From b9d01ac523f0422c5f69af82ac225e5af9a5a711 Mon Sep 17 00:00:00 2001 From: kshields412 Date: Fri, 15 Nov 2019 13:14:34 -0500 Subject: [PATCH 4/5] turning in --- src/main/java/io/zipcoder/Classroom.java | 65 +++++++++++- src/main/java/io/zipcoder/Student.java | 9 +- src/test/java/io/zipcoder/ClassroomTest.java | 95 ++++++++++++++++++ target/classes/io/zipcoder/Classroom.class | Bin 276 -> 3575 bytes target/classes/io/zipcoder/Student.class | Bin 2746 -> 2734 bytes .../io/zipcoder/ClassroomTest.class | Bin 288 -> 4046 bytes .../io/zipcoder/StudentTest.class | Bin 3426 -> 3426 bytes 7 files changed, 164 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index b6b9ab1..59232c2 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -1,6 +1,10 @@ package io.zipcoder; -import java.util.ArrayList; + +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; +import java.util.TreeMap; public class Classroom { Student[] students; @@ -18,5 +22,64 @@ public Classroom(){ public Student[] getStudents() { return students; } + public Double getAverageExamScore(){ + Double examSum = 0.0; + for(int i = 0; i < students.length; i++){ + examSum += students[i].getAverageExamScore(); + } + return examSum/students.length; + } + public void addStudent(Student student){ + students = new Student[maxNumberOfStudents]; + for (int i = 0; i < this.students.length; i++){ + if(this.students[i] == null){ + students[i] = student; + break; + } + } + } + public void removeStudent(String firstName, String lastName) { + for (int i = 0; i < students.length; i++) { + if ((students[i].firstName + students[i].lastName).equals(firstName + lastName)) { + System.arraycopy(students, i + 1, students, i, students.length - 1 - i); + } + students[students.length - 1] = null; + break; + } + } + public Student[] getStudentsByScore () { + Student[] scoreArr = new Student[students.length]; + for (int i=0 ; i gradeBook = new TreeMap(); + for (int i = 0; i < students.length; i++) { + if (students[i].getAverageExamScore() >= 90) { + gradeBook.put(students[i].getFirstName(), "A"); + } else if (students[i].getAverageExamScore() >= 80) { + gradeBook.put(students[i].getFirstName(), "B"); + } else if (students[i].getAverageExamScore() >= 70) { + gradeBook.put(students[i].getFirstName(), "C"); + } else if (students[i].getAverageExamScore() >= 60) { + gradeBook.put(students[i].getFirstName(), "D"); + } else { + gradeBook.put(students[i].getFirstName(), "F"); + } + } + for (Map.Entry g : gradeBook.entrySet()) { + System.out.println(g); + } + return gradeBook; + } } diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index 4b6931f..48bce97 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -1,11 +1,12 @@ package io.zipcoder; import java.util.ArrayList; +import java.util.Arrays; public class Student { - private String firstName; - private String lastName; - private ArrayList examScores; + String firstName; + String lastName; + ArrayList examScores; public Student(String firstName, String lastName, ArrayList examScores) { this.firstName = firstName; @@ -57,6 +58,6 @@ public Double getAverageExamScore(){ @Override public String toString(){ - return "Student: " + getFirstName() + " " + getLastName() + ", Average Scores: " + getAverageExamScore() + getExamScores(); + return "Student: " + getFirstName() + getLastName() + ", Average Scores: " + getAverageExamScore() + getExamScores(); } } diff --git a/src/test/java/io/zipcoder/ClassroomTest.java b/src/test/java/io/zipcoder/ClassroomTest.java index 7bac1ff..ca080ec 100644 --- a/src/test/java/io/zipcoder/ClassroomTest.java +++ b/src/test/java/io/zipcoder/ClassroomTest.java @@ -1,4 +1,99 @@ package io.zipcoder; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Map; + + public class ClassroomTest { + @Test + public void testGetAvergeExamScore() { + ArrayList s1Scores = new ArrayList(Arrays.asList(84.00, 92.00)); + ArrayList s2Scores = new ArrayList(Arrays.asList(96.0, 100.00)); + + Student s1 = new Student("Kai", "Shields", s1Scores); + Student s2 = new Student("Kendra", "Ng", s2Scores); + + Double expectedAverage = 93.0; + Student[] students = {s1, s2}; + Classroom classroom = new Classroom(students); + + Double actual = classroom.getAverageExamScore(); + + Assert.assertEquals(expectedAverage, actual); + } + + @Test + public void testAddStudent() { + int maxNumberOfStudents = 1; + Classroom classroom = new Classroom(maxNumberOfStudents); + ArrayList examScores = new ArrayList<>(Arrays.asList(100.0, 150.0, 250.0, 0.0)); + Student student = new Student("Leon", "Hunter", examScores); + + Student[] preEnrollment = classroom.getStudents(); + classroom.addStudent(student); + Student[] postEnrollment = classroom.getStudents(); + + String preEnrollmentAsString = Arrays.toString(preEnrollment); + String postEnrollmentAsString = Arrays.toString(postEnrollment); + + System.out.println("==========================="); + System.out.println(preEnrollmentAsString); + System.out.println("==========================="); + System.out.println(postEnrollmentAsString); + } + + @Test + public void testRemoveStudent() { + Integer maxNumberOfStudents = 1; + Classroom classroom = new Classroom(maxNumberOfStudents); + ArrayList s2Scores = new ArrayList<>(Arrays.asList(89.0, 100.0, 50.0)); + Student s1 = new Student("Kai", "Shields", s2Scores); + classroom.addStudent(s1); + + Integer actual = classroom.getStudents().length; + + classroom.removeStudent("Kai", "Shields"); + + Assert.assertEquals(maxNumberOfStudents, actual); + } + + @Test + public void testGetStudentsByScore() { + ArrayList s1Scores = new ArrayList(Arrays.asList(100.0, 93.0)); + ArrayList s2Scores = new ArrayList(Arrays.asList(78.0, 85.0)); + Student s1 = new Student("Kendra", "Ng", s2Scores); + Student s2 = new Student("Kai", "Shields", s1Scores); + Student[] students = {s1, s2}; + Classroom classroom = new Classroom(students); + classroom.addStudent(s1); + classroom.addStudent(s2); + + Student[] preEnrollment = classroom.getStudents(); + String preEnrollmentAsString = Arrays.toString(preEnrollment); + classroom.getStudentsByScore(); + Student[] postEnrollment = classroom.getStudents(); + + String postEnrollmentAsString = Arrays.toString(postEnrollment); + } + + @Test + public void testGetGradeBook() { + ArrayList s1Scores = new ArrayList(Arrays.asList(70.0, 100.0)); + ArrayList s2Scores = new ArrayList(Arrays.asList(94.0, 85.0)); + ArrayList s3Scores = new ArrayList(Arrays.asList(62.0, 96.0)); + + Student s1 = new Student("Kai", "Shields", s1Scores); + Student s2 = new Student("Kendra", "Ng", s2Scores); + Student s3 = new Student("Val", "Fraiger", s3Scores); + + Student[] students = {s1, s2, s3}; + Classroom classroom = new Classroom(students); + + Map gradeBook = classroom.getGradeBook(); + } + } diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class index 4e31c9e6517c243644ffd5c117d77124f1b39cc4..aa25d2f654db713a3b247589769ab0c8bcdc442b 100644 GIT binary patch literal 3575 zcmZ`+S#%rK8UC&$YqX3V?+Nk3k`T*Mg54C_Bu-MtP6BQnCqc$QfReE^ab!yxF_PSv zZUMs5veOpIQVL-)T^?8sA%`4z=;=A_bDw+q!UGSS({oxL(xmjecV@KM>VszP{pY{` z{r>O&{(J4e{P*Jv0ItXHBZ%YfFa~j4J`4@B5u}io4>N)QPH32mAS8VPI4MUNIhvQF zg$T09MUaOj{Rl8ta&FeN51(+YbQco>!QGjBrnFZe5StjB;cJ{r1=dYw@}{$5+L+DK z(mrXWjO>hIXXM;921+M0479#(+wrVXEZUZp%HNymMQrftlb2TmEeWXiIMyfZd9Id3c)Ls=s~H?-d>6F;GejDTiJw{lLV z*TAJYSu#=!hm3+sSHnXB5hI;;u?TF4)g|uQM1=|H|@FVTG>pEqq)Z<8|Ua^QN-o0S)rgy*Uu z*VX&*Yj?e{mI|J@Zm4(Ny_Sr%mc1hy9@g*(3zf9WcFH`Mk>YKsX!1HqmyRLq)UgfM z=}5@DI~ueN%dO*Q__>Zp@tBU?*h8VOCVQ-$$+FdSOyIjZ9>)_pz9&ad;wcSJ>v#sg z(C|wgzrwRRp2M%nsS2Sunzl`or0RGcPm$Ptgs$TSyvXqwf8+e^=kK77m+%`6FYEX% zUSV=NUd34*ui6iI%}751_BAsL8ij(HPYY~oApP1Xj<8*> zDVb2oa!jk6yV3zQxp|&J^PaMil`^f}&B=UZ@K{~)$)zG&gvvE++gM6j1&Tf1VA({C z0^LXx>KF~DtX#pc&1q}Ze(v!z$fH*_+rerl`wL}OU`K;p)^1Wuj=L{e;U!=%B~3=D zZ(N#4T1_F9PbgCL5s&)7#XWfoB@BSM&lXvvD7?thDnBQ&~Gw}iZt7En@ zW*cL+|DTvUh}em_(~UXGeFgVxQ8-)sKS7{D+z!U=B;qa=S9eypSOs=r#Emw@w~W>l ze;@w0IdBpVD&zW^#Z8sPJjmR|FK`n{%&wM?&@}1a(<_5qIE((o3W9RnyL|;3$0_;! zj880o{de!vg@-K~<&J(uaW|Sc-pFSUTG5MZ`A(o;A-IY@8a87u36>?=$ z+#i%u6xXoun{Xx3Y$3)$&W8}Ipls&cLpfZL#xM?0UJl9#{Fl%ydM+|kfg5p?i}7y= zl1*U2zqik&arQhyw||JRoc3*hACVPAy|K>m3YuLHk{aFWSXR*TJbIK{;JA9p$Av(; zFZ~hL$+0^Z$!dBI`EjO~Ak?k6i$u?}E2Pfjgyq9Ym6jxNp_0~uytD{k+IVTv%P9jB z^ojrA*hQ8^V6vjMe>0LSvZ)ZT3>C=)(r0m`H*ma?`X1?`)FTIdj*MDg!j+DFS3td; zZ%OsKB9J`er@%f{rTasos;oF$6HFyc;N4WrCN}B_TXY;da2PvrD{Xi2TZ+1t313f; z<7}QotXY7H9LE&t@ROX|Dz!CT62iEXF=UI%)H~618Bq;K#3i(d-7K+F<)gUSsj~PZ zBg!g&bslXjZF_}*vpDah<}^$vI-YwG8xo$atG)Xi*86emG9LGAvavd`VU^!T&rh-J zHDD)tR{8aLepRYfy#7^wS9yM2HDIoGjEd^9#5r6ea1NUU4sAV$&4Pc9tmoibflskz z>Rk+MTS093>(5n90;=1`*yA8)A&jAe3~yntj!=42be)@&ofml4r$ nhZr6h7-(a`F3A$!d68$3kGha2;`eb2-x03Z!hfo!gW>-HYoH;S delta 139 zcmew^J%vf>)W2Q(7#J8#7zDT&m>GE48Ti;4_!$}4Y%=pQOY9gKm^CKzF$Pb*%`C^v z!oWKDF^hIEgCYYHP%Q{B0wGWsNU{NW`d~f-1FP0{2F8s*0VW1^Ajt+41`0B807)Jw Ro0EYH$YW&S29it+JOK5Z4%z?! diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class index e91f0ace2e19929695d92e8ea474611ebd61a933..62c3a9f6cd932484d4ba29fd2aa45b1ce1b65ba5 100644 GIT binary patch delta 1297 zcmZ`&+fEZv6kRjD%yby476Ao>B2=J&rCb#OK}7_?8!8~8R;+jf6cq82^vwtLt?&8+ z#z@rBK;j4Z;ve_}{(*_awNHoIpr+~G``p%Adz~|@g>MT}U)NW^0BFTi3%f89Kp9R* zI4R+jiPIL&VAQ}_3kF6coHKD=@|cNnS)7o;1rw8!FUri6g+g4C>atW<3?xikwFo#Z z;hKr0hT@sN-yuv%q%ddSh`<3HF4C%V(!RF@oZL7@=ql#871l0Msb^{&hVC# zx8gs%;*xaCs}kPy4`WKXUd{&!v_0i@;D5tGuJa8!{hC?lyV2tU zY&dTbz+3NN+t?rXGj|uualpztZ{Z+%6?vbML^0zS=ChKA6%?@2+Rq3%DEJF7t^mWT z^H%i?4w)9 zlvJ_OhW<;e9Hf&q#O9YO3|yI1j6i%1#>6L>p&|!?sDt868rZ=c+L;-YIBd~DDMt>r UZhm6jN>Apo$Fr6nCx?#V-;YFr^#A|> delta 1226 zcmZ`&%Tg0j5IuJ$$xMbJDi9(f5KvyhKoA7w5ip7%B8d1_l!vIOh=LD%vebpUS@;*0 zl$x?wSgzgp6aIi(t3*%V#6VHH>F(QoyU*z}cix6q!^>aSRzCx1#R~`J7!INgBVta7 z8MSfJ!5B_iIPJi~u$VJ8&Wb;0;nvE_grRPGpNwy6%6nzj$7?X>q5@GDm13%}OCi5+X>u+)Ha)*E zv)JKSxZ`3T-3k%!w=a@%aToU#tY}bQljDMdFB(s>e-Za3@jyX2E{-AL;vpWnSi)l$ zPw>>mGd%a&eU)w#61>Eg79_k0U&QXmfQx-dykGXcRxM>z3NT>^IYx%?)1DNeuv^E~ z$YWfCTGs2lWT1Mvp7~<6;Z8&RP8Y1L4KjX>RUL3Hnj5|FqGZU#8K?mbN%SY z0aguku$~WN4VHyYrG6qsxGr=HC`%%s$Zk`1?~Co!u4~?~VR<{Jc@jO+>iw`wo7e9) zZrIYv>FuDG+yx*-w$jxdtms_tO6abr-XWCh3USwV-Ui=VAC7Pb#cc+3|C`|Gtn_Ez zW(yT+MFBOer*C4Hs3Y?%E+^{9$LY;Z_M?;f2p`eJh4D)?8Kfk&%<(4^1XdS={Cg429Ey$t>t!6 diff --git a/target/test-classes/io/zipcoder/ClassroomTest.class b/target/test-classes/io/zipcoder/ClassroomTest.class index 94b5da55a312f0b8571ebb6b1f3763ffdf71058d..79969b77e61fd9d77296102edcb676d5bbf149c0 100644 GIT binary patch literal 4046 zcmaJ^{dW{s8GdH7J2TlVge>`Bp~sS1U;_z}f~cE7HwgjK1VUL7SfT1iNj8!#H*DDLAbIw>Ob0kLnn4cB#SyK>HSy%7by9`7eiZ*0YMmdwd(Mx{`)9lF%r z19C+VJu}P3iZNXGtn%=f;~1+mmOQJwPlYBi_kggAMk;vqMYAem#N4Ntw0W&&mOOJ& zL^76S($a0&s4fj3v+GQpwz}&dW7yt{kMP%C3X4$C*J9JCj-FJb0lZQF_aqtyev(V$NHx#Z1SlRogQ>%dRrfEi<;WG`w7AtA+zuHw#$D78e5$ z6l|>+*Zh{vUJf>SQkhbaG(*t2p#|kD*i>`O$*N*zPB_M*Id0p} zi!L5)GUK3v_NC^#&IszKj2b;B3wGTpna3?jewf0K@MCfG9Uk3)m=x8tVG;7e70WCyy2A7)q|LNhU33hx_B6rli5_fZCQN^t z!q4z?4Zld?mv~p~{E7mdG3_dSoFrLHCxu_*ZVJD_Z&Uak-qY}Y3ctr6D9Iy_{%QDQ z3V*_%HGCi{`AZ6a#oto+5Fe%Rcid&x^McgcamTROm=r$7C#2_wc?twu5Sm?BrUrR> z#VFU!*~=_2dn}Mal=0!ArsT;@)o_LI73|7hj4;IaIT969Fds76NUJBvWX7gqM#Lx^ z4c^J90Zk)LTXvdRNXO!MhABi#4oE3oZ(Z`o8HY?{o^@w8uCpoKG1oO6mY3p$d67DUSvanli)8?z|I&Bz?;3Y#t|B&H4eafBZj z;-^BPYV*8~@oAWMh4;kXbtoTl5yN<31ax46>y&SRW0>TVg5x|K6NiMHOwbioN_M0XDPvPCj>G z7HK?(ZkXtShhE&kHr&E?+`$f6=_S9KpwfO+Z~`Y;@i=BM#Z`f_^7CN$2xWps#sAAz?KjSupg74Cc5z%xllJZvGw8HneHEwa1O5FiCkhZ6JNt; z0vy6RkFo^3I!b{kX*T_0SEFbRM0o*ZuRTlAOmfwM!61*5a&f+40Z=>Ha+6%bP zV1(eGA>5bf=PMHK5+i*TUn5w{%){Wyhg(qB_c2EwtspOiAmcwgr!t=_q;8f}?JMqE z!$1hN8bG~Q0!yfU%n9}2gBX*)0mcn|YRcS)f42%vzt=9k^j|E-4pO$n^f|AmJBp9%C|CZt033C8%GY=z1Qk4cj9 zzcZXQf|@!b>5{JPjHgJFCL=RJ#PVl?i1qMHFdOZ8ne7pC?UQJG4u$APhHA^yJscXe zwx>C_zZe?G`Rvc_2U^xLm)S9n>|A<8QeLG@IGs6}Ii3@RVj`m!a+++aCYq{eI6Fpj z?agNS!+DO)nrE}lOFmzv{%=t6cL?5Hg7pD``Cj0&L|45z@i?7PIhuy^g~4OTOuNemiQ4K M*3L4|#PIz80I(;D^8f$< delta 109 zcmX>nzko^f)W2Q(7#J8#7zDT&m>GE48Ti;4_$P}nrcD0Bti;U1z&hEMRbPxjk%0*) t4FZfn2owgAY?JFa#MIe=Vr)Pj15lm=Nb-Q$tPGqCTwvAQK$3}p2LPxw3pxM* diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class index 54a7c63551db1c28346145b994e4f57a6cb7f224..35039ac18f5fb67c7e46b041ddf4ac22a99bda03 100644 GIT binary patch delta 13 UcmaDP^+;;NYaYg|$!~bd04)m!3;+NC delta 13 UcmaDP^+;;NYaYhz$!~bd04)#(4FCWD From 7500483e072b966b14ec2026a71f68b5d8ee9345 Mon Sep 17 00:00:00 2001 From: kshields412 Date: Fri, 15 Nov 2019 13:14:47 -0500 Subject: [PATCH 5/5] turning in --- src/test/java/io/zipcoder/ClassroomTest.java | 9 ++------- .../io/zipcoder/ClassroomTest.class | Bin 4046 -> 3803 bytes 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/test/java/io/zipcoder/ClassroomTest.java b/src/test/java/io/zipcoder/ClassroomTest.java index ca080ec..70eaff2 100644 --- a/src/test/java/io/zipcoder/ClassroomTest.java +++ b/src/test/java/io/zipcoder/ClassroomTest.java @@ -30,8 +30,8 @@ public void testGetAvergeExamScore() { public void testAddStudent() { int maxNumberOfStudents = 1; Classroom classroom = new Classroom(maxNumberOfStudents); - ArrayList examScores = new ArrayList<>(Arrays.asList(100.0, 150.0, 250.0, 0.0)); - Student student = new Student("Leon", "Hunter", examScores); + ArrayList examScores = new ArrayList<>(Arrays.asList(100.0, 85.0, 76.0, 0.0)); + Student student = new Student("Kai", "Shields", examScores); Student[] preEnrollment = classroom.getStudents(); classroom.addStudent(student); @@ -39,11 +39,6 @@ public void testAddStudent() { String preEnrollmentAsString = Arrays.toString(preEnrollment); String postEnrollmentAsString = Arrays.toString(postEnrollment); - - System.out.println("==========================="); - System.out.println(preEnrollmentAsString); - System.out.println("==========================="); - System.out.println(postEnrollmentAsString); } @Test diff --git a/target/test-classes/io/zipcoder/ClassroomTest.class b/target/test-classes/io/zipcoder/ClassroomTest.class index 79969b77e61fd9d77296102edcb676d5bbf149c0..be0649d7b664f4c0793eeeb78ccb47b0667a265a 100644 GIT binary patch delta 1621 zcmZWp+gBB39Nlx~%;gNzLGYvuH`3Zf`*5-TD^1WVAen~s*3%uC5o zUb;{`)Kd>G3t6&a_0UtTGg$Irk4vh7RGEGwegyRV!UqS zn2m8Jdg`r(2?xt@T$U3K-oTr(JIOX3VSwp%hh^mcEm_`nFoJg+yo>i_Ic0i1`OqDO z(9=vjqmGi}U;lGu@fjOuCJrAW`p2R6i12uSHQA9EFEAMn8{T{A**zZf0)6W)ANl8nA`C zIEGM-t=PuuC$IwBv4d!Q&Z-?dVc`O7W^d!#!P?7MBdpuGShrK^R`8{e=;Bkuo)8|l zWh^0}MuTdnEqGAm)XkzIYt*IVv&g8unKtI|Sk_9L^04nPScmYhffM}fRQfeafsos1 z#4Sb->_s?2E^=M45MZe1ut4;dNMrWn17+aS60AxB_GnEwKIAve)D ztkKCDyNN&%+RlxJ19?XHi-{)h4#(&4_^x>@&(+T2iF+vPm`5yU{scXzr|{$)%j4;Qf>m>}g`IM+w$Yiw5F;hKL%8bsYxi zlwrb=iMNJOB2^3wQk8zfEg@H#UyRwS)$DcFScUa6{5Z=LbEy4nAww17Vc36&E8Yhq zqfNTaPEDRudGNct#m}ToHN~_kBel|&nxCBNdc(U!Iw5yXfm;?ymTlpDT8U~SIeBzq z8^(A#NoSrSymNHpWjbz>Uc5=v)8z3j;R@eloHy{D@b$UL(4KjV4=q}}Z_(oIk;TWz zPmFD_$r>e$$rk0x8WtNptPEkZm90#YV8hTF&cAFgy+Yedue9<#K@@ENVkA~W@)2!y z(4MRaesdG)a*=HgiFUnSNVPVjqr@(0dPWI3ebe~fI9!PKHE$0Jq57%!=hW1JF)F7Rn4`4?cY=0Fv{ vqs`^ delta 1913 zcmZ`(>sJ(Y7=C6iGqb~NzzWi8CS>VybK{7bATXei2o^;klwDR@5ahZnnwAZkSxH(t zR+tqT7j6r_Y_f^hb2~R6W1n>_Q!DKK!ol?|t9rd7pQFUG?*7`-eZj zxe1^gvj(csuVFyLplY@8jGqB7hE!{JdN+&_10Ez)tHV7~txk8LVN^#_$C!ak9MEx4 z$1{9r$y*JF4CLXk7@jro9FB<9^QyJC_d98zT0^d-4qL~#xIHR{V+MxtLIB6{qK*>= zUc$=;UcpH*OsH17`$)AKr5C1~hgVgrbzE+V!o3&Ar_TJeD)Y3C*Tm*^4QDi*omnuv z-Wphr-&dUF;GBjxOuUJ=Ow?e~v3wC;o_F^9B6bblHgN&(Xn5Dedzcay?%$A<vq2aO#2Va`_3SXO;!4(r% zF|EMc9_tS&&>9l4-X0O;8m=n{JC+i@`j>A(v9tPO2V&9w*kDhz_0VWCKEO9aV@ULK(vzWB>jpfX>bLNAdUH@T54E+^mxG{O_;XO={Ak>1OO9^xB{>Uag|cU{zE}{pVu^>f zlI9J}xg6QpNCcZ$^UXxJg_tXuaTR(fKfy}1n@WlmKe}kqMI6~IpQyTr_N7uWUXH7= zSxCl5qfAPniy?#*1aQ~vR@_gg)Z1&qs;qig6%x?Gnyk0jZP@Le z1;PPwW-MW2jTx|xyl>;UotWxbp9b_(-v?Q{Bh2zRQ=Fip&r-{i)aw+hc9CcV-eJ}o zxFqn}Toh2$>Bfjln4&Q{78_${sxkVBPqc%dLGG2rs0?w3lm>r`$d!W78A_KT2{51{ zrD6P|Swt+iSwyU`>=q`m)GYB7S=GVYjq)^ELFfC7JY!ROTjm@M<|+3%=Yt!)6`@M! zmtc{-wIZ-YQ4xRYV4MOfu#ROEB^{yEZR+wAGoEIKmnqt7%ui6#E$y$TBv62Ji;Rq> z80n%Ax@BXG(8^VSO;L%ThMzuT5$dUlIHs{o(!^ggi4gkH8AicA^iq>TD*0>-H-t-s R2qAcIL)