From 81a6d422799d52e6c9d1c252f751a8cdc671fb4d Mon Sep 17 00:00:00 2001 From: Eric House Date: Sun, 16 Aug 2015 09:24:42 -0700 Subject: [PATCH 1/5] fix version code --- xwords4/android/XWords4-dbg/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwords4/android/XWords4-dbg/AndroidManifest.xml b/xwords4/android/XWords4-dbg/AndroidManifest.xml index 381e8e344..bc8a109d6 100644 --- a/xwords4/android/XWords4-dbg/AndroidManifest.xml +++ b/xwords4/android/XWords4-dbg/AndroidManifest.xml @@ -22,7 +22,7 @@ to come from a domain that you own or have control over. --> From f7f4825c6763154081dbcca0a4431860965e4727 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sun, 16 Aug 2015 09:25:00 -0700 Subject: [PATCH 2/5] deal with case where file doesn't exist --- xwords4/android/scripts/mkvariant.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwords4/android/scripts/mkvariant.sh b/xwords4/android/scripts/mkvariant.sh index 56ce68943..b781f6d6d 100755 --- a/xwords4/android/scripts/mkvariant.sh +++ b/xwords4/android/scripts/mkvariant.sh @@ -40,7 +40,7 @@ do_dir() { for FILE in $SRC_PATH/*; do if [ -d $FILE ]; then do_dir $SRC_PATH $DEST_PATH $(basename $FILE) - else + elif [ -e $FILE ]; then FILE=${FILE/$SRC_PATH/$DEST_PATH} if git ls-files $FILE --error-unmatch 2>/dev/null; then echo "skipping $FILE; it's under version control within this variant" From 01b746860e5aaaf70a323531ce3cafbacd95b7e7 Mon Sep 17 00:00:00 2001 From: Eric House Date: Sun, 16 Aug 2015 09:26:48 -0700 Subject: [PATCH 3/5] add accessor for current selected player --- xwords4/common/board.c | 6 ++++++ xwords4/common/board.h | 1 + 2 files changed, 7 insertions(+) diff --git a/xwords4/common/board.c b/xwords4/common/board.c index 5e95c6f1f..6696d9d87 100644 --- a/xwords4/common/board.c +++ b/xwords4/common/board.c @@ -1823,6 +1823,12 @@ board_getTrayVisState( const BoardCtxt* board ) return board->trayVisState; } /* board_getTrayVisible */ +XP_S16 +board_getSelPlayer( const BoardCtxt* board ) +{ + return board->selPlayer; +} + static XP_Bool setTrayVisState( BoardCtxt* board, XW_TrayVisState newState ) { diff --git a/xwords4/common/board.h b/xwords4/common/board.h index 196a11c22..06f116fb1 100644 --- a/xwords4/common/board.h +++ b/xwords4/common/board.h @@ -197,6 +197,7 @@ XP_Bool board_focusChanged( BoardCtxt* board, BoardObjectType typ, XP_Bool board_hideTray( BoardCtxt* board ); XP_Bool board_showTray( BoardCtxt* board ); XW_TrayVisState board_getTrayVisState( const BoardCtxt* board ); +XP_S16 board_getSelPlayer( const BoardCtxt* board ); void board_invalTrayTiles( BoardCtxt* board, TileBit what ); XP_Bool board_juggleTray( BoardCtxt* board ); From 8065e55b98eea688adc8c8f02856669196737b2b Mon Sep 17 00:00:00 2001 From: Eric House Date: Sun, 16 Aug 2015 09:38:55 -0700 Subject: [PATCH 4/5] pipe board_getSelPlayer() through jni --- xwords4/android/XWords4/jni/xwjni.c | 12 ++++++++++++ .../src/org/eehouse/android/xw4/jni/XwJNI.java | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/xwords4/android/XWords4/jni/xwjni.c b/xwords4/android/XWords4/jni/xwjni.c index 4beaceee0..4acbec37d 100644 --- a/xwords4/android/XWords4/jni/xwjni.c +++ b/xwords4/android/XWords4/jni/xwjni.c @@ -949,6 +949,18 @@ Java_org_eehouse_android_xw4_jni_XwJNI_board_1getActiveRect } #endif +JNIEXPORT jint JNICALL +Java_org_eehouse_android_xw4_jni_XwJNI_board_1getSelPlayer +( JNIEnv* env, jclass C, jint gamePtr ) +{ + jint result; + XWJNI_START(); + result = board_getSelPlayer( state->game.board ); + XWJNI_END(); + return result; +} + + JNIEXPORT jboolean JNICALL Java_org_eehouse_android_xw4_jni_XwJNI_board_1handlePenDown (JNIEnv *env, jclass C, jint gamePtr, jint xx, jint yy, jbooleanArray barray ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java index 2f3da7be4..eaf8c29e3 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java @@ -235,7 +235,7 @@ public class XwJNI { boolean[] canZoom ); public static native boolean board_getActiveRect( int gamePtr, Rect rect, int[] dims ); - + public static native int board_getSelPlayer( int gamePtr ); public static native boolean board_handlePenDown( int gamePtr, int xx, int yy, boolean[] handled ); From c8fcc32c2c3d88613c347119d4e87ee3a017caf7 Mon Sep 17 00:00:00 2001 From: Eric House Date: Mon, 14 Sep 2015 08:49:52 -0700 Subject: [PATCH 5/5] When two moves are identical (i.e. a one-letter word that forms two words words) drop one when looking for hints --- xwords4/common/engine.c | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/xwords4/common/engine.c b/xwords4/common/engine.c index 334c69342..18a513696 100644 --- a/xwords4/common/engine.c +++ b/xwords4/common/engine.c @@ -1,6 +1,6 @@ /* -*- compile-command: "cd ../linux && make -j3 MEMDEBUG=TRUE"; -*- */ /* - * Copyright 1997 - 2012 by Eric House (xwords@eehouse.org). All rights + * Copyright 1997 - 2015 by Eric House (xwords@eehouse.org). All rights * reserved. * * This program is free software; you can redistribute it and/or @@ -39,11 +39,10 @@ typedef struct BlankTuple { } BlankTuple; typedef struct PossibleMove { - XP_U16 score; /* Because I'm doing a memcmp to sort these things, - the comparison must be done differently on - little-endian platforms. */ + XP_U16 score; /* Because I'm doing a memcmp to sort these things, the + comparison must be done differently on little-endian + platforms. */ MoveInfo moveInfo; - //XP_U16 whichBlanks; /* flags */ Tile blankVals[MAX_COLS]; /* the faces for which we've substituted blanks */ } PossibleMove; @@ -1088,12 +1087,26 @@ considerMove( EngineCtxt* engine, Tile* tiles, XP_S16 tileLength, posmove.moveInfo.isHorizontal = engine->searchHorizontal; posmove.moveInfo.commonCoord = (XP_U8)lastRow; - considerScoreWordHasBlanks( engine, engine->blankCount, &posmove, lastRow, blankTuples, 0 ); } } /* considerMove */ +static XP_Bool +countWords( const XP_UCHAR* XP_UNUSED(word), XP_Bool isLegal, + const DictionaryCtxt* XP_UNUSED(dict), +#ifdef XWFEATURE_BOARDWORDS + const MoveInfo* movei, XP_U16 start, + XP_U16 end, +#endif + void* closure ) +{ + XP_U16* wcp = (XP_U16*)closure; + if ( isLegal ) { + ++*wcp; + } +} + static void considerScoreWordHasBlanks( EngineCtxt* engine, XP_U16 blanksLeft, PossibleMove* posmove, @@ -1104,11 +1117,19 @@ considerScoreWordHasBlanks( EngineCtxt* engine, XP_U16 blanksLeft, if ( blanksLeft == 0 ) { XP_U16 score; + XP_U16 nTiles = posmove->moveInfo.nTiles; + WordNotifierInfo* wiip = NULL; + WordNotifierInfo wii; + XP_U16 wordCount = 0; + if ( 1 == nTiles ) { + wii.proc = countWords; + wii.closure = &wordCount; + wiip = &wii; + } score = figureMoveScore( engine->model, engine->turn, &posmove->moveInfo, - engine, (XWStreamCtxt*)NULL, - (WordNotifierInfo*)NULL ); + engine, (XWStreamCtxt*)NULL, wiip ); #ifdef XWFEATURE_BONUSALL if ( 0 != engine->allTilesBonus && 0 == engine->nTilesMax ) { XP_LOGF( "%s: adding bonus: %d becoming %d", __func__, score , @@ -1119,7 +1140,9 @@ considerScoreWordHasBlanks( EngineCtxt* engine, XP_U16 blanksLeft, /* First, check that the score is even what we're interested in. If it is, then go to the expense of filling in a PossibleMove to be compared in full */ - if ( scoreQualifies( engine, score ) ) { + if ( 1 == nTiles && 1 < wordCount && !engine->searchHorizontal ) { + XP_LOGF( "%s(): dropping", __func__ ); + } else if ( scoreQualifies( engine, score ) ) { posmove->score = score; XP_MEMSET( &posmove->blankVals, 0, sizeof(posmove->blankVals) ); for ( ii = 0; ii < usedBlanksCount; ++ii ) {