From 5ec18532a967480f3485c1b3f9a33ccc4bae3410 Mon Sep 17 00:00:00 2001 From: lywangj Date: Mon, 21 Feb 2022 18:26:47 +0000 Subject: [PATCH 1/8] create feature branch --- .idea/compiler.xml | 1 + .idea/misc.xml | 2 +- target/classes/edu/bristol/IMDBRating.class | Bin 0 -> 577 bytes .../test-classes/edu/bristol/IMDBRatingTest.class | Bin 0 -> 889 bytes 4 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 target/classes/edu/bristol/IMDBRating.class create mode 100644 target/test-classes/edu/bristol/IMDBRatingTest.class diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 9a536f5..e0991c0 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,6 +7,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index d31b37a..732146c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/target/classes/edu/bristol/IMDBRating.class b/target/classes/edu/bristol/IMDBRating.class new file mode 100644 index 0000000000000000000000000000000000000000..5e014bbccd866ee523f47f2db041f8af1e957014 GIT binary patch literal 577 zcmZutO-my|5PdZ>YfLivSY5wAz=NQ3*!+N91=l4IhzhO<-s~hz>@dzOotf-?4_@}a z2!bN)!5`p{T6{fb@ghxES5?2NSM{F%{e1$khm8t6_$34(K43=B9I1(F#VQ%LPI@EV z&jd4HO=7ZrfxokRUdAlSB~(IG5egRdAaC`o8E0wS>KuLlcB(Ry3#;11I~A%k=T!C^WetkE@zKF+Uu+McOi%*xhqGRUsX zSg_oEpZ|*>RD;2>{`G&JV5hU&7L=2>RPCqL6O-oSvouq&V3vPVxAG&+ZC|&I8=&#F z*Jq~=wz!B#^*kP`P{MP-)F zGYVfz@Cgfys4$kM?S2h)t}}^LSTzn&cO(5$j?71-{2kAiwLyP+E$8owSGXQY;E6)8qkKM3Dl$z5`7!k2_2-nWOugy3ZG4U z^T}sltkJ|D;D6G1hmY{mI-A_dy=Ug!bI;E2zdwEfc#hp9B8ZwWQivhWusq}!+#Ydv zV88ASMPD(*pGjA$7Yxy2scRy^uqK?)?)frM-pD>~9lbo|O1gt2Ohk3KnL-L_h7@<4 z6Y+kEG8o0fE{bERgm3e)wCh12d?h_MU`X;w((ywZXi^50XH(pE3 z#cVFb?7Pl?#2i%iOx$6}Uu{B11mv0V%5$jgQd7F(Bs}j4zr%YYs^pqppO3oSmpY#n z4Rt0-aiMuVWtAbTh`K&CXKrbFX4X7s4TcyQDSU>FYv_n7-B!H+uEobQ0k=;>SIKkH zm4PH#b=UP2{f&u_h33^>>p_Vs+4e%eFB(!$x3YK)8m?%|aSsK0V|qnE>JX=Rmol4n zMtf}M671^)-lC{s9W9Ef=>ej+PZ`5D)gzP3pJ5 Date: Mon, 21 Feb 2022 18:42:31 +0000 Subject: [PATCH 2/8] modify1 --- src/main/java/edu/bristol/IMDBRating.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/bristol/IMDBRating.java b/src/main/java/edu/bristol/IMDBRating.java index 6021d63..a620e62 100644 --- a/src/main/java/edu/bristol/IMDBRating.java +++ b/src/main/java/edu/bristol/IMDBRating.java @@ -10,7 +10,7 @@ public float addNewRating(int newRating) int previousTotal = (int) (currentAverage * ratingCount); int newTotal = previousTotal + newRating; ratingCount++; - currentAverage = newTotal / ratingCount; + currentAverage = (float) newTotal / ratingCount; return currentAverage; } } From d2ce1292c0719185f7cb303778d433603cb17e58 Mon Sep 17 00:00:00 2001 From: lywangj Date: Tue, 22 Feb 2022 09:10:49 +0000 Subject: [PATCH 3/8] modify2 --- src/main/java/edu/bristol/IMDBRating.java | 2 +- src/test/java/edu/bristol/IMDBRatingTest.java | 3 +++ .../edu/bristol/IMDBRatingTest.class | Bin 889 -> 925 bytes 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/bristol/IMDBRating.java b/src/main/java/edu/bristol/IMDBRating.java index a620e62..6021d63 100644 --- a/src/main/java/edu/bristol/IMDBRating.java +++ b/src/main/java/edu/bristol/IMDBRating.java @@ -10,7 +10,7 @@ public float addNewRating(int newRating) int previousTotal = (int) (currentAverage * ratingCount); int newTotal = previousTotal + newRating; ratingCount++; - currentAverage = (float) newTotal / ratingCount; + currentAverage = newTotal / ratingCount; return currentAverage; } } diff --git a/src/test/java/edu/bristol/IMDBRatingTest.java b/src/test/java/edu/bristol/IMDBRatingTest.java index 76a9e9c..245688f 100644 --- a/src/test/java/edu/bristol/IMDBRatingTest.java +++ b/src/test/java/edu/bristol/IMDBRatingTest.java @@ -16,5 +16,8 @@ public void testAverageRating() averageRating = rater.addNewRating(4); assertTrue(averageRating == 3.0, "Adding 2nd rating: average should be 3.0"); + + averageRating = rater.addNewRating(0); + assertTrue(averageRating == 2.0, "Adding 2nd rating: average should be 3.0"); } } diff --git a/target/test-classes/edu/bristol/IMDBRatingTest.class b/target/test-classes/edu/bristol/IMDBRatingTest.class index 3bf46f90ceb77b93866023187b52c3e1fd4bbdc5..f32e36efd0ed19d6a45d5f1166f3a59684663b15 100644 GIT binary patch delta 134 zcmey#HkWod~zJKGyoi35}N=3 delta 133 zcmXAfI|{-;6h+Ux2{T3{q837e5XHZ-vWrdjljTfp;SSt_tvj+1yeJRuHB$%GwKT4vN*>c20(QY$#KW`mP|VJp+v|9JMHvPkUQ QymK7Hf~=#y Date: Tue, 22 Feb 2022 10:38:57 +0000 Subject: [PATCH 4/8] addtest4 --- src/test/java/edu/bristol/IMDBRatingTest.java | 3 +++ .../edu/bristol/IMDBRatingTest.class | Bin 925 -> 971 bytes 2 files changed, 3 insertions(+) diff --git a/src/test/java/edu/bristol/IMDBRatingTest.java b/src/test/java/edu/bristol/IMDBRatingTest.java index 245688f..a22de16 100644 --- a/src/test/java/edu/bristol/IMDBRatingTest.java +++ b/src/test/java/edu/bristol/IMDBRatingTest.java @@ -19,5 +19,8 @@ public void testAverageRating() averageRating = rater.addNewRating(0); assertTrue(averageRating == 2.0, "Adding 2nd rating: average should be 3.0"); + + averageRating = rater.addNewRating(10); + assertTrue(averageRating == 4.0, "Adding 2nd rating: average should be 3.0"); } } diff --git a/target/test-classes/edu/bristol/IMDBRatingTest.class b/target/test-classes/edu/bristol/IMDBRatingTest.class index f32e36efd0ed19d6a45d5f1166f3a59684663b15..85f9e8617eb2d1f98bd0473cc886f5a1ccf602ae 100644 GIT binary patch delta 257 zcmbQsewv-@)W2Q(7#J9A8T2=DnK1IOIS2rGK)}u*zuA#dmr+=bfe9?Y#K6eF%D@IB z6(%<_i5V*bML|3esRSf>z-(3qWd;=>kC8zYD9*&70A#;nU}0be(s`3lF$JsZ2yks< z;Bry!6=9H>K8t~!WjO;2vyjvd2BD2WHOvekbF~<_CTlUv$BQ#WF-S1vGDw1LP=J^M zwSkWzfkBNy9cU8=LmGnygC@{6EudZz29CcB(oF0O><*0LU?kzd$e<0B0l8KONHa3% J0!bzYJpd=#90LFV delta 235 zcmXYry$ZrW5QJwhCKrN=HVW}4G5$xz##XSh(#n+fK2U1GR|pn@g`JI-K9AyD6pnA$ znVsdH`l!9f=XwLM#4Pg`;%Kx4etHuBe2|Lln@~(a3T!xJo70>sR6D*vvOEq*6B~wP z@wb2uB2I!XeU+E*D8QnZq%XBAnYIPfj^L(SD@ba2Km6_d`(>=rL!WnCY%su(w?^z# Y;k?mM8hR!5{9#Pnd?cm{CZxjj3&vj-uK)l5 From f6e1a1bfef24e19a603395586fa78e867b1f94c1 Mon Sep 17 00:00:00 2001 From: lywangj Date: Wed, 23 Feb 2022 00:21:16 +0000 Subject: [PATCH 5/8] test5 --- src/test/java/edu/bristol/IMDBRatingTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/java/edu/bristol/IMDBRatingTest.java b/src/test/java/edu/bristol/IMDBRatingTest.java index a22de16..bb95d6c 100644 --- a/src/test/java/edu/bristol/IMDBRatingTest.java +++ b/src/test/java/edu/bristol/IMDBRatingTest.java @@ -15,12 +15,15 @@ public void testAverageRating() assertTrue(averageRating == 2.0, "Adding 1st rating: average should be 2.0"); averageRating = rater.addNewRating(4); - assertTrue(averageRating == 3.0, "Adding 2nd rating: average should be 3.0"); + assertTrue(averageRating == 3, "Adding 2nd rating: average should be 3.0"); averageRating = rater.addNewRating(0); assertTrue(averageRating == 2.0, "Adding 2nd rating: average should be 3.0"); averageRating = rater.addNewRating(10); assertTrue(averageRating == 4.0, "Adding 2nd rating: average should be 3.0"); + + averageRating = rater.addNewRating(4); + assertTrue(averageRating == 4.0, "Adding 2nd rating: average should be 3.0"); } } From 7223b84596981fcaf6e4ecf089019219ed8a8183 Mon Sep 17 00:00:00 2001 From: lywangj Date: Wed, 23 Feb 2022 00:38:10 +0000 Subject: [PATCH 6/8] check2 --- src/main/java/edu/bristol/IMDBRating.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/bristol/IMDBRating.java b/src/main/java/edu/bristol/IMDBRating.java index 6021d63..4edf32e 100644 --- a/src/main/java/edu/bristol/IMDBRating.java +++ b/src/main/java/edu/bristol/IMDBRating.java @@ -7,8 +7,8 @@ public class IMDBRating public float addNewRating(int newRating) { - int previousTotal = (int) (currentAverage * ratingCount); - int newTotal = previousTotal + newRating; + float previousTotal = (currentAverage * ratingCount); + float newTotal = previousTotal + newRating; ratingCount++; currentAverage = newTotal / ratingCount; return currentAverage; From 41c2e7f00ba8e03fedb91bfe408f61dd1022309e Mon Sep 17 00:00:00 2001 From: lywangj Date: Wed, 23 Feb 2022 00:41:02 +0000 Subject: [PATCH 7/8] add target1 --- target/classes/edu/bristol/IMDBRating.class | Bin 577 -> 577 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/target/classes/edu/bristol/IMDBRating.class b/target/classes/edu/bristol/IMDBRating.class index 5e014bbccd866ee523f47f2db041f8af1e957014..381d3c91e41b5f1a9b58421b9ef056b89f045cb5 100644 GIT binary patch delta 72 zcmX@ea*$=iaYhMO73sDlH?7Dm47@A}TN!w@RJDN2w!F#r86_FHC;w#BmgQ!UXOLvz YVPIkqV2}br9tLIxMh0mH2B3%x0I72gumAu6 delta 72 zcmX@ea*$=iaYl)5TN&vDJFUnq47@A}TN!w@WVL|IoVLmL86_EcCjVsAmgQlPV~}JJ XU|<4bDIgSJU}j)skY->2ipT%}q*@J{ From 1c9c8bfc9d736b4572cc1376cca0b2497453e4a8 Mon Sep 17 00:00:00 2001 From: lywangj Date: Wed, 23 Feb 2022 00:43:11 +0000 Subject: [PATCH 8/8] add target2 --- .../edu/bristol/IMDBRatingTest.class | Bin 971 -> 1001 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/target/test-classes/edu/bristol/IMDBRatingTest.class b/target/test-classes/edu/bristol/IMDBRatingTest.class index 85f9e8617eb2d1f98bd0473cc886f5a1ccf602ae..e39d68d90953ae20ac264a9169977d2a751cc5fe 100644 GIT binary patch delta 386 zcmZ{gJud`N6o#KOGwV(!o3X}jX3Y2)*2h|lL?Ie7g+HKE=oKnas6<1#g=|Ek(y2v) zDEt6Qzrv4LaqcVyiQMEl_ni0KllR;=^I?M5&*v9lla-60?|Vf7K51`M*1bv5%Z;S> z`%;s=2^{T1DO4CzPHDEPQ8ZTCkH}pq=SnMEPAjW}24-k#Cd_Kxv5%#ShpV;o-n-K} zjgrf2jCYIYMq^Jz9ruA?yV@;Q*VK>o N?XN6p6gowMsQqCeRbVRiBIoS(Vgy!gQ;o)3j zIa|hfXb?)2Rohw*)J46NJ|XwIFs!N;xX?A#%4`E2*0mD4+Bg32CjnM_*ZI5Y9pA(x zw|9iWn84PW&(!+%5qH#4Q2hty-7i`CONt2AM@Vt`(AF>aiOHyQLW5Hhu2}T3+OwyB rVpSQk!KTKGxS+?DMojgtm}pANgoK$i{7f=oTS@W7zPhlZYS{e-nrSIg