summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2019-08-04 16:10:07 -0600
committermo khan <mo@mokhan.ca>2019-08-04 16:10:07 -0600
commit167320aa00317cf4b6c60a50b01c19824654f64f (patch)
tree7a9c64c6017555c2336ee2e89e415463ac36d212
parent286134fd7208611e1f1f70a2c46e7c314bb14fb2 (diff)
ensure max continuous points calc works for player 1
-rw-r--r--src/Q8/BadmintonScoringWithStroke.java10
-rw-r--r--src/Q8/BadmintonScoringWithStrokeTest.java6
2 files changed, 9 insertions, 7 deletions
diff --git a/src/Q8/BadmintonScoringWithStroke.java b/src/Q8/BadmintonScoringWithStroke.java
index f9baa8c..4922571 100644
--- a/src/Q8/BadmintonScoringWithStroke.java
+++ b/src/Q8/BadmintonScoringWithStroke.java
@@ -72,14 +72,16 @@ public class BadmintonScoringWithStroke extends BadmintonScoring {
}
private int[][] to2DArray(ArrayList<Point> points) {
- int[][] scores = new int[points.size()][2];
+ int[][] scores = new int[points.size() + 1][2];
+ scores[0][Point.PLAYER1] = 0;
+ scores[0][Point.PLAYER2] = 0;
for (int i = 0; i < points.size(); i++) {
Point point = points.get(i);
- scores[i][Point.PLAYER1] = i == 0 ? 0 : scores[i - 1][Point.PLAYER1];
- scores[i][Point.PLAYER2] = i == 0 ? 0 : scores[i - 1][Point.PLAYER2];
- scores[i][point.getPlayer()] = point.getScore();
+ scores[i + 1][Point.PLAYER1] = i == 0 ? 0 : scores[i - 1][Point.PLAYER1];
+ scores[i + 1][Point.PLAYER2] = i == 0 ? 0 : scores[i - 1][Point.PLAYER2];
+ scores[i + 1][point.getPlayer()] = point.getScore();
}
return scores;
diff --git a/src/Q8/BadmintonScoringWithStrokeTest.java b/src/Q8/BadmintonScoringWithStrokeTest.java
index e997324..b763283 100644
--- a/src/Q8/BadmintonScoringWithStrokeTest.java
+++ b/src/Q8/BadmintonScoringWithStrokeTest.java
@@ -67,9 +67,9 @@ public class BadmintonScoringWithStrokeTest extends TestCase {
assertEquals(21, this.subject.getPlayer2Points());
}
- // public void test_getContinuousPointsPlayer1() {
- // assertEquals(2, this.subject.getContinuousPointsPlayer1());
- // }
+ public void test_getContinuousPointsPlayer1() {
+ assertEquals(2, this.subject.getContinuousPointsPlayer1());
+ }
// public void test_getContinuousPointsPlayer2() {
// assertEquals(9, this.subject.getContinuousPointsPlayer2());