Fixes to Exercise 4.2 starter code

chalonverse · chalonverse · commit 349eaccffde2 · 2018-01-15T21:19:18.000-08:00
diff --git a/Exercises/4.2/Board.cpp b/Exercises/4.2/Board.cpp
@@ -20,7 +20,7 @@ BoardState::BoardState()
 	}
 }
 
-std::vector<BoardState*> BoardState::GetPossibleMoves() const
+std::vector<BoardState*> BoardState::GetPossibleMoves(SquareState player) const
 {
 	std::vector<BoardState*> retVal;
 
@@ -32,7 +32,7 @@ std::vector<BoardState*> BoardState::GetPossibleMoves() const
 			if (mBoard[row][col] == BoardState::Empty)
 			{
 				retVal.emplace_back(new BoardState(*this));
-				retVal.back()->mBoard[row][col] = BoardState::Red;
+				retVal.back()->mBoard[row][col] = player;
 				break;
 			}
 		}
@@ -96,7 +96,7 @@ bool BoardState::IsFull() const
 
 int BoardState::GetFourInARow() const
 {
-	// Returns 1 if yellow wins, -1 if red wins, 0 otherwise
+	// Returns -1 if yellow wins, 1 if red wins, 0 otherwise
 
 	// Check if there's a row with four in a row
 	for (int row = 0; row < 6; row++)
@@ -109,11 +109,11 @@ int BoardState::GetFourInARow() const
 			{
 				if (mBoard[row][col] == BoardState::Yellow)
 				{
-					return 1;
+					return -1;
 				}
 				else if (mBoard[row][col] == BoardState::Red)
 				{
-					return -1;
+					return 1;
 				}
 			}
 		}
@@ -130,11 +130,11 @@ int BoardState::GetFourInARow() const
 			{
 				if (mBoard[row][col] == BoardState::Yellow)
 				{
-					return 1;
+					return -1;
 				}
 				else if (mBoard[row][col] == BoardState::Red)
 				{
-					return -1;
+					return 1;
 				}
 			}
 		}
@@ -144,18 +144,18 @@ int BoardState::GetFourInARow() const
 	for (int col = 0; col < 4; col++)
 	{
 		for (int row = 0; row < 3; row++)
-		{ 
+		{
 			if (mBoard[row][col] == mBoard[row + 1][col + 1] &&
 				mBoard[row][col] == mBoard[row + 2][col + 2] &&
 				mBoard[row][col] == mBoard[row + 3][col + 3])
 			{
 				if (mBoard[row][col] == BoardState::Yellow)
 				{
-					return 1;
+					return -1;
 				}
 				else if (mBoard[row][col] == BoardState::Red)
 				{
-					return -1;
+					return 1;
 				}
 			}
 		}
@@ -172,11 +172,11 @@ int BoardState::GetFourInARow() const
 			{
 				if (mBoard[row][col] == BoardState::Yellow)
 				{
-					return 1;
+					return -1;
 				}
 				else if (mBoard[row][col] == BoardState::Red)
 				{
-					return -1;
+					return 1;
 				}
 			}
 		}
@@ -209,7 +209,7 @@ bool TryPlayerMove(BoardState* state, int column)
 void CPUMove(BoardState* state)
 {
 	// For now, this just randomly picks one of the possible moves
-	std::vector<BoardState*> moves = state->GetPossibleMoves();
+	std::vector<BoardState*> moves = state->GetPossibleMoves(BoardState::Red);
 
 	int index = Random::GetIntRange(0, moves.size() - 1);
 
diff --git a/Exercises/4.2/Board.h b/Exercises/4.2/Board.h
@@ -12,12 +12,12 @@
 class BoardState
 {
 public:
+	enum SquareState { Empty, Red, Yellow };
 	BoardState();
-	std::vector<BoardState*> GetPossibleMoves() const;
+	std::vector<BoardState*> GetPossibleMoves(SquareState player) const;
 	bool IsTerminal() const;
 	float GetScore() const;
 
-	enum SquareState { Empty, Red, Yellow };
 	SquareState mBoard[6][7];
 protected:
 	bool IsFull() const;

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ BoardState::BoardState()`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`-std::vector<BoardState*> BoardState::GetPossibleMoves() const`
	`23`	`+std::vector<BoardState*> BoardState::GetPossibleMoves(SquareState player) const`
`24`	`24`	`{`
`25`	`25`	`std::vector<BoardState*> retVal;`
`26`	`26`
`@@ -32,7 +32,7 @@ std::vector<BoardState*> BoardState::GetPossibleMoves() const`
`32`	`32`	`if (mBoard[row][col] == BoardState::Empty)`
`33`	`33`	`{`
`34`	`34`	`retVal.emplace_back(new BoardState(*this));`
`35`		`- retVal.back()->mBoard[row][col] = BoardState::Red;`
	`35`	`+ retVal.back()->mBoard[row][col] = player;`
`36`	`36`	`break;`
`37`	`37`	`}`
`38`	`38`	`}`
`@@ -96,7 +96,7 @@ bool BoardState::IsFull() const`
`96`	`96`
`97`	`97`	`int BoardState::GetFourInARow() const`
`98`	`98`	`{`
`99`		`- // Returns 1 if yellow wins, -1 if red wins, 0 otherwise`
	`99`	`+ // Returns -1 if yellow wins, 1 if red wins, 0 otherwise`
`100`	`100`
`101`	`101`	`// Check if there's a row with four in a row`
`102`	`102`	`for (int row = 0; row < 6; row++)`
`@@ -109,11 +109,11 @@ int BoardState::GetFourInARow() const`
`109`	`109`	`{`
`110`	`110`	`if (mBoard[row][col] == BoardState::Yellow)`
`111`	`111`	`{`
`112`		`- return 1;`
	`112`	`+ return -1;`
`113`	`113`	`}`
`114`	`114`	`else if (mBoard[row][col] == BoardState::Red)`
`115`	`115`	`{`
`116`		`- return -1;`
	`116`	`+ return 1;`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`}`
`@@ -130,11 +130,11 @@ int BoardState::GetFourInARow() const`
`130`	`130`	`{`
`131`	`131`	`if (mBoard[row][col] == BoardState::Yellow)`
`132`	`132`	`{`
`133`		`- return 1;`
	`133`	`+ return -1;`
`134`	`134`	`}`
`135`	`135`	`else if (mBoard[row][col] == BoardState::Red)`
`136`	`136`	`{`
`137`		`- return -1;`
	`137`	`+ return 1;`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`}`
`@@ -144,18 +144,18 @@ int BoardState::GetFourInARow() const`
`144`	`144`	`for (int col = 0; col < 4; col++)`
`145`	`145`	`{`
`146`	`146`	`for (int row = 0; row < 3; row++)`
`147`		`- {`
	`147`	`+ {`
`148`	`148`	`if (mBoard[row][col] == mBoard[row + 1][col + 1] &&`
`149`	`149`	`mBoard[row][col] == mBoard[row + 2][col + 2] &&`
`150`	`150`	`mBoard[row][col] == mBoard[row + 3][col + 3])`
`151`	`151`	`{`
`152`	`152`	`if (mBoard[row][col] == BoardState::Yellow)`
`153`	`153`	`{`
`154`		`- return 1;`
	`154`	`+ return -1;`
`155`	`155`	`}`
`156`	`156`	`else if (mBoard[row][col] == BoardState::Red)`
`157`	`157`	`{`
`158`		`- return -1;`
	`158`	`+ return 1;`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`	`}`
`@@ -172,11 +172,11 @@ int BoardState::GetFourInARow() const`
`172`	`172`	`{`
`173`	`173`	`if (mBoard[row][col] == BoardState::Yellow)`
`174`	`174`	`{`
`175`		`- return 1;`
	`175`	`+ return -1;`
`176`	`176`	`}`
`177`	`177`	`else if (mBoard[row][col] == BoardState::Red)`
`178`	`178`	`{`
`179`		`- return -1;`
	`179`	`+ return 1;`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`	`}`
`@@ -209,7 +209,7 @@ bool TryPlayerMove(BoardState* state, int column)`
`209`	`209`	`void CPUMove(BoardState* state)`
`210`	`210`	`{`
`211`	`211`	`// For now, this just randomly picks one of the possible moves`
`212`		`- std::vector<BoardState*> moves = state->GetPossibleMoves();`
	`212`	`+ std::vector<BoardState*> moves = state->GetPossibleMoves(BoardState::Red);`
`213`	`213`
`214`	`214`	`int index = Random::GetIntRange(0, moves.size() - 1);`
`215`	`215`