Pushing to be able to update branch.

This commit is contained in:
Alexander Huddleston 2015-10-27 21:19:24 -05:00
parent 5ce0163f77
commit d13b1661ee
3 changed files with 22 additions and 17 deletions

View file

@ -28,7 +28,8 @@ Board::Board(const Board& b) {
vector<Piece*> xp = b.getXPieces(); vector<Piece*> xp = b.getXPieces();
vector<Piece*> op = b.getOPieces(); vector<Piece*> op = b.getOPieces();
Piece* temp; Piece* temp;
bool valid = false; //bool valid = false;
//char tempturn = b.getTurn();
for (int i = 0; i < xp.size(); ++i) { for (int i = 0; i < xp.size(); ++i) {
temp = new Piece(xp[i]->getX(), xp[i]->getY(), 'X'); temp = new Piece(xp[i]->getX(), xp[i]->getY(), 'X');

View file

@ -69,7 +69,7 @@ void Engine::easyAI()
srand(time(NULL)); srand(time(NULL));
int randomChoice = rand() % (listOfMoves.size()-1) - 0; int randomChoice = rand() % (listOfMoves.size()-1) - 0;
int temp = randomChoice; //int temp = randomChoice;
cout << "easy AI move: " << listOfMoves[randomChoice].row << listOfMoves[randomChoice].column << listOfMoves[randomChoice].moveType << "\n"; cout << "easy AI move: " << listOfMoves[randomChoice].row << listOfMoves[randomChoice].column << listOfMoves[randomChoice].moveType << "\n";
b->move(listOfMoves[randomChoice]); b->move(listOfMoves[randomChoice]);
b->changeTurns(); b->changeTurns();
@ -78,7 +78,7 @@ void Engine::easyAI()
void Engine::AI(){ void Engine::AI(){
cout << "----------------------BEGIN AI FUNCTION----------------------\n"; cout << "----------------------BEGIN AI FUNCTION----------------------\n";
vector<moves> listOfMoves = b->viewPossibleMoves(); vector<moves> listOfMoves = b->viewPossibleMoves();
//Board* b = new Board(*b); Board* temp = new Board(*b);
//probably not needed, check later //probably not needed, check later
/* /*
@ -92,7 +92,7 @@ void Engine::AI(){
minMax(b, listOfMoves[i]); minMax(b, listOfMoves[i]);
}*/ }*/
b->move(minMax(listOfMoves[0], 0)); b->move(minMax(temp, listOfMoves[0], 0));
b->changeTurns(); b->changeTurns();
//verification of correct turn //verification of correct turn
@ -105,37 +105,41 @@ void Engine::AI(){
cout << "----------------------END AI FUNCTION----------------------\n"; cout << "----------------------END AI FUNCTION----------------------\n";
} }
moves Engine::minMax(moves m, int c){ moves Engine::minMax(Board* temp, moves m, int c){
//testing purposes only, c = finite depth //testing purposes only, c = finite depth
/*
cout << "c: " << c << "\n\n";
cout << "current turn: " << temp->getTurn() << "\n";
vector<moves> listOfMoves = temp->viewPossibleMoves();
if (c > 5){ if (c > 5){
return m; return m;
} }
if (b->isGameOver() == true){ if (temp->isGameOver() == true){
cout << "END OF PATH REACHED\n"; cout << "END OF PATH REACHED\n";
return m; return m;
} }
else { else {
if(b->isThisMovePossible(8 - m.row, b->charToIntColumn(m.column), m.moveType)){ if(temp->isThisMovePossible(m.row, m.column, m.moveType) && temp->getPiece(m.row, m.column)->getType() == temp->getTurn()){
cout << "piece has been moved in minMax\n"; cout << "piece has been moved in minMax\n";
b->move(m); temp->move(m);
b->changeTurns(); temp->changeTurns();
temp->displayBoard();
}
else {
m = minMax(temp, listOfMoves[c+1], c+1);
} }
cout << "c: " << c << "\n\n";
cout << "current turn: " << b->getTurn() << "\n";
vector<moves> listOfMoves = b->viewPossibleMoves();
for (int i = 0; i < listOfMoves.size(); ++i){ for (int i = 0; i < listOfMoves.size(); ++i){
//return minMax(b, listOfMoves[i]); //return minMax(b, listOfMoves[i]);
} }
b->displayBoard(); temp->displayBoard();
//limited recursion //limited recursion
return minMax(b, listOfMoves[0], ++c); minMax(temp, listOfMoves[c], ++c);
//testing //testing
return m; return m;
}*/ }
} }

View file

@ -12,5 +12,5 @@ public:
void startGame(); void startGame();
void easyAI(); void easyAI();
void AI(); void AI();
moves minMax(moves m, int c); moves minMax(Board* temp, moves m, int c);
}; };