Skip to content
Snippets Groups Projects
Commit dc5c9611 authored by remi.greub's avatar remi.greub
Browse files

améliorations pour tests unitaires

parent 64c2e016
No related branches found
No related tags found
No related merge requests found
...@@ -79,6 +79,7 @@ int put_free_cell(struct game *game, int j_p, symbol_t symbol){ ...@@ -79,6 +79,7 @@ int put_free_cell(struct game *game, int j_p, symbol_t symbol){
int i=0; int i=0;
if((i = is_cell_free(game, j_p, 0, game->players[game->curr_player].symbol)) != -1){ if((i = is_cell_free(game, j_p, 0, game->players[game->curr_player].symbol)) != -1){
game->cells[j_p][i].symbol = symbol; game->cells[j_p][i].symbol = symbol;
game->gamePlayed -= 1;
} }
return i; return i;
} }
...@@ -96,7 +97,7 @@ int is_cell_free(struct game *game, int j_p, int i, symbol_t symbol){ ...@@ -96,7 +97,7 @@ int is_cell_free(struct game *game, int j_p, int i, symbol_t symbol){
if(i<(game->height-1)){ if(i<(game->height-1)){
return is_cell_free(game, j_p, i+1, symbol); return is_cell_free(game, j_p, i+1, symbol);
}else{ }else{
printf("il n'y a plus de case de disponible sur cette colonne\n"); //printf("il n'y a plus de case de disponible sur cette colonne\n");
return -1; return -1;
} }
} }
...@@ -118,8 +119,6 @@ int Launch_puissance4(struct game *game){ ...@@ -118,8 +119,6 @@ int Launch_puissance4(struct game *game){
printf("HEP HEPHEP !! donne un chiffre dans la plage de chiffres indiquée !\n"); printf("HEP HEPHEP !! donne un chiffre dans la plage de chiffres indiquée !\n");
} }
}while((chiffre >= game->width) || (chiffre < 0) || is_cell_free(game, chiffre, 0, game->players[game->curr_player].symbol)<0); }while((chiffre >= game->width) || (chiffre < 0) || is_cell_free(game, chiffre, 0, game->players[game->curr_player].symbol)<0);
game->gamePlayed -= 1; //Complément de verbe du code
int i = 0; int i = 0;
//verifier que put free cell fonctionne //verifier que put free cell fonctionne
if((i = put_free_cell(game, chiffre, game->players[game->curr_player].symbol))<0){ if((i = put_free_cell(game, chiffre, game->players[game->curr_player].symbol))<0){
...@@ -189,7 +188,6 @@ int Launch_puissance4_randBot(struct game *game, int seed){ ...@@ -189,7 +188,6 @@ int Launch_puissance4_randBot(struct game *game, int seed){
} }
}while((chiffre >= game->width) || (chiffre < 0) || is_cell_free(game, chiffre, 0, game->players[game->curr_player].symbol)<0); }while((chiffre >= game->width) || (chiffre < 0) || is_cell_free(game, chiffre, 0, game->players[game->curr_player].symbol)<0);
} }
game->gamePlayed -= 1;
int i = 0; int i = 0;
//verifier que put free cell fonctionne //verifier que put free cell fonctionne
if((i = put_free_cell(game, chiffre, game->players[game->curr_player].symbol))<0){ if((i = put_free_cell(game, chiffre, game->players[game->curr_player].symbol))<0){
...@@ -255,7 +253,6 @@ int Launch_puissance4_smartBot(struct game *game, int seed){ ...@@ -255,7 +253,6 @@ int Launch_puissance4_smartBot(struct game *game, int seed){
} }
}while((chiffre >= game->width) || (chiffre < 0) || is_cell_free(game, chiffre, 0, game->players[game->curr_player].symbol)<0); }while((chiffre >= game->width) || (chiffre < 0) || is_cell_free(game, chiffre, 0, game->players[game->curr_player].symbol)<0);
} }
game->gamePlayed -= 1;
int i = 0; int i = 0;
//verifier que put free cell fonctionne //verifier que put free cell fonctionne
if((i = put_free_cell(game, chiffre, game->players[game->curr_player].symbol))<0){ if((i = put_free_cell(game, chiffre, game->players[game->curr_player].symbol))<0){
...@@ -300,6 +297,7 @@ int Launch_puissance4_smartBot(struct game *game, int seed){ ...@@ -300,6 +297,7 @@ int Launch_puissance4_smartBot(struct game *game, int seed){
int SmartBot(struct game *game){ int SmartBot(struct game *game){
int pos=0; int pos=0;
int chfr1 = -1, chfr2 = -1; int chfr1 = -1, chfr2 = -1;
int game_played = game->gamePlayed;
for(int chfr=0; chfr<game->width; chfr++){ for(int chfr=0; chfr<game->width; chfr++){
//verifie que le coup est jouable //verifie que le coup est jouable
if((pos = put_free_cell(game, chfr, game->players[game->curr_player].symbol))>=0){ if((pos = put_free_cell(game, chfr, game->players[game->curr_player].symbol))>=0){
...@@ -320,6 +318,7 @@ int SmartBot(struct game *game){ ...@@ -320,6 +318,7 @@ int SmartBot(struct game *game){
tempCell->symbol = EMPTY; tempCell->symbol = EMPTY;
} }
} }
game->gamePlayed = game_played;
if(chfr1 != -1){ if(chfr1 != -1){
return chfr1; return chfr1;
}else if(chfr2 != -1){ }else if(chfr2 != -1){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment