Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-01 06:19:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix next-hint which I just broke: need to track whether working on

Browse source 
behalf of robot after all, though it's not needed in the API, to
distinguish case where moves must be cached (for next-hint feature).
This commit is contained in:
Andy2 2011-01-11 18:10:48 -08:00
parent ceab787cdd
commit 6ccf0c167c
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
xwords4/common/engine.c
View file

@ -97,6 +97,7 @@ struct EngineCtxt {
XP_U16 nMovesToSave;
XP_U16 star_row;
XP_Bool returnNOW;
XP_Bool isRobot;
MoveIterationData miData;
XP_S16 blankValues[MAX_TRAY_TILES];
@ -322,7 +323,6 @@ chooseMove( EngineCtxt* engine, PossibleMove** move )
PossibleMove* chosen = NULL;
XP_Bool result;
XP_Bool done;
XP_Bool isRobot;
print_savedMoves( engine, "unsorted moves" );
@ -332,7 +332,6 @@ chooseMove( EngineCtxt* engine, PossibleMove** move )
start applying other criteria than score to moves. */
done = !move_cache_empty( engine );
isRobot = 0 < engine->nMovesToSave;
while ( !done ) { /* while so can break */
done = XP_TRUE;
PossibleMove* cur = engine->miData.savedMoves;
@ -349,21 +348,21 @@ chooseMove( EngineCtxt* engine, PossibleMove** move )
}
if ( done ) {
if ( !isRobot ) {
if ( !engine->isRobot ) {
init_move_cache( engine );
}
print_savedMoves( engine, "sorted moves" );
}
}
/* now pick the one we're supposed to return */
if ( isRobot ) {
XP_ASSERT( engine->miData.nInMoveCache <= NUM_SAVED_ENGINE_MOVES );
XP_ASSERT( engine->miData.nInMoveCache <= engine->nMovesToSave );
/* PENDING not nInMoveCache-1 below?? */
chosen = &engine->miData.savedMoves[engine->miData.nInMoveCache];
} else {
chosen = next_from_cache( engine );
}
/* now pick the one we're supposed to return */
if ( engine->isRobot ) {
XP_ASSERT( engine->miData.nInMoveCache <= NUM_SAVED_ENGINE_MOVES );
XP_ASSERT( engine->miData.nInMoveCache <= engine->nMovesToSave );
/* PENDING not nInMoveCache-1 below?? */
chosen = &engine->miData.savedMoves[engine->miData.nInMoveCache];
} else {
chosen = next_from_cache( engine );
}
*move = chosen; /* set either way */
@ -373,7 +372,7 @@ chooseMove( EngineCtxt* engine, PossibleMove** move )
if ( !result ) {
engine_reset( engine );
}
LOG_RETURNF( "%d", result );
LOG_RETURNF( "%s", result?"true":"false" );
return result;
} /* chooseMove */
@ -386,9 +385,10 @@ chooseMove( EngineCtxt* engine, PossibleMove** move )
static void
normalizeIQ( EngineCtxt* engine, XP_U16 iq )
{
engine->isRobot = 0 < iq;
if ( 0 == iq ) { /* human */
engine->nMovesToSave = NUM_SAVED_ENGINE_MOVES; /* save 'em all */
} else if ( 1 == iq ) { /* human */
} else if ( 1 == iq ) { /* smartest robot */
engine->nMovesToSave = 1;
} else {
XP_U16 count = NUM_SAVED_ENGINE_MOVES * iq / 100;