From ef64d34e5e95b50a15f3ca31d1d3376c00d0115f Mon Sep 17 00:00:00 2001 From: sitarameez Date: Wed, 7 Jul 2021 15:39:47 -0400 Subject: [PATCH 1/5] completed till first method --- src/main/java/io/zipcoder/Classroom.java | 1 + src/main/java/io/zipcoder/Student.java | 45 ++++++++++++++++++ src/test/java/io/zipcoder/StudentTest.java | 16 +++++++ target/classes/io/zipcoder/Classroom.class | Bin 0 -> 276 bytes target/classes/io/zipcoder/Student.class | Bin 0 -> 1785 bytes .../io/zipcoder/ClassroomTest.class | Bin 0 -> 288 bytes .../io/zipcoder/StudentTest.class | Bin 0 -> 1088 bytes 7 files changed, 62 insertions(+) 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/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index 64566f0..ac8469c 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -1,4 +1,5 @@ package io.zipcoder; public class Classroom { + } diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index b543e36..c20b470 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -1,4 +1,49 @@ package io.zipcoder; +import java.util.ArrayList; + public class Student { + private String firstName; + private String lastName; + private ArrayList examScores; + private Integer examsTaken; + + + public Student(String firstname, String lastName, Double[] testScores) { + this.firstName = firstname; + this.lastName = lastName; + this.examScores = new ArrayList<>(); + + } + + 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 Integer getNumberOfExamsTaken(){ + return examsTaken; + } + + public String getExamScores(){ + StringBuilder score= new StringBuilder(); + for (int i = 0; i < examScores.size(); i++) { + score.append("Exam "+ i+1+ " -> " +examScores.get(i)); + } + return score.toString(); + + } + + } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index a9fedec..bef9283 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -1,5 +1,21 @@ package io.zipcoder; +import org.junit.Test; + public class StudentTest { + @Test + public void testGetExamScores() { + // : Given + String firstName = "Leon"; + String lastName = "Hunter"; + Double[] examScores = { 100.0, 95.0, 123.0, 96.0 }; + Student student = new Student(firstName, lastName, examScores); + + // When + String output = student.getExamScores(); + + // Then + System.out.println(output); + } } \ 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..90383d650dbe7aa94d1be319ff8971140ffba54b GIT binary patch literal 1785 zcmaJ?+fvg|6kR7Ny@VhN6mM1Qy%ezCZ$K496s@4v(Q$kVCDv$3nKX6OXTQW3UwqIR zsWUp`qYr+PGhWs?3ADxNFr1vdvd-RXuYCyLe|`Q6;55nx25~-x0bG#F#RMh{!~$ee zB2x(z4J2`1!k3b`EQ4ve%p`F|g0nKXDwnwgt|f3?AobYs8vcT{VhaqEo?6eXLd|lk zg|hECZgoN+S+myP8}dVyDUvgY~p}DeTd-p7gknPtiR_(s!IWi8xnE%94-8%KcD`&OBvmVW9F59l^R@vt& z`wZW1`0MrzMpPFttF}MaHhd@-I@E2s+2~@WBf6E1^fFm#V>rD$)Q-}87c{r{_$sHi zZfv@%V%yq2@+EIwzHkJ@yg*Mwj$2@7hnIojGfk&PFF2OIvTs$M-Lh7dWxRwOX1U(< zD)yWseKkY7j>+3)Vh`p`3?Xe|7-^1L-MQ{-WMVsZnAnYs!1m2|GAwN325wTIRGl?Z z!Y#QhaK72`B7sHRmcShocadY6i1`U@Z6{w`dTLjE0X?TKNyB+X=?rK>+*)0=-DQFC zs7d_CnM`i}?*X@s(`h>Ykh)2M4%*sPEJXj8E$P>T$zVS}27~-&#Gpx|xznWA>Pch4 zajN|;;`EsN1hGBX%XJ?k4?52RyYinP@}q0e@?&ez^Is5q_z690h<{M$vs{PK!__3e z4=HTnPd~G7qXr-!WWfO(WW;W(tY6?$vU>6#p}pruLzZh? zfkP^_84$wM{L-*kAihYpOdMCj+d>V6?x5VAD#LKV+7K64R>{JnkwWy%LNbv;#-fGj zn}uX4WdA>eNN=Q&aU2Vq>U1QrS;(PCA%%@D-f;{%9VvZ5lJiTI^r;M;jkjRD!I{wz z9q4Vr%(T!KazSW}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..4d038d4779ef6a8fa622cd31c97951635f194cb0 GIT binary patch literal 1088 zcmZuwYflqF6g}JSqpS;*wt!W{x3;|22fhkoK~SPA7)z>+iOEuiI;7nt+gYOiEBydQ zCU~Ms{U`WvVn2D8l zZmUxF14i+E+dOECHMbSryW{S;cGLA5gbcXXAW*959-f=52bg{B97QktAu*w7qut4< zU^tElMd*Ggc0)l-Uxc3EEmq}iPT)n)^Mxz8?-8rC;|C3UCnP!SE_t)!he4e^;!=Th zPhm5XhJ|5_kYoKUSCcqFNi1U8k2$2V zM3p?DS|qiFPI`2xC9#S#7$=H4R&bWA1fj-oj;c>a*bBHwe}4&mxJ0KKF4G;d)GM?q JxJq*Zg+Ce1`62)S literal 0 HcmV?d00001 From a7a896986e014f1965405ce14bda83f5123cd091 Mon Sep 17 00:00:00 2001 From: sitarameez Date: Wed, 7 Jul 2021 22:07:38 -0400 Subject: [PATCH 2/5] finished student class --- src/main/java/io/zipcoder/Classroom.java | 2 + src/main/java/io/zipcoder/Student.java | 42 ++++++++- src/test/java/io/zipcoder/StudentTest.java | 83 +++++++++++++++++- target/classes/io/zipcoder/Student.class | Bin 1785 -> 3234 bytes .../io/zipcoder/StudentTest.class | Bin 1088 -> 2654 bytes 5 files changed, 122 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index ac8469c..171a9e6 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -1,5 +1,7 @@ package io.zipcoder; public class Classroom { +private Student[] students; +public Classroom(Student) } diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index c20b470..7373f5c 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -1,18 +1,22 @@ package io.zipcoder; +import java.text.DecimalFormat; +import java.text.NumberFormat; import java.util.ArrayList; -public class Student { +public class Student extends Object{ private String firstName; private String lastName; - private ArrayList examScores; + private ArrayList examScores = new ArrayList<>(); private Integer examsTaken; public Student(String firstname, String lastName, Double[] testScores) { this.firstName = firstname; this.lastName = lastName; - this.examScores = new ArrayList<>(); + for (int i =0; i " +examScores.get(i)); + score.append(" Exam "+ (i+1) + " -> " +examScores.get(i)); + score.append("\n"); } return score.toString(); } + public String addExamScore(double examScore){ + examScores.add(examScore); + + return getExamScores().toString(); + } + + public String setExamScore(int examNumber, double newScore){ + examScores.set(examNumber,newScore); + return getExamScores().toString(); + } + public Double getAverageExamScore() { + + Double total =0.00; + for (int i =0; i < examScores.size(); i++) { + total += examScores.get(i); + + } return total / examScores.size(); + } + @Override + public String toString(){ + NumberFormat nf = new DecimalFormat("##"); + String getExamScores = getExamScores().replace(".0",""); + String result= "Student Name: "+firstName+" "+lastName+"\n"+"> "+"Average Score: "+ + Math.round(getAverageExamScore())+"\n" +"> "+ "Exam Scores:" +"\n" + + getExamScores; + + return result; + } + } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index bef9283..9e51fa7 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -1,15 +1,33 @@ package io.zipcoder; +import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; + public class StudentTest { + private Student testStudent; + private String firstName; + private String lastName; + @Before + public void Setup() { + // Given + firstName = "Leon"; + lastName = "Hunter"; + Double[] testScores = {100.00, 212.00, 125.0, 70.00}; + + // When + testStudent = new Student(firstName, lastName, testScores); + } @Test public void testGetExamScores() { // : Given String firstName = "Leon"; String lastName = "Hunter"; - Double[] examScores = { 100.0, 95.0, 123.0, 96.0 }; + Double[] examScores = { 100.0, 95.0, 123.0, 96.0}; Student student = new Student(firstName, lastName, examScores); // When @@ -18,4 +36,67 @@ public void testGetExamScores() { // Then System.out.println(output); } + + @Test + public void testAddExamScore() { + // : Given + String firstName = "Leon"; + String lastName = "Hunter"; + Double[] examScores = {}; + Student student = new Student(firstName, lastName, examScores); + + // When + student.addExamScore(100.0); + String output = student.getExamScores(); + + // Then + System.out.println(output); + } + + @Test + public void testSetExamScore() { + // : Given + String firstName = "Leon"; + String lastName = "Hunter"; + Double[] examScores = {100.0,170.0}; + Student student = new Student(firstName, lastName, examScores); + + + // When + student.setExamScore(0, 150.0); + String output = student.getExamScores(); + + // Then + System.out.println(output); + } + + @Test + public void testGetAverageExamScore() { + // : Given + String firstName = "Leon"; + String lastName = "Hunter"; + Double[] examScores = {100.0, 150.0, 250.0, 0.0}; + Student student = new Student(firstName, lastName, examScores); + + // When + double expected = 125.0; + double actual = student.getAverageExamScore(); + // Then + Assert.assertEquals(expected, actual, 0.01); + + } + @Test + public void testToString(){ + // : Given + String firstName = "Leon"; + String lastName = "Hunter"; + Double[] examScores = { 100.0, 150.0, 250.0, 0.0 }; + Student student = new Student(firstName, lastName, examScores); + + // When + String output = student.toString(); + + // Then + System.out.println(output); + } } \ No newline at end of file diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class index 90383d650dbe7aa94d1be319ff8971140ffba54b..9ecda2cdeebd330f0b0e93d96beef90971ec8cbb 100644 GIT binary patch literal 3234 zcmaJ@YjYE26n-|hO}9&d(3Ap20|gs;MFhkaN=r+%wJl<6E8vACUCKh5l+A{lcSXVb z{eENk;x|WUBrr0===jaQ;6LyuFr)aK-A$Ub!GXN{?%8wR^PJ~AXSaX;`|B+L+i^uh z5{8On8UiqC(1MgKGqRXsJ1)Cf6(=;*zz~ZS#Ywq2B}+PrIWcDBCM(N)6sI+;fvqtx zr@_IzION54M#Whb=b|{TVJ$91@mv(oi^~g9ycoqxQM@csuV{D`ugPH-qj+7#8!9d- zs5x%gIcMCMGZn-}Pa0>8uC$Sv?V50GD>K`pAeuIc&o%R$F*lLQ+Gb8c+;h%5R=TU- zwvF?nR?eY+&4e|ZF`T^31GiN3*) z?6xwN)2pC6S@zsVy3}%{%;YE9GNm9ikewm6<)c={9M8`kGwn%(Af)_k%1BQcwk7wz zQLz*#!;ErHSZ>u;w(Ej5pW+!dNy^Wd8MkVe#*9m&=9oFBNYkn+C=@K4aE#QcF=O7% z;`ZXQiaiSSS<@L>=tzCir?9dodalANUWE>+w3dgBmbzEVpoP0QpLx|EIKH24Eixak z$hg4$GWv^Ov954Vbf92O8OdHJ_T{ZK$?2iGS&uO@QwpPKl7m$XswpXpY!5PwSj)m1 zlEc;GT+w)CP^lU7tP79&A=>^krftlcWye&q=}SUE*vUFZx>ElBLrxaYb+TS%3Idtq z3L3qV9rK*i<>emA+H;1;Ai~keryZ(!BAd5U=8z@A(tVwD%6RG6hBt}O9kt5o(b0|$ z9b3?yf4cK6l|iSmxd4Vkr+PKaRdV- zSJUwcKGiXT0Tq{Ze1^|;e1R_&tXN3lRbR~N7CLCAtT`j?RZ1e7o28Kb+;whM03Bc9 zYXxjL{jS5A1un4dQ@^zJD4_TMf`Ra=y~ zf~Mr~|2+;;ivpp-$p^70SrJ+p+RB+ypq??(dGi2exM-G2at?BK6tpCV%TB3sa0x-} zjQbLvl5<@yIDe{b&ZmtO?+44t7&u|r6Xxl>nMs*FWye?8mvX_us9O-%nBnln5Vo^< zAv?r3!iaDrDg>T}SX5LalAr5N>V1hDdN{C?4v#brtc}Ul8huhqe`u0%6p=;Cz;;@C-#?abE1Cl6v5eVG>zp_^CP^$<4) zhC8Vs;O=%~4>R;~zXpLj3=ON;tD?{S-%sz`Xk^en4EP0g@hXRei8lNbHvt!4#5Fd$ z7B`|Rt3UWpdU;rkbmIdP1H~t+Guc3ljxv;+NMxy}nq_Y+g?%OG#4vM4` zdnuS9?nfzCkxYVq8aphKkv1IkX^*nPN9m=w^3W0Z2bzj8|h8^-~^gi*#z3H5@i zO$yQYyCfO~t@dN6k z{gG4)B~v%C_E2oybu^6%)v@)ldkVOBtf-fSCz3EPu?^lnBKwW9FQA#F+`y&+HplLx zrJX-YX1rseU0w~t6vhY|D1#mfVUjHuep@{RK5~sup2E|_*ML5H%bR7Azh}4$()uhT H0yz2~xXrH0 literal 1785 zcmaJ?+fvg|6kR7Ny@VhN6mM1Qy%ezCZ$K496s@4v(Q$kVCDv$3nKX6OXTQW3UwqIR zsWUp`qYr+PGhWs?3ADxNFr1vdvd-RXuYCyLe|`Q6;55nx25~-x0bG#F#RMh{!~$ee zB2x(z4J2`1!k3b`EQ4ve%p`F|g0nKXDwnwgt|f3?AobYs8vcT{VhaqEo?6eXLd|lk zg|hECZgoN+S+myP8}dVyDUvgY~p}DeTd-p7gknPtiR_(s!IWi8xnE%94-8%KcD`&OBvmVW9F59l^R@vt& z`wZW1`0MrzMpPFttF}MaHhd@-I@E2s+2~@WBf6E1^fFm#V>rD$)Q-}87c{r{_$sHi zZfv@%V%yq2@+EIwzHkJ@yg*Mwj$2@7hnIojGfk&PFF2OIvTs$M-Lh7dWxRwOX1U(< zD)yWseKkY7j>+3)Vh`p`3?Xe|7-^1L-MQ{-WMVsZnAnYs!1m2|GAwN325wTIRGl?Z z!Y#QhaK72`B7sHRmcShocadY6i1`U@Z6{w`dTLjE0X?TKNyB+X=?rK>+*)0=-DQFC zs7d_CnM`i}?*X@s(`h>Ykh)2M4%*sPEJXj8E$P>T$zVS}27~-&#Gpx|xznWA>Pch4 zajN|;;`EsN1hGBX%XJ?k4?52RyYinP@}q0e@?&ez^Is5q_z690h<{M$vs{PK!__3e z4=HTnPd~G7qXr-!WWfO(WW;W(tY6?$vU>6#p}pruLzZh? zfkP^_84$wM{L-*kAihYpOdMCj+d>V6?x5VAD#LKV+7K64R>{JnkwWy%LNbv;#-fGj zn}uX4WdA>eNN=Q&aU2Vq>U1QrS;(PCA%%@D-f;{%9VvZ5lJiTI^r;M;jkjRD!I{wz z9q4Vr%(T!Kpp7WmP_rA}&fBy69ZvZahMI1x8 z*@Z$kGMMYaynHU`xTWP*xPiYoG~Cv5>)&}ZE%!JV3~u`?I_|`gKv5oC)N;#z1g{^p z2KT%L#!29AH6cngADzJKxejh|BA#_aK!=1lN;Bta^nTx~gXDy>`W_Tke>GXnJr-L2QDt6ns#y>SDfGTNTctxmxw&*d?>NWIC3d z2a7THiPcar&`HN4mGUaJDBR|Tg1D!=WIKWfdhfTX%G*swZ&AMyV#FEvpxH4X^ z+pg(acAY1Z1>31)*PGOuy)M=mh6fJFm^Xww`OK^pgV1r&HqjfcRB3k8-DomriMBw2 z#DokpUM`1WxXV-97Fj`maM}2#aLkHm+uS9dZHSU9$_kXc0?jPBO|z=NkS7*xKkLju z(QY~=F=fegCW2}$a?3ecAp@V_Q|7-Q?7D$-$THA0^C27q=jAN1T}MA-21?+Sy&XIt zg9!s?F>GKB6&+6uSXkHbwSg*X2I{a4Y~ZN@2Mq%*nmRTOe1m5Oo})tA4pF7n9Xb|P z*U7Cw-!!XDv9Lx*rt^cHN;{fvTMcZuccp_Xq$l62v=xG0NTu8F2uF*r?QX<_@pyVh;5fjW*c|`qDEyaue?B zCEi|B?Su?_q^In4%aTmE*RwQSV!JiQ8x7$Q*)YAq3|G<3_uFYnWkynUjlCf7%^>@%#qABQa&|O@Kr4aW9Y6^xo&{B9`4hosKNUUUD z^4v?PL$7h*6_VQu`k*rM0p5_Lf?g`=!wmX8MScFQfuc(|h!KoZ*=3%P%CC4juZB8* zXDp3tHo57=WGk!J$^iWwp{qYg+I797OYL+JO z3C@QE!y!Q?Am|~lPtcEnfZ)tN1QQ{_+kjxgCs22r=V*sQ&|Js2aN@t9E)(hsp{}wp zV;E#QFJOWxp5o|68`MMyl?$P+22e*?Kp$!lhXbh5eW3Co)L*={n@KC~22Tnl`9Z(j@Qkzb_;BSJCs|bzwUCh>_JX@ z{w#)&w?fFd0CG5l90?)E*i@5DmC9H>OxF~nwA#ye;dF@mE~w$m|HhT1gZnqveL_AU pL}BBaT-C{vhdtKv)uI28g;gn+H)8VQ>#w@(#kShomf{{^Bw`gs5V delta 584 zcmYL`%We{36vuzxFc&(G6>zAah+40`F>31#v?8&wQFMcevS~uwNkdba24;+L)14bv zhKF#iCauw^UHcCD3_gMJ%%JgGobx~T|M|{OcR#)I{r9J@zyb{$m#H+FjSLN0<-RNvb6XtEXT&YVGRG+k qN0TK^2-2jg#L0^6pGt}+IW6aJFvb}P8=RFU@v`ScE6$75xbO#g+gbAf From 1b27bf8c8bfa04b5edaf0b2dfff14adadb5c4bce Mon Sep 17 00:00:00 2001 From: sitarameez Date: Wed, 7 Jul 2021 22:46:39 -0400 Subject: [PATCH 3/5] classroom average done --- src/main/java/io/zipcoder/Classroom.java | 36 ++++++++++++++++-- src/main/java/io/zipcoder/Student.java | 2 + src/test/java/io/zipcoder/ClassroomTest.java | 22 ++++++++++- target/classes/io/zipcoder/Classroom.class | Bin 276 -> 1368 bytes target/classes/io/zipcoder/Student.class | Bin 3234 -> 3314 bytes .../io/zipcoder/ClassroomTest.class | Bin 288 -> 1307 bytes 6 files changed, 56 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index 171a9e6..36d4ae4 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -1,7 +1,37 @@ package io.zipcoder; -public class Classroom { -private Student[] students; +import java.util.ArrayList; -public Classroom(Student) +public class Classroom extends Student { + + private Student[] students; + private ArrayList studentScores = new ArrayList<>(); + public Classroom(int maxNumberOfStudents){ + + } + public Classroom(Student[] students ){ + this.students = students; + + } + public Classroom(){ + this.students = new Student[30]; + } + + public Student[] getStudents() { + return students; + } + + public void setStudents(Student[] students) { + this.students = students; + } + + public Double getAverageExamScore(){ + Double average=0.0; + Double total=0.0; + for (int i = 0; i < students.length; i++) { + total+=students[i].getAverageExamScore(); + average=total/ students.length; + } + return average; + } } diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index 7373f5c..ee54d8e 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -19,7 +19,9 @@ public Student(String firstname, String lastName, Double[] testScores) { } } + public Student(){ + } public String getFirstName() { return firstName; } diff --git a/src/test/java/io/zipcoder/ClassroomTest.java b/src/test/java/io/zipcoder/ClassroomTest.java index 7bac1ff..116b1d0 100644 --- a/src/test/java/io/zipcoder/ClassroomTest.java +++ b/src/test/java/io/zipcoder/ClassroomTest.java @@ -1,4 +1,24 @@ package io.zipcoder; +import org.junit.Test; + public class ClassroomTest { -} + + @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 = {s1, s2}; + Classroom classroom = new Classroom(students); + + // When + double output = classroom.getAverageExamScore(); + + // Then + System.out.println(output); + } +} \ No newline at end of file diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class index e3e3105f62ae6cfc0804ea21349da326cbeab864..4e7b3a2f5f3dd2471c3505f9f522d374a99ad284 100644 GIT binary patch literal 1368 zcmZuxT~8B16g|^V+AdHE1uC}ScUwNHprV1)G@uDdk%uaY@o6YaU2VH$yCvweiT}eF zUo{ah8uS6Xn|0Z&71qu6PF-IqGB31hG!45b5Xf%i zw)t420Dax|cOtV4y(S|&9 zX}0z}Q^bo6fmF7?WhKI&RcoxK+ufYWY_5L-fvxkvQKpp+bW7Is$A_}vG)`bF>viRP z1E|Ch2ul~OJUY$22npJzE$h6AiY=>eHs!wKJ&YxRXvJ(>RsD&f8Z^}Ly`We$j9`il z=yP2f1~H@|294)^uAST(r|F)C`&ia6jTzqid0eNGK)hEm{T#@8Ti@DaQg*$s>)5U{ z0NV=ZbbB3FIHw^Fv5y}Lb0Vq)N5P5XJQcK*;5y2kGW=A-p`UHtVp)UO(##p3V zBH1aCbnLh#ro0kcEFqYk>Maq^{6wfvnYdSGgnAQB8O#qnWmH( zHVoexv@mY+EB;`SfLq-5 GA^Q)VVF1_w delta 144 zcmcb?HHAs()W2Q(7#J8#7zDT&m>GE48Ti;4_!$}4Y%=pQOY9gKm^CJz2%h|tQI45~ zfpu~clWL@YQdVkm3449B$*g^01UekPXGV_ diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class index 9ecda2cdeebd330f0b0e93d96beef90971ec8cbb..d70515c77ee0ca9174138ca5fda2ee12b38cce5e 100644 GIT binary patch delta 742 zcmX|;$xjqf5XOIRddBW~GpJ)26cR)XI?yH}f(jUrWf)WzMMe}i6x?tHWfWK3#l+jg zJ2758fH5SRc=5)Ci~a+iJ?X*3L}R_iaOmoD@{TN{)g29YL_tpF{Z{3H8t6yeB*(u@KwDE*AzA5Jt0tHEb6zzNn#& zdhrykq|K05rix4=nsnO8m}zfAWGxX&%)D3Pv`hZG)}AqqnE5%&^1+!GE38g*|K>`X2R6wkXk6Pc>`owot5a0Mf!2}m( zbZ`6y%Eq{GW7xQHyS;w7o=)BLUAxz0J7c>{$GB)DOu@TOsmvJ;Fu z?v~Gl&u!ht9YZa5HTN|4o#uh&p=MI^$dx@dJmIP9Hl=yy^W10p{f8Ol3z+fgu|t7x zYSh+vU(|&C;pNo}yFNHpeUz+1nJBM$6J-ZkQQMEfUNvC<1iQQf2kpjC(MvZM=3a#s zl#19{|GU>u*3RjaT4_t+n754q`%^cDRuLj;Yr}Qkpya#5DOF#|4^{Hj_GP%LDJ7al zI%JV?`5`Q$i%oJnw3-ZJhV2a7d8tlUs>PEHm~w0lnzh7O$5vVx6ugsGJ8c@0IYEjo z(j!V>5#zHdS?t#v8XO6{uB#nNG9`rrf_F&&b0vf%Qs^r3a^ z==ki9ay&Oc1;sq%o^$R!=X~FHZu0Zj*Y5xp@KVMw<|NFExe^8Fks;uom@EJAJuz1s zZyJmK3JD8g+z;b{35j@7Sj3>xRSds9QL0r;J-Cbq~Bqxgu z!By)>W9ZH6rnci5Wz9ZN%QcEb^HxQz6;)g3elr+!-|7y-XkNF{AN7+8<=W}hn(8>V zWf=#W<7OF#Tv|6Zccre`YE@f*uNsAlWmCn ztpkEH$1u>*sNi}>n#o%T&OATd@TuD1;eQTBDlKq?tK-ZCYAPpMo_pfC3~Y@dvG19# zZfHf_(FxUxXXu1;`tp`tO&@!tV7kdxE?Ayj(Kd8nw2P{IH^mt$NMM9A|7NRT z71S-(u4I!SgVdx(Q?g8rmsls$eP@v*?Fkp{_>m0-o7htD49_LJP>{#AgdGLD*dtb5 z(>TfwY`f)StwJHGuGTzl_YL(+u1$6uRVLXMEx5LBRV~KY6e%4Pj{e!kCfOWxGsU#RD;GJ^Jmi;CJ9dXp_)nG z2uV=Hbqvu5${zv503-AsB`-}Yqct>j2KLF{zCv%Y5yVxpm8Lz0YveJEQ?kI5nTQY~ z6sw26K_~^{2z)`PPzuH&awFdghg)Hp8{6klO3|L^<>@o@?lhgg8FDf~%1}yyS*no; z7BZo8^p_H$Gek3DLOez66!AsrGX{pGQw;t=JK>{<5Jed&!ka}8-J@Q-LLVxK!N4Fq z+U0Ea5$1@|U^9f*B+U(CmBJQok|j`f7PoL40je>J39^DzX$*IeB)+`fB&J9qgSt** UhJIwTRFNx|qLq=PT;#jI0X@PkO8@`> delta 115 zcmbQuwSYGE48Ti;4_$TJ2Og_M<#KywF%E%x&*^o(eaxIg% z7=t1M6HpNdFajY^7D%#9-p4Ga&JGk~1M(Pv@*F^t2h3(=;AG$etL6rhObk2#A$Sa9 From 18a5e963696cd739f9ee2481c9209eb9680ffe9e Mon Sep 17 00:00:00 2001 From: sitarameez Date: Fri, 9 Jul 2021 17:15:16 -0400 Subject: [PATCH 4/5] one test failing --- src/main/java/io/zipcoder/Classroom.java | 71 ++++++++++++++- src/main/java/io/zipcoder/Student.java | 1 + src/test/java/io/zipcoder/ClassroomTest.java | 81 ++++++++++++++++++ target/classes/io/zipcoder/Classroom.class | Bin 1368 -> 3632 bytes target/classes/io/zipcoder/Student.class | Bin 3314 -> 3314 bytes .../io/zipcoder/ClassroomTest.class | Bin 1307 -> 3987 bytes 6 files changed, 152 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index 36d4ae4..1593619 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -1,12 +1,16 @@ package io.zipcoder; -import java.util.ArrayList; +import org.junit.Test; + +import java.util.*; public class Classroom extends Student { private Student[] students; private ArrayList studentScores = new ArrayList<>(); + private Integer maxNumberOfStudents; public Classroom(int maxNumberOfStudents){ + this.maxNumberOfStudents = maxNumberOfStudents; } public Classroom(Student[] students ){ @@ -34,4 +38,69 @@ public Double getAverageExamScore(){ } return average; } + + public void addStudent(Student student) { + students = new Student[maxNumberOfStudents]; + for(int i = 0; i < students.length; i++){ + if(students[i] == null){ + students[i] = student; + } + } + } + //0,1,2,3,4 + + public void removeStudent(String firstName, String lastName) { + ArrayList removeStudentArrayList = new ArrayList<>(); + if(this.students!=null){ + removeStudentArrayList=new ArrayList<>(Arrays.asList(students)); + } + for (Student student : removeStudentArrayList) { + if (student.getFirstName().equals(firstName) && student.getLastName().equals(lastName)){ + removeStudentArrayList.remove(student); + + } + } + this.students = removeStudentArrayList.toArray(new Student[0]); + } + +// Boolean check=false; +// for(int i=0;i getGradeBook(){ + Map gradeBook = new HashMap<>(); + String grade=""; + for(Student student:students){ + if(student.getAverageExamScore() >=90) + grade="A"; + else if(student.getAverageExamScore()>=80) + grade="B"; + else if(student.getAverageExamScore()>=70) + grade="C"; + else if(student.getAverageExamScore()>=60) + grade="D"; + else + grade="F"; + gradeBook.put(student,grade); + } + return gradeBook; + } } diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index ee54d8e..76a0b69 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -5,6 +5,7 @@ import java.util.ArrayList; public class Student extends Object{ + private String firstName; private String lastName; private ArrayList examScores = new ArrayList<>(); diff --git a/src/test/java/io/zipcoder/ClassroomTest.java b/src/test/java/io/zipcoder/ClassroomTest.java index 116b1d0..1ed5486 100644 --- a/src/test/java/io/zipcoder/ClassroomTest.java +++ b/src/test/java/io/zipcoder/ClassroomTest.java @@ -1,7 +1,12 @@ 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 @@ -21,4 +26,80 @@ public void testGetAverageExamScore() { // Then System.out.println(output); } + @Test + public void testAddStudent(){ + // : Given + int maxNumberOfStudents = 2; + Classroom classroom = new Classroom(maxNumberOfStudents); + Double[] examScores = { 100.0, 150.0, 250.0, 0.0 }; + Student student = new Student("Leon", "Hunter", examScores); + + // When + Student[] preEnrollment = classroom.getStudents(); + classroom.addStudent(student); + Student[] postEnrollment = classroom.getStudents(); + + // Then + 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() { + int maxNumberOfStudents = 3; + Classroom classroom = new Classroom(maxNumberOfStudents); + Double[] examScores = { 100.0, 150.0, 250.0}; + Student student = new Student("Leon", "Hunter", examScores); + Student student1 = new Student("Dolio", "Durant", examScores); + Student student2 = new Student("Kris", "Hunger", examScores); + String firstName="Dolio"; + String lastName="Durant"; + Student[] students = new Student[]{student,student1,student2}; + classroom.addStudent(student); + classroom.addStudent(student1); + classroom.addStudent(student2); + // String firstName="Dolio"; + //String lastName="Durant"; + + classroom.removeStudent("Dolio","Durant"); + Student[] expected = classroom.getStudents(); + Assert.assertEquals(student, expected[0]); + Assert.assertEquals(student2, expected[1]); + Assert.assertEquals(expected[3], null); + + } + + @Test + public void getStudentsByScoreTest() { + Double[] scores1 = new Double[]{45.0, 50.0, 55.0}; + Double[] scores2 = new Double[]{60.0, 65.0}; + Double[] scores3 = new Double[]{70.0, 70.0}; + Student student1 = new Student("Jimmy", "John", scores1); + Student student2 = new Student("Tammy", "Tohn", scores2); + Student student3 = new Student("Jack", "Tohn", scores3); + Student[] newStudents = {student1, student2, student3}; + Classroom classroom = new Classroom(newStudents); + + } + @Test + public void getGradebookTest() { + + Double[] examScores1 = new Double[] {99.0,97.0,95.0}; + Double[] examScores2 = new Double[] {70.0,75.0,79.0}; + Student student = new Student("Leon", "Hunter", examScores1 ); + Student student1 = new Student("Kris", "Hunger", examScores2 ); + Student[] newStudents = {student, student1}; + Classroom classroom = new Classroom(newStudents); + + Map gradebook = classroom.getGradeBook(); + + Assert.assertEquals(gradebook.get(student),"A"); + Assert.assertEquals(gradebook.get(student1),"C"); + + + } } \ No newline at end of file diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class index 4e7b3a2f5f3dd2471c3505f9f522d374a99ad284..846bba00e6057b32fe01098cd40eaacba29e80a0 100644 GIT binary patch literal 3632 zcma)8Yf~K85j}SwGrP-3AYefoNjQ?FXj#BmpvVef3__AkvOpXp6v^>pfB}uP?BLm1 zg6t$#9665TD9+naoR^gcd3{K#A|%HZl|Lm_$(Q^E{|%MO^68mjAM&~?wd~zHefxHw z?mpeae?IufZ2*VymlP7PbS$M1ft5rK%PE|PExQY{T+~rWVFg859MN7Ch38XnQIboZ zEafJw;mfkDi^`=GUcig8`-+@?RhF;m=#@(^>A0Li237)J*T&{969%aGvNm?g-*W#A zZS2X*{zC#+w6W_Y#z>zbGHcFCh&a@JlhnqJwp6uKMfj0D1hSzPWv?v&>X z*6=9rwXK-z)8&uk5b3C6;kHnVu(;-XSOchP(Cb?=%t{_Qq+$rzH6;GYgWbB!E6nbSd^Fz-c`RM;Zn(I?UG8@jBC3 zQ@CT7!UA-%0F7fesQ$QXE?UPN=c2-ntxEY$nQ!6za`n8q22yYu_fHj$)}J(n`Oz#2 z@Yi&FN5@qT5QU-p0sQ}lNQqge>@HX*ZRw8f71BQ>g)uOQ5w=`|zBbT@hje_`z#I6U zfkPND(1TtoH^>>eCwkvE@B{qNz!=62{0KkR@e>1Y;-})~nt`9;Emp(8&+!Wbzr?Q$ z{2FgFMg!OJ8w0<^+Xj9oyWeBOz#s5OroM{o3A1#b*;N3WWSrk){7&$DoZpkomVrOv z&m?p$zDl?XEmbB4Gl;aPTA%dTpPu8gtExiZUCq6K!CR>OrVJ+(J8I1=l&zU1QkN5| zrl!>ymd+lpJqRZur^TW_6X(Q$KWZ3J!Y+DM0jE;{qe^>@GtDf?1Xeh}$yJSRX8wY; z;0@PK;&4!B!XEamOgM!C^=zl;PlSYB$v{UP-L^7A((C8V(zLZskDQ0+IE0J-L;WNR z-782Jove<6dacSZ(5&anWG$^0E2#SrEd-UcU1aeBnm<%4V~07m+q1WBdL6!+d5Zai5}WkpDs` ze40;R^ltz=b2p)K?;>*cCZabG%k8>__zh@(^KT#F+KL!ggKG-S*oIE7k5JM<%e;@H z_zZt#cL+n$DfBWNdO00>N#F0K=LYoqU9^NQcAy7imAlz{N=DVumi*p~&3t zqNVGfNHlQM9=b^rafk252n>X76duKBXuO}lVmzMvJM_PD6M>{e3ol3-g3IyB<;N<) zk5XGwq~+?PmH)1QJ&2>LCQ7XmrB;cOQ!NCtNzhV;@$I*e%*!$r9o-|SZeK@V?lz|Lc(;qJ9uv(7E4B82eb+2a(2pa_Io8`5+#{K_6O< zPGyuHV`Zb_J_H%Z2qtix;8N5(!CeF=dESi32QYLz&OddBv{QHjlVJ?kXhMt(=7?3> zgb~yy`snU34*z%ez`wCg1iO1?H;}v%A?){sDz&J4u$^4bkm>u#^=@*#m!AQCq$HoD zZVOKYwWNBmlG;Ih7M~*=!J0z!E?U&CJIsJW9#a8KmEdiS=Y_B-rUlHu&?=9zy@hQz zv3x(k_ zO?146&XA)qzbcyrVFOGeK79FX)71 zkb<46+6@7pPmxZieON(9BttNYqvkA)apKX~bw{nQhl35%|VX-H7(9PRS$f|sc;HK|rY&YtF(RN@fydmOTw pj%Rc{tK&Hxorra3j(H^*_472az^4cnKLj9QAL#%9 literal 1368 zcmZuxT~8B16g|^V+AdHE1uC}ScUwNHprV1)G@uDdk%uaY@o6YaU2VH$yCvweiT}eF zUo{ah8uS6Xn|0Z&71qu6PF-IqGB31hG!45b5Xf%i zw)t420Dax|cOtV4y(S|&9 zX}0z}Q^bo6fmF7?WhKI&RcoxK+ufYWY_5L-fvxkvQKpp+bW7Is$A_}vG)`bF>viRP z1E|Ch2ul~OJUY$22npJzE$h6AiY=>eHs!wKJ&YxRXvJ(>RsD&f8Z^}Ly`We$j9`il z=yP2f1~H@|294)^uAST(r|F)C`&ia6jTzqid0eNGK)hEm{T#@8Ti@DaQg*$s>)5U{ z0NV=ZbbB3FIHw^Fv5y}Lb0Vq)N5P5XJQcK*;5y2kGW=A-p`UHtVp)UO(##p3V zBH1aCbnLh#ro0kcEFqYk>Maq^{6wfvnYdSGgnAQB8O#qnWmH( zHVoexv@mY+EB;`SfLq-5 GA^Q)VVF1_w diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class index d70515c77ee0ca9174138ca5fda2ee12b38cce5e..1bae9fea0fdd86e062e38b89acb27d41d5b9fa0a 100644 GIT binary patch delta 191 zcmew)`AKrab9PyN1{MZx27U$s1`!5921y1X24x0e27MrH${;qGg`auLV}~pR-t0kAVYdmMDV(gFS;G zgBy_T!(cqQovV=5f`Ny@YVu#MFjhMTUIzQg5!~H^&Oj4ffVR6bXaZ?{2KUKdxHk)W Y1KsDtAjaU!V9nsi5W)~Rc?XXb0ErMH+W-In diff --git a/target/test-classes/io/zipcoder/ClassroomTest.class b/target/test-classes/io/zipcoder/ClassroomTest.class index 069b664d41f62217c6f74e5fb6c4da592a109c27..518e50e724888ff5c441de01f1179105400da372 100644 GIT binary patch literal 3987 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 From e5f0babd6002796cfabab2766e2675c4f3f7ab9d Mon Sep 17 00:00:00 2001 From: sitarameez Date: Fri, 9 Jul 2021 23:38:30 -0400 Subject: [PATCH 5/5] passed all tests --- src/main/java/io/zipcoder/Classroom.java | 24 +++++++++++------- src/test/java/io/zipcoder/ClassroomTest.java | 24 ++++++++---------- target/classes/io/zipcoder/Classroom.class | Bin 3632 -> 3631 bytes .../io/zipcoder/ClassroomTest.class | Bin 3987 -> 3991 bytes 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index 1593619..1c5cdb6 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -7,10 +7,13 @@ public class Classroom extends Student { private Student[] students; + ArrayList studentList; private ArrayList studentScores = new ArrayList<>(); private Integer maxNumberOfStudents; public Classroom(int maxNumberOfStudents){ this.maxNumberOfStudents = maxNumberOfStudents; + students=new Student[maxNumberOfStudents]; + studentList=new ArrayList<>(); } public Classroom(Student[] students ){ @@ -18,7 +21,8 @@ public Classroom(Student[] students ){ } public Classroom(){ - this.students = new Student[30]; + studentList=new ArrayList<>(); + this.students = new Student[30]; } public Student[] getStudents() { @@ -40,7 +44,7 @@ public Double getAverageExamScore(){ } public void addStudent(Student student) { - students = new Student[maxNumberOfStudents]; + //students = new Student[maxNumberOfStudents]; for(int i = 0; i < students.length; i++){ if(students[i] == null){ students[i] = student; @@ -50,15 +54,17 @@ public void addStudent(Student student) { //0,1,2,3,4 public void removeStudent(String firstName, String lastName) { - ArrayList removeStudentArrayList = new ArrayList<>(); + List removeStudentArrayList = new ArrayList<>(); if(this.students!=null){ - removeStudentArrayList=new ArrayList<>(Arrays.asList(students)); + removeStudentArrayList=new ArrayList<>(Arrays.asList(this.students)); } - for (Student student : removeStudentArrayList) { - if (student.getFirstName().equals(firstName) && student.getLastName().equals(lastName)){ - removeStudentArrayList.remove(student); - + for (int i = 0; i < removeStudentArrayList.size(); i++) { + if(removeStudentArrayList.get(i).getFirstName().equals(firstName)) + { + removeStudentArrayList.remove(i); } + + } this.students = removeStudentArrayList.toArray(new Student[0]); } @@ -84,7 +90,7 @@ public Student getStudentsByScore(){ return null; } - +//map,grade string public Map getGradeBook(){ Map gradeBook = new HashMap<>(); String grade=""; diff --git a/src/test/java/io/zipcoder/ClassroomTest.java b/src/test/java/io/zipcoder/ClassroomTest.java index 1ed5486..414edbe 100644 --- a/src/test/java/io/zipcoder/ClassroomTest.java +++ b/src/test/java/io/zipcoder/ClassroomTest.java @@ -3,6 +3,7 @@ import org.junit.Assert; import org.junit.Test; +import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Map; @@ -50,26 +51,21 @@ public void testAddStudent(){ } @Test public void testRemoveStudent() { - int maxNumberOfStudents = 3; - Classroom classroom = new Classroom(maxNumberOfStudents); Double[] examScores = { 100.0, 150.0, 250.0}; + Double[] examScores1 = { 100.0, 110.0, 250.0}; + Double[] examScores2 = { 100.0, 150.0, 290.0}; Student student = new Student("Leon", "Hunter", examScores); - Student student1 = new Student("Dolio", "Durant", examScores); - Student student2 = new Student("Kris", "Hunger", examScores); + Student student1 = new Student("Dolio", "Durant", examScores1); + Student student2 = new Student("Kris", "Hunger", examScores2); String firstName="Dolio"; String lastName="Durant"; Student[] students = new Student[]{student,student1,student2}; - classroom.addStudent(student); - classroom.addStudent(student1); - classroom.addStudent(student2); - // String firstName="Dolio"; - //String lastName="Durant"; + Classroom classroom = new Classroom(students); - classroom.removeStudent("Dolio","Durant"); + classroom.removeStudent(firstName, lastName); Student[] expected = classroom.getStudents(); Assert.assertEquals(student, expected[0]); Assert.assertEquals(student2, expected[1]); - Assert.assertEquals(expected[3], null); } @@ -78,9 +74,9 @@ public void getStudentsByScoreTest() { Double[] scores1 = new Double[]{45.0, 50.0, 55.0}; Double[] scores2 = new Double[]{60.0, 65.0}; Double[] scores3 = new Double[]{70.0, 70.0}; - Student student1 = new Student("Jimmy", "John", scores1); - Student student2 = new Student("Tammy", "Tohn", scores2); - Student student3 = new Student("Jack", "Tohn", scores3); + Student student1 = new Student("Leon", "Hunter", scores1); + Student student2 = new Student("Dolio", "Durant", scores2); + Student student3 = new Student("Kris", "Hunger", scores3); Student[] newStudents = {student1, student2, student3}; Classroom classroom = new Classroom(newStudents); diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class index 846bba00e6057b32fe01098cd40eaacba29e80a0..336deaae691e3dbd06f3d41a4caa72051b6a8d62 100644 GIT binary patch delta 1766 zcmZ8iTT@$A6#h<5a!ztM+yV)t+zM?2B&6JWqZJI!)Ug_{El8&wFAb2=v`CPIO6eu2 zD74j9dbAZ=wW3UY6Gyq}$T&XejK28bj4#gk;&1Sw!>HdrNdx+jeb)Z=UTb~dTI-xF zlzv{C{ORwn*8uFoyap8!6{j><5OJUe0~$^vDy%aq&Wh)tSYFgHgqT={h09ACMi3WH zi7brboLF8K2V)w}V_a-6h~=URpSXHS#bpgeh}e--f-OB0%nsNwp#-~4llCi0@W_O@ zvEx-G*!d8D&5p?|ypA_iOwD}n)wAM>(f-I#A{31$X8!UTm*hZ!gzPlh)fXFy#3j@k zmu2^t%~C{?rj1$4&-?O1XTs;g^`nXCV7+iXAi*7q^@Rs}!Xwde?_i|+{BWdO7!s;C z-8HVu<nL0;6RR9sbYjdd|%*0E$g>Qua`<1Jj*(TFAq1<_djcyzcg)*l(E?@H0s zQ460AzqmXtF5l4cHfD4L(XQgA4g>G#XvVuLuIRXh+dAIEtd93_hq-jz#Rob*6v#)o zr{iPHNyrycjA5HsxvJw6d}`da1#)x#tIzn|Hf@Y5C*9U~bex*xn%YBL2OZyQ6#8Kh2FA%UmuvARA%(&&K+e}`(MnENOsM}?|((}WV*m7E$;sja+YVXq&HX>$BLwAqZbaYE&OEd=bRouIa>LK zw6Qlqa&E<897LGBg}z;+SIIX>=o9_w&FJezC!VGZfgPr0VZ0MKf}@nwMO4gC3h5>y zs*ne3`#Q>1JR^!x^T4b{500g4v6oK~&XE%CmNo`2HDSlu-xJ1Xx-YwkZ)b7H>FE$x zjX!ixQcOu9w%oo0hqJWfJ`Q@6)aVqV%mgb4Hf(@fO|Xh!$p*O11a}ZroZb$_(}}_$|9ea^1|S$WMK%dMUq;aV_Zo7cCkqIRF3v delta 1785 zcmZWpYjaao6kR7bxi`7Jp>3L`gudk6rj4O3@+gW$#|N5LX-k3n4DD?Rga*?T3#dUY z@>GGVVntLCtg94>ivG5md5b$)w`v+p_ zp_D05%V6NAK4A)R!ur#3JrIZ{dt!;MSSlXdnJ_yK>@z#*SYEM8B@r4q+*SsYpi-jfN94?~H-7une?d zlY#f}zJ?DBoWq9(nlNhMBb;X|10Umpflu(MfzNP}4Gmnv=LRn0qJb}@_a(**C|}`g z>w+t+o-*(azO`<+!X>`lvHh{gP&%H7Y)+f0SUQ=q4E0!{J3f%^iY10PyHZoT**dH4 z+~|(yGXw%Pwb8pPNt(7RHrQqkr|q(C0q20d@YmE@r!~J-tvzNG^qc8uY%tvx+iP0A z+NEHKw*@G?U(!L(0TKm)h!t^Hc5JtIfQ6w6h|n)^?3jQu4ri!*60UKmKiU;*XnkewMU2hdsFUy%8(tMO`iqHU2?<}yd6x05FDJ=M@gP=O=k)f>D03BNHHCP-nuU?$ zM0ubh-`oDJX#5>s8K|i17=vfT!A}3k>zUuE4hyJ`AhofC>ZnD8t9mr@lXrX%bBnn1 z5Sndznru2U+~Hk4fhWnsqx5wsw@@U?ZxXdY6s(7A&coxY zY8}HPK}sVRthR%T8C*3NTw({8F<3qqTy6(fGN}4$TI+&p{Z;-=Z}Bc#-_0SPK>=A? zhUa+w&r^~w;BmZ2eqxO5L=V3di5Ny74xt}Mn0pd&>$0~&v|E39YebnfS> zt_Gxir<9eZq@bjgJ+xN6)>HpN%h%po?Q>>^%wC#V>&)+*`@8$>-~R1$#>tw<3jF-n z)$0K6!H*`kV_3(FS}4K=eoQEMX)LfJ7BdhvFk-^OK?8?$yli3#UJ=8qBIz|R4&!wb zM{rcEy`hDALlVKjn+8V3+A%S_W#Vm&85kF-juvVjky%=(FOWz-Zs3H0cMMF3{7Dm2 zcvl-cyJ75RiT|Vzr|_PE_YHiY<3k-E&6K!O6z6w$rW10XbpCW7&j_Q+g~eUb!Dw-J zw5PMUvUi}ZyTiiA_{2HmS?LbrQ|Bj7ARNYN3uiEG;WK=$ix=~S4Azqtv>eQU{E4Zp--om%I zX5l)%)A7B9A8=#loO)A9eSi{+j|La_sN%T8Id3e@+nHDce5ht@@d==!2DSWkp^mu< zbN?_7$3$)}yc|=o42w|&KgyAc9k>&_u@vpFu@9LTzzT`g2!pwU39My!9Q9}*W)U$T zWTf!zax|g|ZekSTAx0h|t;ECFMGo!6euQ(4s9r>tV-IvR6H*k>!e192P0+K^_6e9~CM%?c3VR;?(;Q@9(?paetA8bPU~+#<_6n4qj6hQ~WDrb5A{6aC){HueyKR0L)+lsht4{>dRtG3n@^v+{R#P-g@A2e;#)@|c5*4XA{ zWCne<$M(6`&ta{t**=d5E|91agK)zpIsv#B0hCdW`&j8l^dN{~3UUT~uG? zM%CEMNaJ>4bW6#{xye2$`84e&?BpeZ9N9yY6jDiZ7rXjzH}x(wq?EYA=u^p7tV_0{ zFy4wiX($#^jhg6HNiv~S1hvWK4asF0{I7mF-FFn+a@KZI-D>Jv!?RdR+t;z|dYZNY zqdY~EEL^AmILOKt}Vkw6`eRf_ zC%8*0cDr#07IfM~ox~xZOzKpYtaqafXxVZRELeI$kBa2;%_6A1)yPyyqpfLO=hUKA zu`NN})(fv-s{;QvVMN{b#AlTWH@c-6*Ya-zc?Iw)3TiQ(_LN%h|R&o>OAI*x;PkB^=#to$rI+GW~^OS6ez~T;# Puk8QNg>`_>6}<2_F(fC2 delta 1805 zcmZXU`&U#|6vw|a_sMXR;Kd(O;2+00t^?tRX_`|SPMd!O-CC)Ky`_l;Ws z3h;{u6?n$LaXrw?1^zs6BRuL`6&^CtZsLRo7EYRY*1#zbmg70`cwQKtj>8K$mh=SKg`v)_%!dAw)hf{FJHd|=?i=>k`R+u5f~IXjdT=P%`~ zQi&>OR9&Hbgp1Babv5;modwlbR*6d%F5`-YPw=UM&n#TU=LV)NT*DU@Dly}NTGQFv ztKQ$;eUu)m zd%NgC3$;bmkW|&`wvK}qzQ+#+ezfotex4rI{&3fqlfU@sa4~=?KC7wa^6lbV+b|2) zRSIt0A2kvcs-bK}3=l*uH5cmmu^ZLSf_XYDY}X==&t*tL0&)nt7&a{uu^TJUfxFO+ zWDFuj`f7wp+rv>`N!W*aG|*=bLu#bt=GVn&LI?_dWa9x!Dm|^ngV+U){_dpK%p|&b z>O(8B2L@W`Qe?H4ZxEtI4M>o;JUl!QELiNb!5Ts@J3B z&ta`s_j*(*c=UW17nYi$nuP^6G2=ppRzz-_v4#H%_*tl8rdPrmY(+mxNpKsElgBBP zVHi8Z7$fj0nqFX~FSGRo+P+AJi)b$`qCFo)n~9TAv|BI`MO#5``w3a&p}TQ_k{}zx zK}mKmJL+*swx1!1u8HH>;bb<HNwc2PGq+~7?Ym;4=CA3JfitIwC?~bg0O;RnJwT^h} zId2UNxRE(F5oib_%y@!nEVboil${Sp(JLpZh?M%|B-L_~pO9_Y!lDRbDm~>&VjBIW zu~35D2q*kdm~IU^cS-QKx8=Yhr&4kfBRmn~v^kcrUkc<@B7~aQ{vwdl*nU6=!B`gy zFvO&@r`fm8xn*m@_xTO4k$oLI+_1|;OB!A^qV0_KqarV<4Xh`41NaCjz|ISD_V=)b z4sg5%iQyQ>?hFTRoO3OZMJ}I-MPx^4B`%);b3QDQ1?jgvL@Ej$Eiuc%A>z?!o+0t* abe)1H$_XeQ$T