From 04556f5214e994eca65222a18e9c85afb3db72b9 Mon Sep 17 00:00:00 2001 From: Quatrani Paul Date: Wed, 3 Nov 2021 16:24:56 -0400 Subject: [PATCH 1/4] Fleshed out all methods --- .../zipcodewilmington/tictactoe/Board.java | 88 ++++++++++++++++++- 1 file changed, 84 insertions(+), 4 deletions(-) diff --git a/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java b/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java index f56452f..2615cf8 100644 --- a/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java +++ b/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java @@ -4,23 +4,103 @@ * @author leon on 6/22/18. */ public class Board { + Character[][] matrix; public Board(Character[][] matrix) { + this.matrix = matrix; } public Boolean isInFavorOfX() { - return null; + if(matrix[0][0] == 'X'){ + if (matrix[0][1] == 'X'){ + if(matrix[0][2] == 'X'){ + return true; + } + } + if(matrix[1][0] == 'X'){ + if(matrix[2][0] == 'X'){ + return true; + } + } + if(matrix[1][1] == 'X'){ + if(matrix[2][2] == 'X'){ + return true; + } + } + } + if(matrix[0][2] == 'X') { + if (matrix[1][1] == 'X') { + if (matrix[2][0] == 'X') { + return true; + } + } + if (matrix[1][2] == 'X') { + if (matrix[2][2] == 'X') { + return true; + } + } + } + if(matrix[0][1] == 'X'){ + if(matrix[1][1] == 'X'){ + if(matrix[2][1] == 'X'){ + return true; + } + } + } + return false; } public Boolean isInFavorOfO() { - return null; + if(matrix[0][0] == 'O'){ + if (matrix[0][1] == 'O'){ + if(matrix[0][2] == 'O'){ + return true; + } + } + if(matrix[1][0] == 'O'){ + if(matrix[2][0] == 'O'){ + return true; + } + } + if(matrix[1][1] == 'O'){ + if(matrix[2][2] == 'O'){ + return true; + } + } + } + if(matrix[0][2] == 'O'){ + if (matrix[1][1] == 'O'){ + if(matrix[2][0] == 'O'){ + return true; + } + } + if(matrix[1][2] == 'O'){ + if(matrix[2][2] == 'O'){ + return true; + } + } + if(matrix[0][1] == 'O'){ + if(matrix[1][1] == 'O'){ + if(matrix[2][1] == 'O'){ + return true; + } + } + } + return false; } public Boolean isTie() { - return null; + return !(this.isInFavorOfX() && this.isInFavorOfO()); } public String getWinner() { - return null; + if(this.isInFavorOfX()){ + return "X"; + } + if(this.isInFavorOfO()){ + return "O"; + } + } + return ""; } } From df603f040db425d0d7d888005fb6526379d16390 Mon Sep 17 00:00:00 2001 From: Quatrani Paul Date: Wed, 3 Nov 2021 16:25:42 -0400 Subject: [PATCH 2/4] Added a bracket --- src/main/java/rocks/zipcodewilmington/tictactoe/Board.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java b/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java index 2615cf8..99d1f15 100644 --- a/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java +++ b/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java @@ -67,12 +67,13 @@ public Boolean isInFavorOfO() { } } } - if(matrix[0][2] == 'O'){ - if (matrix[1][1] == 'O'){ - if(matrix[2][0] == 'O'){ + if(matrix[0][2] == 'O') { + if (matrix[1][1] == 'O') { + if (matrix[2][0] == 'O') { return true; } } + } if(matrix[1][2] == 'O'){ if(matrix[2][2] == 'O'){ return true; From 713827a705f36dae601fac358b28fea8198f9881 Mon Sep 17 00:00:00 2001 From: Quatrani Paul Date: Wed, 3 Nov 2021 16:26:18 -0400 Subject: [PATCH 3/4] removed a bracket --- src/main/java/rocks/zipcodewilmington/tictactoe/Board.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java b/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java index 99d1f15..c1ea57c 100644 --- a/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java +++ b/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java @@ -100,7 +100,6 @@ public String getWinner() { if(this.isInFavorOfO()){ return "O"; } - } return ""; } From 32b879370e5509c917fb3a30d9769c9917ff566b Mon Sep 17 00:00:00 2001 From: Quatrani Paul Date: Wed, 3 Nov 2021 16:58:47 -0400 Subject: [PATCH 4/4] made some 0's O's --- .../zipcodewilmington/tictactoe/Board.java | 54 ++++++++++++++----- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java b/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java index c1ea57c..0dab4ce 100644 --- a/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java +++ b/src/main/java/rocks/zipcodewilmington/tictactoe/Board.java @@ -46,17 +46,31 @@ public Boolean isInFavorOfX() { } } } + if(matrix[1][0] == 'X'){ + if(matrix [1][1] == 'X'){ + if(matrix [1][2] == 'X'){ + return true; + } + } + } + if(matrix[2][0] == 'X'){ + if(matrix[2][1] == 'X'){ + if(matrix[2][2] == 'X'){ + return true; + } + } + } return false; } public Boolean isInFavorOfO() { - if(matrix[0][0] == 'O'){ - if (matrix[0][1] == 'O'){ - if(matrix[0][2] == 'O'){ + if(matrix[0][0] == 'O'){//0 + if (matrix[0][1] == 'O'){// - 0 + if(matrix[0][2] == 'O'){//--0 return true; } } - if(matrix[1][0] == 'O'){ + if(matrix[1][0] == 'O'){//vertical if(matrix[2][0] == 'O'){ return true; } @@ -73,24 +87,38 @@ public Boolean isInFavorOfO() { return true; } } + if (matrix[1][2] == 'O') { + if (matrix[2][2] == 'O') { + return true; + } + } } - if(matrix[1][2] == 'O'){ - if(matrix[2][2] == 'O'){ + if(matrix[0][1] == 'O'){ + if(matrix[1][1] == 'O'){ + if(matrix[2][1] == 'O'){ + return true; + } + } + } + if(matrix[1][0] == 'O'){ + if(matrix[1][1] == 'O'){ + if(matrix[1][2] == 'O') { return true; } } - if(matrix[0][1] == 'O'){ - if(matrix[1][1] == 'O'){ - if(matrix[2][1] == 'O'){ - return true; - } + } + if(matrix [2][0] == 'O'){ + if(matrix[2][1] == 'O'){ + if(matrix[2][2] == 'O'){ + return true; } } - return false; + } + return false; } public Boolean isTie() { - return !(this.isInFavorOfX() && this.isInFavorOfO()); + return !(this.isInFavorOfX() || this.isInFavorOfO()); } public String getWinner() {