Push version 0.3.0
This commit is contained in:
parent
f660377768
commit
bb344cb956
7 changed files with 311 additions and 108 deletions
213
logic.c
213
logic.c
|
|
@ -16,11 +16,13 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
#include <stdbit.h>
|
||||
#include "logic.h"
|
||||
#include "macros.h"
|
||||
|
||||
static column_t heightMask( const rowsint_t a ){
|
||||
return ( 1 << a ) - 1;
|
||||
return ( 1 << (column_t)a ) - (column_t)1;
|
||||
}
|
||||
|
||||
static column_t safeHeightMask( const rowsint_t a ){
|
||||
|
|
@ -31,6 +33,51 @@ static column_t bottomHeightMask( const rowsint_t a, const rowsint_t b ){
|
|||
return safeHeightMask( bottom( a, b ) );
|
||||
}
|
||||
|
||||
static void updateTotal( wincount_t *count ){
|
||||
count->total =
|
||||
count->horizontal
|
||||
+ count->vertical
|
||||
+ count->diagonalUp
|
||||
+ count->diagonalDown;
|
||||
}
|
||||
|
||||
// popcount for a column
|
||||
static winint_t popcnt_column( column_t column ){
|
||||
winint_t i = (winint_t)stdc_count_ones( column );
|
||||
return i;
|
||||
}
|
||||
|
||||
// Reset a wincount
|
||||
static void resetcount( wincount_t *count ){
|
||||
count->total = 0;
|
||||
count->horizontal = 0;
|
||||
count->vertical = 0;
|
||||
count->diagonalUp = 0;
|
||||
count->diagonalDown = 0;
|
||||
}
|
||||
|
||||
// Returns 0 if counts are the same
|
||||
winint_t countcmp( const board_t a, const board_t b ){
|
||||
winint_t i = 0;
|
||||
if( a.count0.total != b.count0.total ) i+=1;
|
||||
if( a.count1.total != b.count1.total ) i+=2;
|
||||
return i;
|
||||
}
|
||||
|
||||
// return a random valid column
|
||||
columnsint_t randomColumn( const board_t board ){
|
||||
columnsint_t i = 0;
|
||||
do{
|
||||
if( i == board.columns ) return QUITCOLUMN;
|
||||
}while( board.height[ i++ ] == board.rows );
|
||||
columnsint_t column;
|
||||
do{
|
||||
column = (columnsint_t)rand() % board.columns;
|
||||
}while( board.height[ column ] == board.rows );
|
||||
return column;
|
||||
}
|
||||
|
||||
// Play a move
|
||||
void playMove(
|
||||
board_t *boardptr,
|
||||
const columnsint_t column
|
||||
|
|
@ -40,17 +87,107 @@ void playMove(
|
|||
boardptr->height [ column ]++;
|
||||
}
|
||||
|
||||
// Reference implementation of calcWins()
|
||||
// Not intended for use in the main program, only for testing purposes
|
||||
// Has silly behaviour for unknown reasons
|
||||
void calcWins_slow( board_t *boardptr ){
|
||||
resetcount( &boardptr->count0 );
|
||||
resetcount( &boardptr->count1 );
|
||||
for( columnsint_t column = 0; column < boardptr->columns; column++ ){
|
||||
boardptr->count0.vertical += popcnt_column(
|
||||
~(boardptr->column[ column ]
|
||||
| boardptr->column[ column ] >> 1
|
||||
| boardptr->column[ column ] >> 2
|
||||
| boardptr->column[ column ] >> 3
|
||||
)&safeHeightMask( boardptr->height[ column ] - 3 )
|
||||
);
|
||||
boardptr->count1.vertical += popcnt_column(
|
||||
boardptr->column[ column ]
|
||||
& boardptr->column[ column ] >> 1
|
||||
& boardptr->column[ column ] >> 2
|
||||
& boardptr->column[ column ] >> 3
|
||||
);
|
||||
};
|
||||
for( columnsint_t column = 0; column < boardptr->columns - 3; column++ ){
|
||||
boardptr->count0.horizontal += popcnt_column(
|
||||
~(boardptr->column[ column ]
|
||||
| boardptr->column[ column + 1 ]
|
||||
| boardptr->column[ column + 2 ]
|
||||
| boardptr->column[ column + 3 ]
|
||||
)
|
||||
& safeHeightMask( boardptr->height[ column ] )
|
||||
& safeHeightMask( boardptr->height[ column + 1 ] )
|
||||
& safeHeightMask( boardptr->height[ column + 2 ] )
|
||||
& safeHeightMask( boardptr->height[ column + 3 ] )
|
||||
);
|
||||
boardptr->count1.horizontal += popcnt_column(
|
||||
boardptr->column[ column ]
|
||||
& boardptr->column[ column + 1 ]
|
||||
& boardptr->column[ column + 2 ]
|
||||
& boardptr->column[ column + 3 ]
|
||||
);
|
||||
boardptr->count0.diagonalUp += popcnt_column(
|
||||
~(boardptr->column[ column ]
|
||||
| boardptr->column[ column + 1 ] >> 1
|
||||
| boardptr->column[ column + 2 ] >> 2
|
||||
| boardptr->column[ column + 3 ] >> 3
|
||||
)
|
||||
& safeHeightMask( boardptr->height[ column ] )
|
||||
& safeHeightMask( boardptr->height[ column + 1 ] - 1 )
|
||||
& safeHeightMask( boardptr->height[ column + 2 ] - 2 )
|
||||
& safeHeightMask( boardptr->height[ column + 3 ] - 3 )
|
||||
);
|
||||
boardptr->count1.diagonalUp += popcnt_column(
|
||||
boardptr->column[ column ]
|
||||
& boardptr->column[ column + 1 ] >> 1
|
||||
& boardptr->column[ column + 2 ] >> 2
|
||||
& boardptr->column[ column + 3 ] >> 3
|
||||
);
|
||||
boardptr->count0.diagonalDown += popcnt_column(
|
||||
~(boardptr->column[ column ]
|
||||
| boardptr->column[ column + 1 ] << 1
|
||||
| boardptr->column[ column + 2 ] << 2
|
||||
| boardptr->column[ column + 3 ] << 3
|
||||
| 0x07 // A line diagonal down don't start at one of the bottom 3
|
||||
)
|
||||
& bottomHeightMask(
|
||||
bottom( boardptr->height[ column ],
|
||||
boardptr->height[ column + 1 ] + 1
|
||||
),
|
||||
bottom( boardptr->height[ column + 2 ] + 2,
|
||||
boardptr->height[ column + 3 ] + 3
|
||||
)
|
||||
)
|
||||
);
|
||||
boardptr->count1.diagonalDown += popcnt_column(
|
||||
boardptr->column[ column ]
|
||||
& boardptr->column[ column + 1 ] << 1
|
||||
& boardptr->column[ column + 2 ] << 2
|
||||
& boardptr->column[ column + 3 ] << 3
|
||||
);
|
||||
};
|
||||
updateTotal( &boardptr->count0 );
|
||||
updateTotal( &boardptr->count1 );
|
||||
}
|
||||
|
||||
// Less slow implementation of calcWins();
|
||||
// Only works if called after avery move
|
||||
void calcWins(
|
||||
wins_t *wins,
|
||||
const board_t board,
|
||||
board_t *boardptr,
|
||||
const columnsint_t column
|
||||
){
|
||||
// If no remembering between runs, run the reference implementation
|
||||
if( wins == NULL ) {
|
||||
calcWins_slow( boardptr );
|
||||
return;
|
||||
}
|
||||
// First the simplest win, the humble tower
|
||||
// Check for lil towers
|
||||
wins->same.vertical2 [ column ] =
|
||||
~( board.column [ column ]
|
||||
^ board.column [ column ] >> 1 )
|
||||
& safeHeightMask( board.height [ column ] - 1 );
|
||||
~( boardptr->column [ column ]
|
||||
^ boardptr->column [ column ] >> 1 )
|
||||
& safeHeightMask( boardptr->height [ column ] - 1 );
|
||||
// Actually check for wins
|
||||
column_t newcolumn =
|
||||
wins->same.vertical2 [ column ]
|
||||
|
|
@ -61,11 +198,11 @@ void calcWins(
|
|||
if(
|
||||
( newcolumn
|
||||
^ wins->same.vertical4 [ column ]
|
||||
) & board.column [ column ]
|
||||
) & boardptr->column [ column ]
|
||||
){
|
||||
wins->count1.vertical ++;
|
||||
boardptr->count1.vertical ++;
|
||||
} else {
|
||||
wins->count0.vertical ++;
|
||||
boardptr->count0.vertical ++;
|
||||
}
|
||||
wins->same.vertical4 [ column ] = newcolumn;
|
||||
}
|
||||
|
|
@ -73,36 +210,36 @@ void calcWins(
|
|||
// First connect 2
|
||||
for(
|
||||
columnsint_t i = clipped_subtract( column, 1 );
|
||||
i < bottom( column + 1, board.columns - 1 );
|
||||
i < bottom( column + 1, boardptr->columns - 1 );
|
||||
i++
|
||||
){
|
||||
wins->same.horizontal2 [ i ] =
|
||||
~( board.column [ i ]
|
||||
^ board.column [ i + 1 ] )
|
||||
~( boardptr->column [ i ]
|
||||
^ boardptr->column [ i + 1 ] )
|
||||
& bottomHeightMask(
|
||||
board.height [ i ],
|
||||
board.height [ i + 1 ]
|
||||
boardptr->height [ i ],
|
||||
boardptr->height [ i + 1 ]
|
||||
);
|
||||
wins->same.diagonalUp2 [ i ] =
|
||||
~( board.column [ i ]
|
||||
^ board.column [ i + 1 ] >> 1 )
|
||||
~( boardptr->column [ i ]
|
||||
^ boardptr->column [ i + 1 ] >> 1 )
|
||||
& bottomHeightMask(
|
||||
board.height [ i ],
|
||||
board.height [ i + 1 ] - 1
|
||||
boardptr->height [ i ],
|
||||
boardptr->height [ i + 1 ] - 1
|
||||
);
|
||||
wins->same.diagonalDown2 [ i ] =
|
||||
~( board.column [ i ]
|
||||
^ board.column [ i + 1 ] << 1 )
|
||||
~( boardptr->column [ i ]
|
||||
^ boardptr->column [ i + 1 ] << 1 )
|
||||
& bottomHeightMask(
|
||||
board.height [ i ],
|
||||
board.height [ i + 1 ] + 1
|
||||
boardptr->height [ i ],
|
||||
boardptr->height [ i + 1 ] + 1
|
||||
)
|
||||
& ~1; // A diagonal line down ain't starts at the floor innit?
|
||||
& ~(column_t)1; // A diagonal line down ain't starts at the floor innit?
|
||||
}
|
||||
// Then stitch the twos together and count
|
||||
for(
|
||||
columnsint_t i = clipped_subtract( column, 3 );
|
||||
i < bottom( column + 1, board.columns - 3 );
|
||||
i < bottom( column + 1, boardptr->columns - 3 );
|
||||
i++
|
||||
){
|
||||
newcolumn =
|
||||
|
|
@ -113,11 +250,11 @@ void calcWins(
|
|||
if(
|
||||
( newcolumn
|
||||
^ wins->same.horizontal4 [ i ]
|
||||
) & board.column [ i ]
|
||||
) & boardptr->column [ i ]
|
||||
){
|
||||
wins->count1.horizontal++;
|
||||
boardptr->count1.horizontal++;
|
||||
} else {
|
||||
wins->count0.horizontal++;
|
||||
boardptr->count0.horizontal++;
|
||||
}
|
||||
wins->same.horizontal4 [ i ] = newcolumn;
|
||||
}
|
||||
|
|
@ -129,11 +266,11 @@ void calcWins(
|
|||
if(
|
||||
( newcolumn
|
||||
^ wins->same.diagonalUp4 [ i ]
|
||||
) & board.column [ i ]
|
||||
) & boardptr->column [ i ]
|
||||
){
|
||||
wins->count1.diagonalUp++;
|
||||
boardptr->count1.diagonalUp++;
|
||||
} else {
|
||||
wins->count0.diagonalUp++;
|
||||
boardptr->count0.diagonalUp++;
|
||||
}
|
||||
wins->same.diagonalUp4 [ i ] = newcolumn;
|
||||
}
|
||||
|
|
@ -145,23 +282,15 @@ void calcWins(
|
|||
if(
|
||||
( newcolumn
|
||||
^ wins->same.diagonalDown4 [ i ]
|
||||
) & board.column [ i ]
|
||||
) & boardptr->column [ i ]
|
||||
){
|
||||
wins->count1.diagonalDown++;
|
||||
boardptr->count1.diagonalDown++;
|
||||
} else {
|
||||
wins->count0.diagonalDown++;
|
||||
boardptr->count0.diagonalDown++;
|
||||
}
|
||||
wins->same.diagonalDown4 [ i ] = newcolumn;
|
||||
}
|
||||
}
|
||||
wins->count0.total =
|
||||
wins->count0.vertical
|
||||
+ wins->count0.horizontal
|
||||
+ wins->count0.diagonalUp
|
||||
+ wins->count0.diagonalDown;
|
||||
wins->count1.total =
|
||||
wins->count1.vertical
|
||||
+ wins->count1.horizontal
|
||||
+ wins->count1.diagonalUp
|
||||
+ wins->count1.diagonalDown;
|
||||
updateTotal( &boardptr->count0 );
|
||||
updateTotal( &boardptr->count1 );
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue