AnnaSnoeijs/AnnaConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Push version 0.3.0

Browse source
This commit is contained in:
AnnaSnoeijs 2025-08-14 18:38:22 +02:00
parent f660377768
commit bb344cb956
7 changed files with 311 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

87
connect4.c
View file

@ -28,7 +28,7 @@
#include "types.h"
#include "ui.h"
#define VERSION 0.2.0
#define VERSION 0.3.0
#ifndef GITHASH
#define FULLVERSION VERSION
@ -49,10 +49,14 @@ int main( int argc, char *argv[] ){
board_t playboard = {
.player = 0,
.rows = BOARD_HEIGHT,
.columns = BOARD_WIDTH
.columns = BOARD_WIDTH,
.count0 = {0},
.count1 = {0},
};
FILE *outputfile = NULL;
char *filename = NULL;
wins_t *wins = malloc( sizeof(wins_t) );
bool randomMoves = 0;
// Parse options
for(;;){
// Allowed options
@ -63,12 +67,14 @@ int main( int argc, char *argv[] ){
{ "columns", required_argument, NULL, 'c' },
{ "rows", required_argument, NULL, 'r' },
{ "output", required_argument, NULL, 'o' },
{ "slow-calcWins", no_argument, NULL, '\0' },
{ "random-moves", no_argument, NULL, '\0' },
{ 0 }
};
// Index of current option
int option_index = 0;
// Get next option
char c = getopt_long( argc, argv, "hlc:r:o:",
char c = (char)getopt_long( argc, argv, "hlc:r:o:",
long_options, &option_index
);
if( c == -1 ) break;
@ -79,6 +85,13 @@ int main( int argc, char *argv[] ){
case 2: // --version
printf( VERSIONSTRING );
return 0;
case 6: // --slow-calcWins
free( wins );
wins = NULL;
break;
case 7: // --random-moves
randomMoves = 1;
break;
default:
fprintf(
stderr,
@ -100,6 +113,9 @@ int main( int argc, char *argv[] ){
" -r n --rows n Set the amount of rows\n"
"\n"
" -o file --output file Ouput moves taken in game to file\n"
"\n"
" --slow-calcwins Use the 32bit reference implementation of calcWins()\n"
" --random-moves Play random moves instead of asking for input\n"
);
return 0;
case 'l': // --license
@ -150,36 +166,29 @@ int main( int argc, char *argv[] ){
"under certain condtions. See `%s --license`\n", argv[0]
);
// board, innit?
wins_t wins = {
.count0 = {
.total = 0,
.vertical = 0,
.horizontal = 0,
.diagonalUp = 0,
.diagonalDown = 0,
},
};
wins.count1 = wins.count0;
// Allocate the board
playboard.height = calloc( playboard.columns, sizeof(int) );
playboard.column = calloc( playboard.columns, sizeof(column_t) );
wins.win0 = calloc( playboard.columns, sizeof(column_t) );
wins.win1 = calloc( playboard.columns, sizeof(column_t) );
wins.same.vertical2 = calloc( playboard.columns, sizeof(column_t) );
wins.same.horizontal2 = calloc( playboard.columns, sizeof(column_t) );
wins.same.diagonalUp2 = calloc( playboard.columns, sizeof(column_t) );
wins.same.diagonalDown2 = calloc( playboard.columns, sizeof(column_t) );
wins.same.vertical4 = calloc( playboard.columns, sizeof(column_t) );
wins.same.horizontal4 = calloc( playboard.columns, sizeof(column_t) );
wins.same.diagonalUp4 = calloc( playboard.columns, sizeof(column_t) );
wins.same.diagonalDown4 = calloc( playboard.columns, sizeof(column_t) );
playboard.height = calloc( playboard.columns, sizeof(rowsint_t) );
playboard.column = calloc( playboard.columns, sizeof(column_t) );
// Initialize wins struct if used
if( wins != NULL ){
wins->win0 = calloc( playboard.columns, sizeof(column_t) );
wins->win1 = calloc( playboard.columns, sizeof(column_t) );
wins->same.vertical2 = calloc( playboard.columns, sizeof(column_t) );
wins->same.horizontal2 = calloc( playboard.columns, sizeof(column_t) );
wins->same.diagonalUp2 = calloc( playboard.columns, sizeof(column_t) );
wins->same.diagonalDown2 = calloc( playboard.columns, sizeof(column_t) );
wins->same.vertical4 = calloc( playboard.columns, sizeof(column_t) );
wins->same.horizontal4 = calloc( playboard.columns, sizeof(column_t) );
wins->same.diagonalUp4 = calloc( playboard.columns, sizeof(column_t) );
wins->same.diagonalDown4 = calloc( playboard.columns, sizeof(column_t) );
}
initBoard( playboard );
// Begin loopin
if( outputfile != NULL ){
fprintf(
outputfile,
"# File generated by " VERSIONSTRING
"# First define the config\n"
"# Here's the board size\n"
"--rows %d\n"
"--columns %d\n"
"# Now follows the moves taken, zero indexed\n"
@ -189,16 +198,36 @@ int main( int argc, char *argv[] ){
);
}
for(;; playboard.player = !playboard.player ){
columnsint_t column = askColumn( playboard );
columnsint_t column;
if( randomMoves ){
column = randomColumn( playboard );
}else{
column = askColumn( playboard );
};
if( column == QUITCOLUMN ) break;
playMove( &playboard, column );
calcWins( &wins, playboard, column );
updateBoard( wins, playboard, column );
calcWins( wins, &playboard, column );
updateBoard( playboard, column );
if( outputfile != NULL ){
fprintf( outputfile, "%d\n", column );
}
}
if( outputfile != NULL ){
fprintf( outputfile,
"# Wins\n"
"{\n"
"total,%d,%d\n"
"horizontal,%d,%d\n"
"vertical,%d,%d\n"
"diagonalUp,%d,%d\n"
"diagonalDown,%d,%d\n"
"}\n",
playboard.count0.total, playboard.count1.total,
playboard.count0.horizontal, playboard.count1.horizontal,
playboard.count0.vertical, playboard.count1.vertical,
playboard.count0.diagonalUp, playboard.count1.diagonalUp,
playboard.count0.diagonalDown, playboard.count1.diagonalDown
);
fclose( outputfile );
printf( "Output is written to %s\n", filename );
}