From 30c3484a0a01c9c885ff9fea58d31e96ac224344 Mon Sep 17 00:00:00 2001 From: michael-doll Date: Tue, 29 Oct 2019 22:43:07 -0400 Subject: [PATCH 1/6] save work --- src/main/java/io/zipcoder/Student.java | 30 ++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index b543e36..39200b9 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -1,4 +1,34 @@ package io.zipcoder; +import java.lang.reflect.Array; +import java.util.ArrayList; + public class Student { + String firstName; + String lastName; + ArrayList examScores = new ArrayList<>(); + + + 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; + } } From 04e4826d11fe62b89cf71d97da7c2df58ee87415 Mon Sep 17 00:00:00 2001 From: michael-doll Date: Wed, 30 Oct 2019 12:33:36 -0400 Subject: [PATCH 2/6] save student test --- src/main/java/io/zipcoder/Student.java | 24 +++++++++- src/test/java/io/zipcoder/StudentTest.java | 53 ++++++++++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index 39200b9..24f4722 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -9,10 +9,10 @@ public class Student { ArrayList examScores = new ArrayList<>(); - public Student(String firstName, String lastName, ArrayList examScores) { + public Student(String firstName, String lastName, Double[] testSccores) { this.firstName = firstName; this.lastName = lastName; - this.examScores = examScores; + } @@ -31,4 +31,24 @@ public String getLastName() { public void setLastName(String lastName) { this.lastName = lastName; } + + public Integer getNumberOfExamsTaken(){ + return examScores.size(); + } + + public void getExamScores(ArrayList examScores){ + System.out.println("Exam Scores : \n"); + for(int i = 0; i < examScores.size();i++){ + System.out.println("Exam " + i+1 + " -> " + examScores.get(i)); + } + } + + public void addExamScore(Double examScore){ + examScores.add(examScore); + } + + public void setExamScores(int examNumber, double newScore){ + examScores.set(examNumber,newScore); + + } } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index a9fedec..797be9a 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -1,5 +1,58 @@ package io.zipcoder; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + public class StudentTest { + @Test + public void TestStudentConstructor(){ + Student someStudent = new Student("Bilbo", "Baggins", null); + + String expectedName = "Bilbo"; + String expectedLastName = "Baggins"; + + String actualName = someStudent.getFirstName(); + String actualLastName = someStudent.getLastName(); + + Assert.assertEquals(expectedName,actualName); + Assert.assertEquals(expectedLastName,actualLastName); + } + @Test + public void TestStudentName(){ + Student someStudent = new Student (null,null,null); + + someStudent.setFirstName("Bilbo"); + someStudent.setLastName("Baggins"); + + String expectedName = "Bilbo"; + String expectedLastName = "Baggins"; + + String actualName = someStudent.getFirstName(); + String actualLastName = someStudent.getLastName(); + + Assert.assertEquals(expectedName,actualName); + Assert.assertEquals(expectedLastName,actualLastName); + } + +// @Test +// public void SetExamScore(){ +// Student someStudent = new Student (null,null,null); +// +// Double score = 10.6; +// someStudent.addExamScore(20.); +// someStudent.setExamScores(0,score); +// +// Double expected = 10.6; +// Double actual = someStudent.getExamScores(); +// +// +// } + + } \ No newline at end of file From 1828cfd2e96e7a2f76007e67b71df7be1f94c973 Mon Sep 17 00:00:00 2001 From: michael-doll Date: Wed, 30 Oct 2019 19:46:18 -0400 Subject: [PATCH 3/6] save work --- src/main/java/io/zipcoder/Student.java | 35 ++++++++++--- src/test/java/io/zipcoder/StudentTest.java | 49 +++++++++++++----- target/classes/io/zipcoder/Classroom.class | Bin 0 -> 276 bytes target/classes/io/zipcoder/Student.class | Bin 0 -> 3117 bytes .../io/zipcoder/ClassroomTest.class | Bin 0 -> 288 bytes .../io/zipcoder/StudentTest.class | Bin 0 -> 1743 bytes 6 files changed, 64 insertions(+), 20 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 24f4722..1acf9f4 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -2,17 +2,18 @@ import java.lang.reflect.Array; import java.util.ArrayList; +import java.util.List; public class Student { - String firstName; - String lastName; - ArrayList examScores = new ArrayList<>(); + private String firstName; + private String lastName; + private List examScores = new ArrayList<>(); - public Student(String firstName, String lastName, Double[] testSccores) { + + public Student(String firstName, String lastName, List examScores) { this.firstName = firstName; this.lastName = lastName; - } @@ -36,11 +37,15 @@ public Integer getNumberOfExamsTaken(){ return examScores.size(); } - public void getExamScores(ArrayList examScores){ + public String getExamScores(){ + StringBuilder sbScores = new StringBuilder(); + System.out.println("Exam Scores : \n"); - for(int i = 0; i < examScores.size();i++){ - System.out.println("Exam " + i+1 + " -> " + examScores.get(i)); + for(int i = 0; i < getNumberOfExamsTaken();i++){ +// System.out.println("Exam " + i+1 + " -> " + examScores.get(i)); + sbScores.append("Exam " + i+1 + " -> " + examScores.get(i)); } + return sbScores.toString(); } public void addExamScore(Double examScore){ @@ -49,6 +54,20 @@ public void addExamScore(Double examScore){ public void setExamScores(int examNumber, double newScore){ examScores.set(examNumber,newScore); + } + + public Double getAverageExamScore(){ + Double total = 0.0 ; + for(int i =0; i < getNumberOfExamsTaken();i++){ + total += examScores.get(i); + } + return total/examScores.size(); + } + public String toString(){ + String nameLine = "Student Name : " + getFirstName() + " " + getLastName() + "\n"; + String avgLine = "Average Score : " + getAverageExamScore() + "\n"; + String examLines = getExamScores(); + return nameLine + avgLine + examLines; } } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index 797be9a..1b042a6 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -3,15 +3,19 @@ import org.junit.Assert; import org.junit.Test; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.sql.Array; +import java.sql.SQLOutput; +import java.util.*; +import java.util.logging.ConsoleHandler; +import java.util.logging.Level; +import java.util.logging.Logger; + public class StudentTest { @Test public void TestStudentConstructor(){ + Student someStudent = new Student("Bilbo", "Baggins", null); String expectedName = "Bilbo"; @@ -40,19 +44,40 @@ public void TestStudentName(){ Assert.assertEquals(expectedLastName,actualLastName); } + // @Test // public void SetExamScore(){ -// Student someStudent = new Student (null,null,null); -// -// Double score = 10.6; -// someStudent.addExamScore(20.); -// someStudent.setExamScores(0,score); -// -// Double expected = 10.6; -// Double actual = someStudent.getExamScores(); +// String firstName = "Bilbo"; +// String lastName = "Baggins"; +// Double[] testScores= { 100.0, 95.0, 123.0, 96.0}; +// List examScores = new ArrayList<>(); +// Student someStudent = new Student(firstName, lastName, testScores); // +// examScores = Arrays.asList(examScores); +// System.out.println(); // +// // Assert.assertEquals(expected, actual); // } +// @Test +// public void TestGetExamScores(){ +// Student someStudent = new Student("Bilbo","Baggins",null); +//// someStudent.examScores.add(0.0); +//// System.out.println(someStudent.examScores.size()); +// someStudent.addExamScore(0.); +// someStudent.addExamScore(1.0); +// someStudent.addExamScore(500.); +// System.out.println(someStudent.egetExamScores()); +// } + @Test + public void TestAddExamScore(){ + Student someStudent = new Student("Bilbo", "Baggins",null); + someStudent.addExamScore(13.); + someStudent.setExamScores(1,13.); + Double expected = 13.; + + System.out.println(someStudent.getExamScores()); +// Assert.assertEquals(expected, actual); + } } \ No newline at end of file diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class new file mode 100644 index 0000000000000000000000000000000000000000..e3e3105f62ae6cfc0804ea21349da326cbeab864 GIT binary patch literal 276 zcmZvWy>7xl5QJxqf5347MMBhcK*2TX644-0Sx^wUKbsRAGQQ|+Qt(z(ktlco9x7su zA}V&JPdBqWr@j82F96=r4bi}BfOdcm!T;2SuBL>>aFh_-nOQ4BC)R~p9QLWQUoy?v zd5cXZ^F&%*>wnX&wz?$rV{ODye`lPvVwTIYw8rc|2;s^cY^LVA{-XVuOm^}|MsVQ~ zdQY>2ZoMONS!~2I-Kng?01jVX7jbi#>9Z1d4S3^U(1{HP0n=w29B4A5``becAuGZQ H(?N6t{#`mN literal 0 HcmV?d00001 diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class new file mode 100644 index 0000000000000000000000000000000000000000..d19969638b604f014a8bd1ebecb0703e77990276 GIT binary patch literal 3117 zcmbVO*>V$C5IrMV8d)A2TVNBwB!WPYWgBOKn8kJs2#A8P0THugV=RrufGjD}$Y8P) z60+~>YbsTFO;R8*RHgEer~E;FB~@8Y&x}@^Jfu{<({pbxr%!j^@$Y}%`31lZd>h18 zoK|rr2oFxTV++p8@{BCccHlWYAH)kdr$P^+T@+@K3LqVXfw>@cGID%A08@@H$Z|1& ztQgMAOHP)&ycUAkfEPt7id0fz1yB|j3jth`=j8wv1GpmMOR~JI;uRIIDrlcGizRDH zpEneQ5*PFZeI%>rG9yW=Xy!6|6$G++^*m@?*5{L{e9%2+yy$Lfva>Xp9Xj^2m<+PEL6#ANN77JCoBmW2A zib)G*En`@R>cp>!3@p!;TBRnf-W4E-vkp2-)QZ$WqxxGf&m2;w=MJ)ZrIY$aBgg!k zBF1x;kui$Qzmxi+SFN&QDp2C=g3@etYuz%a`^#pQG>UoB(o+|Y>IIu^Ha3&c)9IQ= z3EW`rHi9J4UhA#qK6F*+nt9dyu!6owJSK*AQ#vUUX3n@|<0R^sg4N7s--1!pGe*r+ zK{MO606r^k=~<2r-B@|21;ryrLt0CLsxM?5$p$MTaRih3axrBbGNt7-x0ANZAZZxJ zYXo5rmEE)ZibZ`uC4@AIkC(hb25b5!UcAK9P-2HJrexhR^W1 z#Qj3Um-tG<*Z79>T}R+h#E@=wVYx0CQ^VsJCDRo4*g}wIF5eC^TWJc@8YVc#Kz{#Rf3+dG@qZzvgX5Du_~+qZHtCM#Azo(+dS7msT*`*yZkR z)(FShs?SY-GuqZ;FZ)TpPUCM7_{XfbWk3~cAk%L=Nc{A z_*@^o1toeHo-?=Ly@|Hy;7$0VLpS07iKkvX%(V|bu3gj*VikXD(2aHI!6V#_I$rQ7 z9^)JR*(elS5*!{|5+q)Jy#b9VL~8&;+;On&h_g{{ccxxN~K_*;Q&ToK6L zm4Vn?HUim1Ae-+2L|79Bc;&c21duS&Nk-b1peneHKr5iF4S+gp%%lw?q9+h4=U)bppRRp zu6dLn{`qZ?Z-T~Ymi6#c9zcM_?PifTvgMBOd7M=g=EKwr;R*gG?HbIuSOb{CKI|vj z1Ju&s`3oTxG38HQa|#aPkef%0R#Hn%01Yl-tp}%C>%4=_zO#W|tyX6Zhw&smDTw1K z*W(E?BcsqQ9ydg8<%AmIL)`Ub~s$B)!RA0!N8YVK&pQ|LTL7k`A4p0vj!hJKv1ua`L1 O;%Q1=VxJ*qw!^>NqK+&8 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..7ab2f4d2570feb13f9e5f82f02268d6285193a6d GIT binary patch literal 1743 zcma)7?Q+{h6g_Lpv1`kTYv%(8O6gbX#7W&kn?h33CUF8y9Vf&g(4UGe%w}vU=%Z8k z%d7AL@WbuE3=hCVF`ShYTZVK7Yi9TE-Fx?(bMH$2>+j$H1n>|qvzW$m8Y>yx%b=D; z0{7MMKn)*f@d+L(>ya8(C!Q@aiN7o!<5T7OObu&Su#P9n`aFvbJWb%g+eYuiaHLvCPR;vXx&q~fv}-@f^EPvx zTFdi0rsW-*uD32QtLDhHZCkGA_-)U21ahw3H=_-Knahq~x^BKcH`|`sX&U{2#hLNS zsPzo1OB_d9UB(nHVj70)g>hM;T5Poyg;X4A54&+sJK@vw&N zbZcimi&BduOvNOGCl-`vv(wpmZS-4h+aa^e1qoHE5y`sk6M-bNE!%h6=B`x5EW~Pb zPX+6k!K^^(k~#{cwq)4ITSv z>Nvomj<0Z(MoY&rzSeP~628&#E%pTFF2PgM$Z#a#;Pi|g5O`dP>57W~E|2fYUacW{ z1JtF`yQa4*or~s7R~G-9#|y!zQI86vHf*}C>5zbK1jfz}>?}KVH_j&{xgI+=@&x$q z82(H=F%qJ}atw%epakDaMeZAcd4C((vw3N~-d_ zuKcm8w|;azv(MMk_9=ZP6vlQP^3wBta!jMoTa{ Date: Thu, 31 Oct 2019 22:22:05 -0400 Subject: [PATCH 4/6] save work --- src/main/java/io/zipcoder/Classroom.java | 19 ++++- src/main/java/io/zipcoder/Student.java | 16 +++-- src/test/java/io/zipcoder/ClassroomTest.java | 33 +++++++++ src/test/java/io/zipcoder/StudentTest.java | 65 +++++++++--------- target/classes/io/zipcoder/Classroom.class | Bin 276 -> 1027 bytes target/classes/io/zipcoder/Student.class | Bin 3117 -> 3220 bytes .../io/zipcoder/ClassroomTest.class | Bin 288 -> 1531 bytes .../io/zipcoder/StudentTest.class | Bin 1743 -> 2434 bytes 8 files changed, 92 insertions(+), 41 deletions(-) diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index 64566f0..bcf9cdc 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -1,4 +1,21 @@ package io.zipcoder; -public class Classroom { +public class Classroom extends Student{ + Student[] students = new Student[0]; + + public Classroom(int maxNumberOfStudents){ } + public Classroom(Student[] students){} + public Classroom(){ this.students = new Student[30]; } + + public Student[] getStudents() { + return students; + } + + public Double getAverageExamScore(){ + double total = 0; + for(int i =0; i < students.length; i++){ + total += super.getAverageExamScore(); + } + return total / students.length; + } } diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index 1acf9f4..59b0d86 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -7,9 +7,9 @@ public class Student { private String firstName; private String lastName; - private List examScores = new ArrayList<>(); - + List examScores = new ArrayList<>(); + public Student(){} public Student(String firstName, String lastName, List examScores) { this.firstName = firstName; @@ -41,9 +41,9 @@ public String getExamScores(){ StringBuilder sbScores = new StringBuilder(); System.out.println("Exam Scores : \n"); - for(int i = 0; i < getNumberOfExamsTaken();i++){ -// System.out.println("Exam " + i+1 + " -> " + examScores.get(i)); - sbScores.append("Exam " + i+1 + " -> " + examScores.get(i)); + for(int i = 0; i < examScores.size();i++){ + + sbScores.append("Exam " + (i + 1) + " -> " + examScores.get(i) + "\n"); } return sbScores.toString(); } @@ -54,19 +54,21 @@ public void addExamScore(Double examScore){ public void setExamScores(int examNumber, double newScore){ examScores.set(examNumber,newScore); + } - public Double getAverageExamScore(){ + public Double getAverageExamScore(){ Double total = 0.0 ; for(int i =0; i < getNumberOfExamsTaken();i++){ total += examScores.get(i); } return total/examScores.size(); } + public String toString(){ String nameLine = "Student Name : " + getFirstName() + " " + getLastName() + "\n"; String avgLine = "Average Score : " + getAverageExamScore() + "\n"; - String examLines = getExamScores(); + String examLines = getExamScores() + "\n"; return nameLine + avgLine + examLines; } diff --git a/src/test/java/io/zipcoder/ClassroomTest.java b/src/test/java/io/zipcoder/ClassroomTest.java index 7bac1ff..f1debcb 100644 --- a/src/test/java/io/zipcoder/ClassroomTest.java +++ b/src/test/java/io/zipcoder/ClassroomTest.java @@ -1,4 +1,37 @@ package io.zipcoder; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; + + public class ClassroomTest { + + @Test + public void TestGetAverageExamScore() { + // : Given + List s1Scores = new ArrayList<>(); + s1Scores.add(100.); + s1Scores.add(150.); +// { 100.0, 150.0 }; + List s2Scores = new ArrayList<>(); + s2Scores.add(225.); + s2Scores.add(25.); +// { 225.0, 25.0 }; + + Student s1 = new Student("student", "one", s1Scores); + Student s2 = new Student("student", "two", s2Scores); + + Student[] students = new Student[2]; + students[0] = s1; + students[1] = s2; + Classroom classroom = new Classroom(students); + + // When + double output = classroom.getAverageExamScore(); + + // Then + System.out.println(output); + } } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index 1b042a6..34f52b5 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -43,41 +43,40 @@ public void TestStudentName(){ Assert.assertEquals(expectedName,actualName); Assert.assertEquals(expectedLastName,actualLastName); } + @Test + public void TestGetExamScore() { + String firstName = "Leon"; + String lastName = "Hunter"; + List examScores = new ArrayList<>(); + Student student = new Student(firstName, lastName, examScores); + student.addExamScore(1.3); + String output = student.getExamScores(); + + System.out.println(output); + } - -// @Test -// public void SetExamScore(){ -// String firstName = "Bilbo"; -// String lastName = "Baggins"; -// Double[] testScores= { 100.0, 95.0, 123.0, 96.0}; -// List examScores = new ArrayList<>(); -// Student someStudent = new Student(firstName, lastName, testScores); -// -// examScores = Arrays.asList(examScores); -// System.out.println(); -// -// // Assert.assertEquals(expected, actual); -// } - -// @Test -// public void TestGetExamScores(){ -// Student someStudent = new Student("Bilbo","Baggins",null); -//// someStudent.examScores.add(0.0); -//// System.out.println(someStudent.examScores.size()); -// someStudent.addExamScore(0.); -// someStudent.addExamScore(1.0); -// someStudent.addExamScore(500.); -// System.out.println(someStudent.egetExamScores()); -// } + @Test + public void setExamScores() { + String firstName = "Leon"; + String lastName = "Hunter"; + List examScores = new ArrayList<>(); + Student student = new Student(firstName, lastName, examScores); + student.addExamScore(1.3); + student.addExamScore(99.); + String output = student.getExamScores(); + + System.out.println(output); + } @Test - public void TestAddExamScore(){ - Student someStudent = new Student("Bilbo", "Baggins",null); - someStudent.addExamScore(13.); - someStudent.setExamScores(1,13.); - Double expected = 13.; - - System.out.println(someStudent.getExamScores()); -// Assert.assertEquals(expected, actual); + public void testToString() { + String firstName = "Leon"; + String lastName = "Hunter"; + List examScores = new ArrayList<>(); + Student student = new Student(firstName, lastName, examScores); + student.addExamScore(1.3); + student.addExamScore(99.); + + System.out.println(student.toString()); } } \ No newline at end of file diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class index e3e3105f62ae6cfc0804ea21349da326cbeab864..2c548081cd1dbec2dfccdb19af7b8b899b242f76 100644 GIT binary patch literal 1027 zcmb7DO^?!06g{s6%0OWd5N1@y8NVoKWaCaVi5WDIptHcRarFi|SOq#Mg-l$V%>QuX zRujKs;`{)Aia)``kMr6F(cr=~z3<)o?mhS1^V%;zKAi%%g&QeoxM*N|4F-0Ub18+( zxT4He1J?wSQ-3zFC;n8R^tj`=jpxo$-yPUqqZ=OF7D(K2CXT-=5VP8~9+y2P2&{LU ziT!XkKCrz<@?gYBzT@`gs3$!~`B5ziT$E+Uf!}VdCAn?a85i?^uqzeb*!5qE+iWm2=q`$;q(MbZ4YZ zM#2$@`>roX+&2X>U0?Q}J&;GyNU5$n^ZNFEM-81_%yLsfnMk3?ek-Ijk;IybGBylU zO<1UzsN=f8+2!N~oIvhxZX9?JknG9PjJ+uW=^1n7?H>}zYOWXvJG_03AB5mb3bb+V zQ%KXA^x8aC=b8Ekh`Rn6+B@iP7|@WR%|fS5AjZe!nx$6?3$TtHJ(l7O@`O{ch5vyy zB3R=eu!?U8TZ~{^Y^^3KEwioXwpPxsD%5!WE%evigtI4t zV0x)Iz9{BJM#U#V6QGuD>AMw$aQYI3DhbBkBi?Vl(8a5tU#r2viTe==)j$u#E%7cu yNR2`&5zAaFlu(Jh&72rE`Q(Eus70+cRB;aH+57^t_*;KROc&n*Iu%AVZ2bbmceeWg delta 144 zcmZqXn8KuV>ff$?3=9k=3<6vX%nZEj41DYi{EQ52Hko;uC3cJq%o-D;gC{32$}zJr zuufjbs2b^?l$DxX!l1~&1k?Zmj6evK1d?n(o<5k*z`&}toq=&9P=JYn9Z0ePg&BYv YIDjM%n9a(-$-o8VF*0xiNhSs!0FGG@Jpcdz diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class index d19969638b604f014a8bd1ebecb0703e77990276..675c0e330944c12b93ff010850aa39da1b28ae99 100644 GIT binary patch delta 1241 zcmYjPTTfJ16#n)(XL8OQkATMu2-7m&0?Z8J4aKowp#zGJ_bc8<9Px%ID%x6|q#-f! z(pI;c_-2gJ2h*gMI*J&Pwo{jUfl;C3?ZZkFx*d;G*n5i@9XuvW>#c zCsz%#ULRMRbhAp2yjB~OI;cH!L=EY;W>(GDldV%-X@yAVgkm#xKPiRy#@JW-?|y|S zp}E<=Fv<6dm~6Jj5`V)Qg{|-a>125CmlaVSvknwd;ZLC}Ik8dr28x*KPh+Hr>9jkB z4fXi{u_RCWezZDQOGP#k@pdc-7{=MvM+V=covN{a$kpN0I`9M0Wdg3oC-^ox)yE*# zg;gQ$46CHh69CCk%+NJ%Q{8HG^Il;M)`oeT$Be?bnfHptaxKNo8YJ_>40=g4I*)}#)s0M=N*AF4T zBLxv)aD0H@$kd7`e9PUhEgj%u$M&-tokeHbRm@)TDi7Y8o{ zjewvZKx delta 1155 zcmYjPSx*yD7(I8UWv0W3Wn4guh+8bQxS~~7#R4uB#0A_H!5st?6xSw(#Kc`Mn&_i3 z(Zrajm?|2LF~&syfiM08T%q}3AGNGIBDXPa!)IB#=uzv=WaZ@sKvta zyU3S6L`YP~m}nk;FPemCla4+t`s7DFA(C>OucvmYjY?G6xPEYrQ+2DT|Fb^K-YiaB3-#h%xpCe?JQJSZr7$p#hP+<*GWYaIj9C_C`J++KEn=vq% zs3>#~wTL;MD$C4reF>JzUUQYs!{r;s6>dCU<^&e$oKDsUYLn!_9dp^|6@2Uhw7f=O z%L`bEXUKN!6vpUP1tlruq%ig#ViB+E1XIW@NWt;(cg8U&c@AH}2*ztjVL}QMnQ9%> z#DhN{B8;A}vyOQ#-z?ffjZQCgT%Q@?Xwl5$O!Uek2SZZ0V`P-ScTOdZaoL~5f@arQ1~VC zM=(i8>r>`5m#TWpz!Hq5a9^#w{psWXdBj1TJ*5Fe=tW_<3F>Z55m(2aV8~PZ}Aa48D+zP;pNvKQrsxasLTr z7-*(Y#U#t8>QR2q5tIPCGk41S%;i;2;o=mg{i(_?qTwAT6B*#Nba6UwI#XQBjWZfO z07uG=@-IzqRP&@2b=(72AdEP_I^ITuJ4#8Kh&Mo(ns2~t(u|`38|i68<^{2duFiCe H+pzU7=EJ*+ diff --git a/target/test-classes/io/zipcoder/ClassroomTest.class b/target/test-classes/io/zipcoder/ClassroomTest.class index 94b5da55a312f0b8571ebb6b1f3763ffdf71058d..f3d1aa85a7d18d80a1ad0b54ea7685643f2899d7 100644 GIT binary patch literal 1531 zcmZ`(ZBr9h6n^fK?1s1#Xb3NQ2P==35|_*##xeWx=ga0*%uW3 ztl#v%*bh+4wA0W2D97h+LP#o2X70V`+;g7$oadgs@819Q4}fd3PU!p4r}ZJRrFdeQ~AV%AHhXG^>7 zj0L~jzQEan?HbSQW`(()u~s*I-*er@w&e$Tfl)c%v4Yh-%QI`%t*2(ASaCgKCj8lG zMTo(|uDNF#VPMydf*s{0{JG;@#h(=z?m49xgjLIt_=-O#p;|VfMjri7V1MP98AhJyMq8?6(G9(db=!^<@34})SEN2V&f=WF(1}*7o@ee$!8H7+<0lj} z+|{vxO-6NJN?R@gtt}KU+;uDoc#q5AiA#aI6FP^>ko!8eP}H%FpEZ*Y7Moc4BHg|TdO0TOW6glmg_0Zb!N$zl&dL&>JGnF%2mQeWcg^wp8|f2ILGlkErYY* z9G^ObcoS`3;HXB2mJwLSO5S3 delta 131 zcmey(y?{yd)W2Q(7#J8#7zDT&m>GE48Ti;4_$OAROlD_NVq;-oWn_??ctCRUH74O; z21N!Ypc)Wh1VW%BkYoe$^uc@v23D=@42&Cr0!$3-K#~n8%mCED0VH|AY*q$N1}-3v Mk%1dXGBNM~04=x;aR2}S diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class index 7ab2f4d2570feb13f9e5f82f02268d6285193a6d..91ccf7234d4f09cb7d5833332d6c76c39f91dfd6 100644 GIT binary patch literal 2434 zcmb7^X;a%)6oy}U!N$no*g#?^U4XC|aGJ6tW?!=jL&DO~bQ894#Ml;<!_{5RJ?DMSInwX{y!i#d6!aK+kc(h0iuouOVhCVS z3`=5Ij$s9>VzwrR^(Z!?*o@#_3~}UImj3=jJb%V;9}k4VLoqyRg@UaZ^4M-!e)=1u z0Ahb9g2xd&ky;zT+*6Or+({}%K`kGsrY_d* zX2^Q3*CeDB-N=5gpB8x6%=sv&?$IGE50=HKU@r2NJrj za>47e_VQFKSXwc!R%{g~>I*enR;wk(G4*PRHi>f^MXgzmT}&-lb+zm)+MPx7H2tJr zwe*U1px1Q5tW>LprCK`G(V1eHrR+(aNy)kh9XZ-CtVU^yGGqCXq&pIYQk5nN#R{aFFufvx}u;G!mE1u$dC|ORZAtk zS`)^*GWM`9;{f{+d@kcD4rP3SXEMITGxn3B8CAmFXT~*FJ=H{5F-`SMq#=T@WPFWp zWPA$>I1-);GK$b5IF?Zo&Yojm!u2auiAs>ec57#1`{;xXBVl&LmmarQ-nG-Li1-HN zl4fl-tJyg+difsvmsZV|N;JD>rB>5S3XoNMvhf`ok!2Y6>v2TR`TV*&c6=7l7r)DY z(FGA^Z8Y-=XK!k1g)Qk+{o*$DoeHBe+aqeZ?TJs2<}Xk@Es#Vna_r+O z%eTaLcWbwaZi22RX-!tOOmZUlMFV{ znn{Klh`lez7=Qerx;AF!8ns=gsvbt}qmlt?7-i%v<4$A3$1~&dwDHv8>G62_Je~oM zXY?IB6CTg6F3)tbO-agIZxKIyh4#Fl%ZyL3GPzJX)QOJQxYj^2O~h0#{1ZCU;Rd=y zS%P-yowD5G>QkoeHk;rx;!F{0nh>*`-SJ^eyBI-QP7<2GB*JDn3-IPJZqZAS_j`Fh z$g+&1mHtForWjGQmSZ(dtBZx2@xcCa!Is|>tP|b;!8k+}z&v9vQ12o&EK%b!8CR%y zm6Yq;+3;~Ldz=d%XU^li?QssdoU>PO3aiVUvmWQq$K`MI9fI@gW%> tkx?Pz78&!@v4c50w)v)%C#p1*8;2P_!3b)OLqNQH-Dxy)e-i zFzKc5V1g#qXyOBS<0JSc#x

df{BG`DbSR^Q~EXzYhNhR=@xH@(mcL>?cCb;k1u4 zKJtD{Msyg};jEuA#aXR)1>_FGRVb zxJp4WPr+e9vB)*W5=F%_MTe4Ng;m9M))Y5bci2$ePb76?v_2Tte}JA5>->%#OaZh z!3oJVCHJm9ZFJY)+3B**nh_7=T3JC7^m0Aj)P? z+?sl-$w;*rJ>ErORK59Ee;5-jMu2RK5pOek+l+xWBl90d`j8>KH^TSGJo**09P)%L z;}do%8zJzSV1tgV6?sme!O_E=l@D}g8yss8IuMtM?pVC}{$*j6=#p=iV3ibWjIiG9 bqJFm!+Wi@9)t(~25E;4U-wx Date: Tue, 5 Nov 2019 15:39:40 -0500 Subject: [PATCH 5/6] save work --- src/main/java/io/zipcoder/Classroom.java | 42 +++++++++--- src/main/java/io/zipcoder/Student.java | 14 ++-- src/test/java/io/zipcoder/ClassroomTest.java | 60 +++++++++++++----- src/test/java/io/zipcoder/StudentTest.java | 26 ++++---- target/classes/io/zipcoder/Classroom.class | Bin 1027 -> 2029 bytes target/classes/io/zipcoder/Student.class | Bin 3220 -> 3199 bytes .../io/zipcoder/ClassroomTest.class | Bin 1531 -> 1684 bytes .../io/zipcoder/StudentTest.class | Bin 2434 -> 2335 bytes 8 files changed, 101 insertions(+), 41 deletions(-) diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index bcf9cdc..64f9dbb 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -1,21 +1,47 @@ package io.zipcoder; +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class Classroom extends Student{ - Student[] students = new Student[0]; - public Classroom(int maxNumberOfStudents){ } - public Classroom(Student[] students){} +// Student[]students = new Student[30]; + Student[] students; + + + public Classroom(int maxNumberOfStudents){this.students = new Student[maxNumberOfStudents];} + public Classroom(Student[] students){this.students = students;} public Classroom(){ this.students = new Student[30]; } public Student[] getStudents() { return students; } - public Double getAverageExamScore(){ + public Double getAverageExamScore() { double total = 0; - for(int i =0; i < students.length; i++){ - total += super.getAverageExamScore(); - } - return total / students.length; + for (int i = 0; i < students.length; i++) { + total += students[i].getAverageExamScore(); + } + return total / students.length; } + public Student[] addStudent(Student student){ + List studentList = Arrays.asList(students); + studentList.add(student); + return (Student[]) studentList.toArray(); + } + + public Student[] removeStudent(String firstName, String lastName){ + List studentList = Arrays.asList(students); + for(int i =0; i < students.length; i++){ + if(students[i].getFirstName().equals(firstName) && students[i].getLastName().equals(lastName)) { + studentList.remove(i); + } + } + return (Student[])studentList.toArray(); + } + public Student[] getStudentByScore(){ + + } } diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index 59b0d86..9b1ac15 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -2,18 +2,22 @@ import java.lang.reflect.Array; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class Student { private String firstName; private String lastName; - List examScores = new ArrayList<>(); + List examScores; public Student(){} - public Student(String firstName, String lastName, List examScores) { + + public Student (String firstName, String lastName, Double[] testScores ){ this.firstName = firstName; this.lastName = lastName; + this.examScores = new ArrayList<>(Arrays.asList(testScores)); + } @@ -57,14 +61,16 @@ public void setExamScores(int examNumber, double newScore){ } - public Double getAverageExamScore(){ + public Double getAverageExamScore(){ Double total = 0.0 ; - for(int i =0; i < getNumberOfExamsTaken();i++){ + for(int i =0; i < examScores.size();i++){ total += examScores.get(i); } return total/examScores.size(); } +// public void takeExam(Double examScore){examScores.add(examScore);} + public String toString(){ String nameLine = "Student Name : " + getFirstName() + " " + getLastName() + "\n"; String avgLine = "Average Score : " + getAverageExamScore() + "\n"; diff --git a/src/test/java/io/zipcoder/ClassroomTest.java b/src/test/java/io/zipcoder/ClassroomTest.java index f1debcb..a7e1af1 100644 --- a/src/test/java/io/zipcoder/ClassroomTest.java +++ b/src/test/java/io/zipcoder/ClassroomTest.java @@ -1,5 +1,6 @@ package io.zipcoder; +import org.junit.Assert; import org.junit.Test; import java.util.ArrayList; @@ -8,24 +9,52 @@ public class ClassroomTest { +// @Test +// public void TestGetAverageExamScore() { +// // : Given +// List s1Scores = new ArrayList<>(); +// List s2Scores = new ArrayList<>(); +// +// +// Student s1 = new Student("student", "one", s1Scores); +// s1Scores.add(100.); +// s1Scores.add(150.); +// s1.addExamScore(100.); +//// { 100.0, 150.0 }; +// Student s2 = new Student("student", "two", s2Scores); +// s2Scores.add(225.); +// s2Scores.add(25.); +//// { 225.0, 25.0 }; +// +// +// Student[] students = new Student[2]; +// students[0] = s1; +// students[1] = s2; +// Classroom classroom = new Classroom(students); +// +// // When +// double output = classroom.getAverageExamScore(); +// +// // Then +// System.out.println(output); +// } @Test - public void TestGetAverageExamScore() { - // : Given - List s1Scores = new ArrayList<>(); - s1Scores.add(100.); - s1Scores.add(150.); -// { 100.0, 150.0 }; - List s2Scores = new ArrayList<>(); - s2Scores.add(225.); - s2Scores.add(25.); -// { 225.0, 25.0 }; - - Student s1 = new Student("student", "one", s1Scores); + public void TestClassroom() { + Classroom classroom = new Classroom(20); + Integer expected = 20; + Integer actual = classroom.students.length; + Assert.assertEquals(expected, actual); + } + + @Test + public void TestGetAverageExamScore() { + Double[] s1Scores = {100.0, 150.0}; + Double[] s2Scores = {225.0, 25.0}; + + Student s1 = new Student("student", "one",s1Scores); Student s2 = new Student("student", "two", s2Scores); - Student[] students = new Student[2]; - students[0] = s1; - students[1] = s2; + Student[] students = {s1,s2}; Classroom classroom = new Classroom(students); // When @@ -34,4 +63,5 @@ public void TestGetAverageExamScore() { // Then System.out.println(output); } + } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index 34f52b5..7e9dfb6 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -15,11 +15,11 @@ public class StudentTest { @Test public void TestStudentConstructor(){ - - Student someStudent = new Student("Bilbo", "Baggins", null); - String expectedName = "Bilbo"; String expectedLastName = "Baggins"; + Double [] testScores = {10.,15.}; + + Student someStudent = new Student("Bilbo", "Baggins", testScores); String actualName = someStudent.getFirstName(); String actualLastName = someStudent.getLastName(); @@ -29,13 +29,15 @@ public void TestStudentConstructor(){ } @Test public void TestStudentName(){ - Student someStudent = new Student (null,null,null); + String expectedName = "Bilbo"; + String expectedLastName = "Baggins"; + Double [] testScores = {10.,15.}; + + Student someStudent = new Student(null, null, testScores); someStudent.setFirstName("Bilbo"); someStudent.setLastName("Baggins"); - String expectedName = "Bilbo"; - String expectedLastName = "Baggins"; String actualName = someStudent.getFirstName(); String actualLastName = someStudent.getLastName(); @@ -47,9 +49,8 @@ public void TestStudentName(){ public void TestGetExamScore() { String firstName = "Leon"; String lastName = "Hunter"; - List examScores = new ArrayList<>(); + Double[] examScores ={1.3,1.2}; Student student = new Student(firstName, lastName, examScores); - student.addExamScore(1.3); String output = student.getExamScores(); System.out.println(output); @@ -59,10 +60,9 @@ public void TestGetExamScore() { public void setExamScores() { String firstName = "Leon"; String lastName = "Hunter"; - List examScores = new ArrayList<>(); + Double[] examScores = {1.3,99.}; Student student = new Student(firstName, lastName, examScores); - student.addExamScore(1.3); - student.addExamScore(99.); + String output = student.getExamScores(); System.out.println(output); @@ -72,10 +72,8 @@ public void setExamScores() { public void testToString() { String firstName = "Leon"; String lastName = "Hunter"; - List examScores = new ArrayList<>(); + Double[] examScores = {1.3,99.}; Student student = new Student(firstName, lastName, examScores); - student.addExamScore(1.3); - student.addExamScore(99.); System.out.println(student.toString()); } diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class index 2c548081cd1dbec2dfccdb19af7b8b899b242f76..7ba51efdab025ca79f7a70327c968bacaf5a205e 100644 GIT binary patch literal 2029 zcmZ`)QBxaL6#i~@VMDSBDKvq$fUQ~y5E`wqtp;N$6u|~i(^9ohOS0hBB#WC3)B4;Q zU;G2U`r@n3C>CdAeC+rmeDhCqrs{X^E=g$93Auakx#xW6JKs53{`&X#BLD^5iy?w{ z3|tw)Fs{nOwHV&TdvYnpuz>gDDB%OSTsLq^IxNO;150wZEX_9!tO!I~e!FHj{gy!H zUfFT;-#B|!w`P0!N^nsW7+i3gj$abcvuiV3d@RvHV7Tlw?TvP0+xBi-+jUw-%5K%F zZ&{ur&!JKGzjTN`b^?5oy2K+OQr3Fq=DJQu>QEfiv0ulq3l)E7$n0?RR6w zvorkzn1qgt`?hE8+BY9qjY`$^NcePirhMPpxAJwXxtm{h+oVlK!VwtoUEiv6zbufb z_*V6+b!#syDQ4AbVOD|p?1{>bWqTR~$Jt$<8obl7S{hFu{iPnMD&RoHFqW&Kp=Yv4)RK+(OyFx`_>J z657Pa_{7AgsF=8oI|jB)+?AHkaL2^w_=2kU0(VlAhGN~3nZkF=2quG_si_g!vg&OT z=Lm8*jD309+#zyyx$igyKni)$^Q?!Q?m?>+boU}hyqjlp`@UWEiy=yf3;U&UYr_BV*xbAKT6E3}_!h#<{%Pz5HD;XV^MVhrOv zF$8CDmiH3wTnJYR;bIDIt`F954_2&$6;tE_tceio8nGnpq{2!~_2-sScxK=k;t5P* zDn!ZiDNzPye}VQBH@$_8_5=@ff;rb=@ORMp0WKw1wbG2CA!% zH1Xqq|0v_px9(#M$}F0aFM|Q@$Cz_m$u+^}s}xJhd7eHxXXAk03{%*T~>? zTKR9{8FWoNWk~`T@kYq3O-vc3NIizJo|`*FG=jUiLktQ0i5UO7M3TyR3Q_)OQ%rqK zfB<1yxtm6o@KI8q!7LNZF@aPzu;ggrYnDWV(fONaSzblTK?)n%6+NwoA{FE_ty84< z+yTt*1ER{1$SH$4pVkkNB;`js1$;999C2MKc$OmwDiLMvX;y!gB(HP7LV~i00x85% zR4U3&RXXKVkjI;(Ds69Z7a_(iRhZUOn6%_5j?_8QuX zRujKs;`{)Aia)``kMr6F(cr=~z3<)o?mhS1^V%;zKAi%%g&QeoxM*N|4F-0Ub18+( zxT4He1J?wSQ-3zFC;n8R^tj`=jpxo$-yPUqqZ=OF7D(K2CXT-=5VP8~9+y2P2&{LU ziT!XkKCrz<@?gYBzT@`gs3$!~`B5ziT$E+Uf!}VdCAn?a85i?^uqzeb*!5qE+iWm2=q`$;q(MbZ4YZ zM#2$@`>roX+&2X>U0?Q}J&;GyNU5$n^ZNFEM-81_%yLsfnMk3?ek-Ijk;IybGBylU zO<1UzsN=f8+2!N~oIvhxZX9?JknG9PjJ+uW=^1n7?H>}zYOWXvJG_03AB5mb3bb+V zQ%KXA^x8aC=b8Ekh`Rn6+B@iP7|@WR%|fS5AjZe!nx$6?3$TtHJ(l7O@`O{ch5vyy zB3R=eu!?U8TZ~{^Y^^3KEwioXwpPxsD%5!WE%evigtI4t zV0x)Iz9{BJM#U#V6QGuD>AMw$aQYI3DhbBkBi?Vl(8a5tU#r2viTe==)j$u#E%7cu yNR2`&5zAaFlu(Jh&72rE`Q(Eus70+cRB;aH+57^t_*;KROc&n*Iu%AVZ2bbmceeWg diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class index 675c0e330944c12b93ff010850aa39da1b28ae99..f454643ceccab27c28dfee9adaeb51c42771450f 100644 GIT binary patch literal 3199 zcmZ`*TUQfT6#gawCWJvT2o^<*)=K~pTWwXKv}mNI2C&9rm0lde5Jy8olL=mWZ*A@U zes7=p(7v`^ic;6AedthE>gC%rC&?txhs-&%&%S*7+k2nMAOHOFD}ep@HjM3f zq7irFv^>t}m=5DfJQYSAo)*b7O*jiPj2WbK%!UybZ3}ZDq{BD|JB0HhydaNE2=k(z zm6u!y3$i{dl6)AOP>`J?yP}T85H5!4|56B-WxW!@bFw}!j~8^jsN*FKjdOOs;7pkF zmWD{;yt!!hXUuH6Kk4M{YGd(H8X&v!gmoXJ>&!!&6ava_}`tRWcdp3+cvBsWXrwFx_GO%&&6to%unssb&S zGBZ-jg_Gt5E6c>I zB93JpD{bYOcr*1yuLNJSHE3fjWnrcy>R18waM8|?KQT`_X6nMYx!}^wo@A=#>}=Vi z1ooNxNNX%NNOdzQ6}o0#Wj`!keQYf5vMq*QiiDZ9F1k30I=&u9kj#{s(GW5})s6rO0ZZHc%nT8!P|5SMvgKC8Qw@Qaj(=!*g0! zu&=O$yiM5e>ndrh;b8q2%}mjnoYT-A8}korWqf>WB`+5oYo7jcMIvtVx}M1&=jG_I zyDW2_1LL(swV06>L@C2LZ7>%WtSrZ<&p$WnhVWzXM3qVGtcF;79OPukFjnQEh^z@# zO|S2UuLKKn#%o5qWOYX5aX-@Xzy&$c8g|9Td^bYLY^8|z+^l=~Pe~QrI>oV--=ppP zRt6D}IpZ!MqsA37O3={b%6egN&vE2)4<-FvHLmqNH=+IHs`T^O;0l|umwPdw0`9@R zT*Y`FpJKeo&u<;qE-~)uy@5c_?i&d9+(zB$zFVljiG~}{D_+~_1!$qoIy54JHE6|V zw7F4wJWnbLeY$B#`FHiZkOw!-P0>PMY21_Y@|*tNMM}!H1Ok~{C}_LA6-M&iE7Tbk-Uu+et*LzzNbXb z<@V3gv0M6UIUZD)_9k$I{d5@X$x&fwPmw__Nx{k-laxc;H zd#N!0&K!i3e5oZmr4N>{nMV`x~FY29b^>xa)I-~hEpUH$0GsTwO{Pppt zI>{URh>PGDue=2NWgOFFRC4ofm%Pd-#yTe5xry^0JIP&unj7#qcXGQ-(Sj}V9~DZQ Ad;kCd literal 3220 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 diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class index 91ccf7234d4f09cb7d5833332d6c76c39f91dfd6..c70a617be1475489fdd7d0ee52f45ff0bc5a52b7 100644 GIT binary patch literal 2335 zcmcIkT~`}b6y1}LNeBbP0b0^xEfpatlvF-y2`%5Dv`nD|M6g;N!Vrg*WNY-up z>W39tRLv^sl|9`y#ojl@oG;9}gp6id`LE5>63^QC9j9?*)SO+T?#xLzCuZNYV%6%7 z-6%PhEkQA!o*E^`INH>!Zu}GdiJq_MwK5~vX06P_>86jS*B#F<<%oDC%Ql#}_mLK! zTD2NP##5bjt7`ZuCG@ugN3WD#avFNYi`wmN!ZexfM$Iv+#-3R>8Fi^vvmD(qNr0#{ z%P!|n8mwF1XW7%j(uW#CN&K^L3U=`! zOWH>JInY6QK`vKh95&xISaAEK1Nkpe?_ z9%Em^`8Eketq4AZv~_sG-XPv5dZl4(9aF~aYObBwg=~w}Z=6>xZTduXyHYlswNRA4 zY-@_33p?o*c1AiBf2m$KY@$?jcTxP3{X~IATOoN&=2{^67B@eoZOPx?deBcV+&bwN z0_Y-~psPeXhGpCNs_qz7-evZV=zRAL>-~WDiI>ne^eQ{Qw~d*lJ{3+CikNi#=E4x( z<`+slG9=MS9EZ5ebCx*AuReqH9TyQ?@tuHfyvw!XIbay?aVKGfha>Lc7lAPlz2v`w)MQ#Lhvi4@t4u{1K@GHKInZJws<9mWiD~Da6IpRglLrbnYI{$Q;A$ zBj{jM6;bpOZXcna!x#oIi410O5epbZkye3j-9zA`i(&<%$P%TDMdY}O&@YFpJRjx% zBF1rz-{eU~o#5Lz<8`qJS^8gRG*O)QIZO0tvi#j=x&5y!C8^0#jhvw;6H}vSNWTf= z33M{+Wnvs6hAYH8Ow=R9G>Q+1exBHiM7}}P4~aKqz8x^%3YcpF^BJFcjuwyke89Z; z8s<|0^KZ#qCaziaElpJeeS4ew_6PcojW?N};d~+fJq9xIGh{+ZFS#;JlHe3WPLtpa zA>AOsoBYkXgyy|u0ihf8^Q4@jwFo34~E3po46G%oyC8n+2R zfL$OB(Phg7u}Tod|A9s!pz#gWh*OQ3*QoI-4Iu;X+2Bh`TyU#=mlW=CwLuD^T{c!_{5RJ?DMSInwX{y!i#d6!aK+kc(h0iuouOVhCVS z3`=5Ij$s9>VzwrR^(Z!?*o@#_3~}UImj3=jJb%V;9}k4VLoqyRg@UaZ^4M-!e)=1u z0Ahb9g2xd&ky;zT+*6Or+({}%K`kGsrY_d* zX2^Q3*CeDB-N=5gpB8x6%=sv&?$IGE50=HKU@r2NJrj za>47e_VQFKSXwc!R%{g~>I*enR;wk(G4*PRHi>f^MXgzmT}&-lb+zm)+MPx7H2tJr zwe*U1px1Q5tW>LprCK`G(V1eHrR+(aNy)kh9XZ-CtVU^yGGqCXq&pIYQk5nN#R{aFFufvx}u;G!mE1u$dC|ORZAtk zS`)^*GWM`9;{f{+d@kcD4rP3SXEMITGxn3B8CAmFXT~*FJ=H{5F-`SMq#=T@WPFWp zWPA$>I1-);GK$b5IF?Zo&Yojm!u2auiAs>ec57#1`{;xXBVl&LmmarQ-nG-Li1-HN zl4fl-tJyg+difsvmsZV|N;JD>rB>5S3XoNMvhf`ok!2Y6>v2TR`TV*&c6=7l7r)DY z(FGA^Z8Y-=XK!k1g)Qk+{o*$DoeHBe+aqeZ?TJs2<}Xk@Es#Vna_r+O z%eTaLcWbwaZi22RX-!tOOmZUlMFV{ znn{Klh`lez7=Qerx;AF!8ns=gsvbt}qmlt?7-i%v<4$A3$1~&dwDHv8>G62_Je~oM zXY?IB6CTg6F3)tbO-agIZxKIyh4#Fl%ZyL3GPzJX)QOJQxYj^2O~h0#{1ZCU;Rd=y zS%P-yowD5G>QkoeHk;rx;!F{0nh>*`-SJ^eyBI-QP7<2GB*JDn3-IPJZqZAS_j`Fh z$g+&1mHtForWjGQmSZ(dtBZx2@xcCa!Is|>tP|b;!8k+}z&v9vQ12o&EK%b!8CR%y zm6Yq;+3;~Ldz=d%XU^li?QssdoU>PO3aiVUvmWQq$K`MI9fI@gW%> tkx?Pz78&!@v4c50w)v)%C Date: Tue, 5 Nov 2019 17:08:39 -0500 Subject: [PATCH 6/6] save work, need to polish getGradeBook and test further --- src/main/java/io/zipcoder/Classroom.java | 30 ++++++-- .../java/io/zipcoder/ScoreComparator.java | 24 +++++++ src/main/java/io/zipcoder/Student.java | 2 +- src/main/java/io/zipcoder/StudentSorter.java | 27 +++++++ src/test/java/io/zipcoder/ClassroomTest.java | 67 ++++++++++-------- target/classes/io/zipcoder/Classroom.class | Bin 2029 -> 3242 bytes .../classes/io/zipcoder/ScoreComparator.class | Bin 0 -> 952 bytes .../classes/io/zipcoder/StudentSorter.class | Bin 0 -> 1607 bytes .../io/zipcoder/ClassroomTest.class | Bin 1684 -> 3050 bytes 9 files changed, 115 insertions(+), 35 deletions(-) create mode 100644 src/main/java/io/zipcoder/ScoreComparator.java create mode 100644 src/main/java/io/zipcoder/StudentSorter.java create mode 100644 target/classes/io/zipcoder/ScoreComparator.class create mode 100644 target/classes/io/zipcoder/StudentSorter.class diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index 64f9dbb..5fffeae 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -1,13 +1,10 @@ package io.zipcoder; import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; public class Classroom extends Student{ -// Student[]students = new Student[30]; Student[] students; @@ -42,6 +39,29 @@ public Student[] removeStudent(String firstName, String lastName){ return (Student[])studentList.toArray(); } public Student[] getStudentByScore(){ - + StudentSorter itemSorter = new StudentSorter(students); + Comparator comparator = new ScoreComparator(); + return itemSorter.sort(comparator); + } +//******Correct this to meet requirements ****** + public Map getGradeBook(){ + Map gradeBook= new HashMap<>(); + Student[] sortedStudents =getStudentByScore(); + for(int i =0; i < sortedStudents.length; i++){ + if(sortedStudents[i].getAverageExamScore() <=50){ + gradeBook.put('F',sortedStudents[i]); + }else if(sortedStudents[i].getAverageExamScore() <=60) { + gradeBook.put('E', sortedStudents[i]); + }else if(sortedStudents[i].getAverageExamScore() <=65) { + gradeBook.put('D', sortedStudents[i]); + }else if(sortedStudents[i].getAverageExamScore() <=70) { + gradeBook.put('C', sortedStudents[i]); + }else if(sortedStudents[i].getAverageExamScore() <=90) { + gradeBook.put('B', sortedStudents[i]); + } else { + gradeBook.put('A', sortedStudents[i]); + } + } + return gradeBook; } } diff --git a/src/main/java/io/zipcoder/ScoreComparator.java b/src/main/java/io/zipcoder/ScoreComparator.java new file mode 100644 index 0000000..934b149 --- /dev/null +++ b/src/main/java/io/zipcoder/ScoreComparator.java @@ -0,0 +1,24 @@ +package io.zipcoder; + +import java.util.Comparator; + + + public class ScoreComparator implements Comparator { + public int compare(Student o1, Student o2) { +// if(o1.getAverageExamScore() < o2.getAverageExamScore()){ +// return -1; +// }else if(o1.getAverageExamScore().equals(o2.getAverageExamScore())){ +// return 0; +// }else{ +// return 1; +// } + if(o1.getAverageExamScore() > o2.getAverageExamScore()){ + return -1; + }else if(o1.getAverageExamScore().equals(o2.getAverageExamScore())){ + return 0; + }else{ + return 1; + } + + } + } diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index 9b1ac15..4f45386 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.List; -public class Student { +public class Student{ private String firstName; private String lastName; List examScores; diff --git a/src/main/java/io/zipcoder/StudentSorter.java b/src/main/java/io/zipcoder/StudentSorter.java new file mode 100644 index 0000000..80e3438 --- /dev/null +++ b/src/main/java/io/zipcoder/StudentSorter.java @@ -0,0 +1,27 @@ +package io.zipcoder; + +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +public class StudentSorter implements Comparator { + List studentList; // + + public StudentSorter(Student[] students) { + this.studentList = Arrays.asList(students);// + } + + public Student[] sort(Comparator comparator) { + Collections.sort(studentList, comparator);// + return (Student[]) studentList.toArray();// + } + + public int compare(Student o1, Student o2) { + return 0; + } + + public boolean equals(Student obj) { + return false; + } +} diff --git a/src/test/java/io/zipcoder/ClassroomTest.java b/src/test/java/io/zipcoder/ClassroomTest.java index a7e1af1..4eb5b3d 100644 --- a/src/test/java/io/zipcoder/ClassroomTest.java +++ b/src/test/java/io/zipcoder/ClassroomTest.java @@ -5,39 +5,11 @@ import java.util.ArrayList; import java.util.List; +import java.util.Map; public class ClassroomTest { -// @Test -// public void TestGetAverageExamScore() { -// // : Given -// List s1Scores = new ArrayList<>(); -// List s2Scores = new ArrayList<>(); -// -// -// Student s1 = new Student("student", "one", s1Scores); -// s1Scores.add(100.); -// s1Scores.add(150.); -// s1.addExamScore(100.); -//// { 100.0, 150.0 }; -// Student s2 = new Student("student", "two", s2Scores); -// s2Scores.add(225.); -// s2Scores.add(25.); -//// { 225.0, 25.0 }; -// -// -// Student[] students = new Student[2]; -// students[0] = s1; -// students[1] = s2; -// Classroom classroom = new Classroom(students); -// -// // When -// double output = classroom.getAverageExamScore(); -// -// // Then -// System.out.println(output); -// } @Test public void TestClassroom() { Classroom classroom = new Classroom(20); @@ -63,5 +35,42 @@ public void TestGetAverageExamScore() { // Then System.out.println(output); } + @Test + public void TestgetStudentByScore(){ + Double [] s1Scores = {2.0,99.,1.,}; + Double [] s2Scores = {50.,49.,0.}; + Double [] s3Scores = {100.,100.,100.}; + Student s1 = new Student("Student","One",s1Scores); + Student s2 = new Student("Student", "Two",s2Scores); + Student s3 = new Student("Student", "Three", s3Scores); + + Student []students = {s1,s2,s3}; + Classroom classroom = new Classroom(students); + + Student [] expected = {s3,s1,s2}; + Student [] actual = classroom.getStudentByScore(); + +// Student [] studentsDescending = classroom.getStudentByScore(); +// for(int i = 0; i < studentsDescending.length;i++){ +// System.out.println(studentsDescending[i]); +// } + Assert.assertEquals(expected,actual); + } + //Test further + @Test + public void TestGetGradeBook(){ +// Double [] s1Scores = {2.0,99.,1.,}; + Double[] s1Scores = {0.}; + Student s1 = new Student("Student","One",s1Scores); + + Student []students = {s1}; + Classroom classroom = new Classroom(students); + + Map gradeMap = classroom.getGradeBook(); + + for(int i =0; i < gradeMap.size();i++){ + System.out.println(gradeMap.get('F')); + } + } } diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class index 7ba51efdab025ca79f7a70327c968bacaf5a205e..e34a3b25cd66e238f9fbb7c2b042010016fe8fef 100644 GIT binary patch literal 3242 zcmZ`*T~ixn6n-`dEG(NqTS6&FwbqtE_-HBp&>)77QqTacsZ?6OmJndugr%DeLhDDX z)vB%c>P&CE>6J4&qqNwuI?gzwUU=p7(mVe|XIg#U-6h$yfsf7mp7*@ZdCqgrS@`qe zk9Ps|;&TN)OvyM^joo-vY^D{Q#u@Q=O~LDUqXuu{E%DG~>=6z#3R0LAtF$oB$(UDA ziv=0Ff-RU5o3k>`DX15l-N;nN#~6%X3bI(Nfq|vU_=IDsj31BNtIGI^OYUOIS;#mq zp(c4$S178yglN zmV`QoVcya+-NHhC4W&A-E^TPt`iO5|*$DlF2%71vv79bs(HHRuk+e*GaX$9AWz(dp z=X5h?O=wxW3yPAuNbEBf+&-6KO4w2?+u*8O3q`lm*`#4wX*x8QBkmlMypl4qOPZ-! z23;FGIS&==^y(~ou(>2ENgXq_+4P`coFm7L-msNt@d;TyUp%k%z&od*oM6Av8SG(K z!3}^ukDx;fph zGAtE&EUS1MD>7D9T);(^K*c+FSH*jHU&SR{mhpj#4~69lF01$mA9MK106P^Bk-J%= z5(hC*Mfp`+#V6Fz?gTskQ7yMXnN%D@kBmxbPwM{#W<5Q zXVWPw=Azg)+`07gy&xi#aXw8BmSH0c4-V2}fD%LpjuZ!}^zBp_B~QwZjZD+$^IC?K z#rrVfP8!Y5kc)t0-lW|O_$C(}E1}C}Z0AxeVr*mLM%Z$WMkFs zEYB@ye-Hn+TzC_!^IWbdT;}+@m#-thZ=fqQ>hEt62zS3m zW2;!S^sFJUhKkha6~A=zzkhAx-K)lJREj8mTfPQVa9z)sVanBjC;0g^8ttf0(IK)^5EM++^_;yIUDo|xj6P3kt}@s8*^s(d)rv5sm9 zzd+$nkx0mPZblU;)DcS5QxG6Pp$098p^xxYB>6lk)RaNTQb%YDiqDC@PgKq?5!DhDlY}j&kKA#!Gf$eotb;5~mPC z>md9OP$OeR>b*}`NxX60Tur(NwVLjrc3Px%i~nBS!ItS;*g76%LfanIx}C~JS^5r- z)=e%s6(NjbjM()|??uuoYVBAOw$|gAaN-A2532lb2@PPDI~VVphL!G`>`W1|`C zvHgo12uJHiZes_n>uB=h)J=Tl@o08Dj+T0?csyDhkKs~}DUZjKj>k}`N3X|Ym*X*5 z>ajIiH{i9{qthQ1+BxMOWOoAlSgQRjM-NMWfG@3Hmi-{BaR}2~=`7Yoj>0t#!wr`H z8+Pr_?AO2O|2O+nv_(7dYVliPxbC^iSJ7({$Ej)%f8YeMi^@A^FY`<^Ll{*LQ7a=U SLy=l{@hjvs#YrCe@XG&W&(v4| delta 751 zcmYk3%Tg0T6o$W*+jhW}<7fByaa4b)f-@wsTYlqAEPJzNgC!c|-5 zLl(G};yR1AEE)PO;6}(zZrSd(9p5q3zkk{Gz2#0lUVbw`(IdCMS^c>F{_SRa?L)P> zwcTFZ*ow%~A2CkZa5v%}_ajz#V0akuh=yS~;xSJmp3;nXM$7O#;)R{Oq!sas*PUu& z`p3J(f>&ZfaeZyz=_g%Pqke##>e0@IDb40JJL2y9D5x(ue40Uqbb>U)jOgC7Mjh*y z8SPs3>O?0t(Acy@NEUsGJ z0twYYr5|#ci~2vN#CE4LG2+sm&?YgRXZBTmD#9F>&IwKRsdkCSydCB6ILV~bpG?lQ ztbU(kmI(A|vQj+IMd*XK8e@u6Vg=+m%^78x7SnFIH>qgiaaR8J^}i}*z@FO3!F9P4qmlZw*Y9n-{iNg2+2 OwH?VOJuYbKQ~M8n6hTt} diff --git a/target/classes/io/zipcoder/ScoreComparator.class b/target/classes/io/zipcoder/ScoreComparator.class new file mode 100644 index 0000000000000000000000000000000000000000..b887d9f022a091814fc7828aab794078c01c4ec8 GIT binary patch literal 952 zcmZ`&O>fgc5Pj=7ad90I(xiNpLR(6juVR6aIJ7FNT9A+e9D;J-wsEZB;>5w&72?3( zKwS6*xo`;*2gI2lg?MX6qG`jyJF{m#|c9BC>V}qD5D_U6EK`)N0!~%d}!Xnm@mhD7fYYlUs*8n`fF_Rr7eMT=6lT0vU{!;cQ&n{%{IP6e50cw&o!5TIb5c1 zr3omY$emEr;HnOPf=)W1+MGh0BGXFE=dZ|W6NROK{sr00M4vD-ld!MyR{;4+WGs_! zi{3UpRc#|>oK+(?Rv1wdtEkY^uu5NtRxT6|dG_i|%OjpsTJnwNFJxQ%rpT$1|7$2e PE1}_9l64(761(;naM5E-3erlX5GEOeEY42B5}rl~Xdn_TFO z?}fwKALaPnB+>}!!cKGV$$5O|JE!OL*Y6)c0j%J$1`YEX7O>clepEHw#?kPaR7-$EbJ-ZduoOU2ktQ}Zyt!gK5+^W==0{wMozhwm--xioXV_vU0 zUiF=G)b#djzgmxw%ne56)}59UYzR!0U!^)3y8_v5#t977oRFG_)X1!x=hgq&Ij!z>{HFcX31=xD z%VHC# zOU0Bt2D=zhay9TmLL7iHN9!C9O!JRK1OGtyK=zRLASDGu=%ZZ31)jsy>`ylk zROY@x`HalR&~=38ATm4$kR^zO8Rgq}6o4^G@>9S?lnBS>;}UHWwh_aYDxZ)cYF6Ig z(I;?%9KRpvlYz{jg=j_ONvVroIz=yG5|@d6g}yp(FxMomQi=+?Mv1>XPnq`-Z^>B6 zyq9N~Ax9mEC()-O>nXZ|>$nlx72KqxP@cgpo)T@9w`|UNw21^)C4n|8(TZElQ;sp# jm{Bq+ROU{g&hz<#{8@7O5H2dO5W^{Pfd(p)0_Oezs0Vvd literal 0 HcmV?d00001 diff --git a/target/test-classes/io/zipcoder/ClassroomTest.class b/target/test-classes/io/zipcoder/ClassroomTest.class index 094677d343fcddc9e56757c0db93a74cbf003426..315e69f901e6b1102e411bb85677fb49ce33539d 100644 GIT binary patch literal 3050 zcmZ`*TUQfT6#gccnGj;-4w0qS;w1=}s;w=NDhP_S0W6`^sI3lRgu#%(WCCh$wzc+d z?^k=ZYuT5+w5toTuDV>l)j!ey(TCdaoS9tEG_2(8v(MSz-uv5o&v578KW+ke1V054 z#d8{-55j}vL7aeIMQJjK6s9y7YHyPF_z6P8Nws(KmfWem=?7h*Tdq8v4qzq#Gl*Ku z25?FMrp3>kFwIoK!h8^?kyU#g3#h$^Z%I+@9dcA^@4@p@3LqDN9Y8*S1%a_B;yELv zv(-3<7lL>ZFA3>o0r`rC^BP`Np!S#<)83=N8)=_V;On=h3X2uxF&rKTHaeXpP zOFEhQYl^+A^w~3JPC;wjw4&$C`4nxl(f+ia%VjNVZrsS(yA`YwYf-77Dpk0k zpt-UotpdiGc_U>TQwr+iv-*M_P3xKI=upNsrj0BwsCvrI>uCkyv3$lh=Zpz6XELC?GTrpJ<*zu{?A3#%G>jKTY)k_G!fXeVY@i{ z&KASkS@OD*Ik^c8X7wp!pJkn*xykPkeNGGAus$y;C`rrPW;#j*qiR}N!L##)D(+r+ zwWlog{uw<>o=JGc4E7LqRl?R&r|3fVglwxmcD9B=j);cW6a*7iKASQQn6i(GogmWK zCV~v%VF)%WHjy}dUBiVC-oV8W4hYycLwE~slZjGaI5iTN-eL91kz6_zXl_B+>Q=@O zxbIT57cC*a7sC6v6v7AiP{T(de2h;td>X=M_?(tS4DV=$jp7|&v=sQqXR-!yzQC6v zp07gq8kd=H2;bma4d01iz7OFC{3u|quu;pyT0z5#R7NLf+4v-OMFBaQks&dmwWXxp zVPJp@dOB~6o@9}EsjPmbaj7W{LSHUtWa%KpIi;}wG{=Ztx+PL(=mg<*hMYWCBSL75 z43s-5&PS{qAz^3D%yc<|tEn(r0yG?{JSF0+o?~(Uyf#ECMo~Q_=XF9*A|Gp8?R|thHtpzcld8o80qXt3?=fSciJ) zW~&3`x(T8YkE5IJYIr|}-Egy@h}jmH1WEE%^V0mh?6tu*}C= z($|1$A;b&nRR#5GAq?L@ZL+SeuD;_M8b;hrV<$H;A1!K=-Y#N0RE#|Nhd2Et-k0Br;cJpq= zarB~(xoyKi?4#tN^=|ZIfO!w03;QYgBoZI8%r`~;1XC(et7tRC|4CNz^JI~q3%p-V zZ+BFepVk5qYo*|qe8dZ<>kFqFoYM!yGF&(3s}B1-_a|ai;lL8M#Dd|faBvxs66ZVE zs6d1ax3f#O;utzGi%y&&XBXM$m)Z4K*|s;>;J3-wU+gN;-t!J4F8}NBi_3oxF1h?4 zLk3T=5?rSXbtKzymodraFb_yrXM!AilH{-{#-4cUp80N!!c8>cc}!wv%b>WD5Hj<~Y|QY$id`L58)9 zDUD#1X)-{UtPuB3vxaFSTGT_FZb^cdXi-Um@E5@$Jk9jRXf2*6jwV6PI5q3xxl0F{ ehG#TPXn0n`VGT(QNBC&^2W|H-c9bR_9QzM=x1_!R delta 558 zcmZ9J%Tg0T6o$V^hjh}_mRJ@9&`BaHh9Cn78c9Thcp+Yas9d~6L>DeBHwsJ3l^ZrN zzJyE4g;g$m0QbIxkKn@cpTNqVs&h_v|Ce)me&;_Qs{Z`@{Rc3`E5~uBEj34qy5kZv zIaQY(S7=yfGmTZ@v>cYJJJm3n%W^Htb;l8IWVxB}=9AD&5VvyN=8oeo_bm4<3wyt| zgSch}O-Lbbn}NQNMaz<>#RJbIQ8|jI!AJe-*ixV8vB*`)aVigpN+Knj(%3YOj1bZq{loT_aLnj*e zeE@@;)GpwZ$SI2PYdgMP(n&8}iX(c0vve~`Kamh)9d3oR?urLoM-QhNl14X&IYU`G z{qh=CWvB?5_>L$C(%N_VV?TW;>12qU;v{+fm52+}snTSc6>1uFhBq{L&uqtaiL9`j z2d;VA>MD|E#Ju{7x;v*TEu}*8;+kfIqn$o8Qq6IGKz8=O_Np>Saq%Bs C$ve{k