From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Wed, 17 Aug 2011 20:55:21 +0000 (+0200)
Subject: Implement flipped search
X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=1f070c3ba500547459ad3df71fbdbad1e5b4b4a0

Implement flipped search
---

diff --git a/args.h b/args.h
index d3b2d70..d7a77a2 100644
--- a/args.h
+++ b/args.h
@@ -641,6 +641,7 @@ ArgDescriptor argDescriptors[] = {
   { "searchMode", ArgInt, (void *) &appData.searchMode, FALSE, (ArgIniType) 1 },
   { "stretch", ArgInt, (void *) &appData.stretch, FALSE, (ArgIniType) 1 },
   { "ignoreColors", ArgBoolean, (void *) &appData.ignoreColors, FALSE, FALSE },
+  { "findMirrorImage", ArgBoolean, (void *) &appData.findMirror, FALSE, FALSE },
 
 #if ZIPPY
   { "zippyTalk", ArgBoolean, (void *) &appData.zippyTalk, FALSE, (ArgIniType) ZIPPY_TALK },
diff --git a/backend.c b/backend.c
index e670eaf..7ffbd84 100644
--- a/backend.c
+++ b/backend.c
@@ -11180,9 +11180,9 @@ PositionMatches(Board b1, Board b2)
 
 int pieceList[256], quickBoard[256];
 ChessSquare pieceType[256] = { EmptySquare };
-Board soughtBoard, reverseBoard;
+Board soughtBoard, reverseBoard, flipBoard, rotateBoard;
 int counts[EmptySquare], minSought[EmptySquare], minReverse[EmptySquare], maxSought[EmptySquare], maxReverse[EmptySquare];
-Boolean epOK;
+Boolean epOK, flipSearch;
 
 typedef struct {
     unsigned char piece, to;
@@ -11323,7 +11323,10 @@ int QuickScan(Board board, Move *move)
 	pieceList[piece] = to;
 	cnt++;
 	if(QuickCompare(soughtBoard, minSought, maxSought) ||
-	   appData.ignoreColors && QuickCompare(reverseBoard, minReverse, maxReverse)) {
+	   appData.ignoreColors && QuickCompare(reverseBoard, minReverse, maxReverse) ||
+	   flipSearch && (QuickCompare(flipBoard, minSought, maxSought) ||
+				appData.ignoreColors && QuickCompare(rotateBoard, minReverse, maxReverse))
+	  ) {
 	    static int lastCounts[EmptySquare+1];
 	    int i;
 	    if(stretch) for(i=0; i<EmptySquare; i++) if(lastCounts[i] != counts[i]) { stretch = 0; break; } // reset if material changes
@@ -11337,6 +11340,7 @@ int QuickScan(Board board, Move *move)
 InitSearch()
 {
     int r, f;
+    flipSearch = FALSE;
     CopyBoard(soughtBoard, boards[currentMove]);
     MakePieceList(soughtBoard, maxSought);
     CopyBoard(reverseBoard, boards[currentMove]);
@@ -11346,6 +11350,20 @@ InitSearch()
 	reverseBoard[r][f] = piece;
     }
     for(r=0; r<6; r++) reverseBoard[CASTLING][r] = boards[currentMove][CASTLING][(r+3)%6];
+    if(appData.findMirror && appData.searchMode <= 3 && (!nrCastlingRights
+		 || (boards[currentMove][CASTLING][2] == NoRights || 
+		     boards[currentMove][CASTLING][0] == NoRights && boards[currentMove][CASTLING][1] == NoRights )
+		 && (boards[currentMove][CASTLING][5] == NoRights || 
+		     boards[currentMove][CASTLING][3] == NoRights && boards[currentMove][CASTLING][4] == NoRights ) )
+      ) {
+	flipSearch = TRUE;
+	CopyBoard(flipBoard, soughtBoard);
+	CopyBoard(rotateBoard, reverseBoard);
+	for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++) {
+	    flipBoard[r][f]    = soughtBoard[r][BOARD_WIDTH-1-f];
+	    rotateBoard[r][f] = reverseBoard[r][BOARD_WIDTH-1-f];
+	}
+    }
     for(r=0; r<BlackPawn; r++) maxReverse[r] = maxSought[r+BlackPawn], maxReverse[r+BlackPawn] = maxSought[r];
     if(appData.searchMode >= 5) {
 	for(r=BOARD_HEIGHT/2; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++) soughtBoard[r][f] = EmptySquare;
@@ -11448,6 +11466,10 @@ int GameContainsPosition(FILE *f, ListGame *lg)
 	ApplyMove(fromX, fromY, toX, toY, promoChar, boards[scratch]);
 	if(PositionMatches(boards[scratch], boards[currentMove])) return plyNr;
 	if(appData.ignoreColors && PositionMatches(boards[scratch], reverseBoard)) return plyNr;
+	if(appData.findMirror) {
+	    if(PositionMatches(boards[scratch], flipBoard)) return plyNr;
+	    if(appData.ignoreColors && PositionMatches(boards[scratch], rotateBoard)) return plyNr;
+	}
     }
 }
 
diff --git a/common.h b/common.h
index c018016..5dc5287 100644
--- a/common.h
+++ b/common.h
@@ -636,6 +636,7 @@ typedef struct {
     int searchMode;
     int stretch;
     Boolean ignoreColors;
+    Boolean findMirror;
     char *userName;
     int rewindIndex;    /* [HGM] autoinc   */
     int sameColorGames; /* [HGM] alternate */
diff --git a/winboard/resource.h b/winboard/resource.h
index 4f85a06..36822ef 100644
--- a/winboard/resource.h
+++ b/winboard/resource.h
@@ -618,6 +618,7 @@
 #define OPT_Stretcht                    1972
 #define OPT_Reversed                    1973
 #define OPT_SearchMode                  1974
+#define OPT_Mirror                      1975
 #define OPT_Bitmaps                     1976
 #define OPT_PieceFont                   1977
 #define OPT_MessageFont8                1978
diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 68994a0..ebb77b8 100644
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -90,7 +90,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,195,190,40,14
 END
 
-DLG_LoadOptions DIALOG DISCARDABLE  10, 18, 170, 248
+DLG_LoadOptions DIALOG DISCARDABLE  10, 18, 170, 261
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Load Game Options"
 FONT 8, "MS Sans Serif"
@@ -123,8 +123,10 @@ BEGIN
     GROUPBOX        "Search Mode: ",OPT_SearchMode,3,126,164,87,WS_GROUP
     CONTROL         "Also match reversed colors",OPT_Reversed,"Button",
                     BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,214,160,10
-    PUSHBUTTON      "OK",IDOK,56,229,50,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,112,229,50,14
+    CONTROL         "Also match left-right miror image",OPT_Mirror,"Button",
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,227,160,10
+    PUSHBUTTON      "OK",IDOK,56,242,50,14,WS_GROUP
+    PUSHBUTTON      "Cancel",IDCANCEL,112,242,50,14
 END
 
 DLG_SaveOptions DIALOG DISCARDABLE  6, 17, 178, 119
diff --git a/winboard/woptions.c b/winboard/woptions.c
index 4d579e3..40c2090 100644
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -2482,6 +2482,7 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     SetDlgItemInt(hDlg, OPT_date, appData.dateThreshold, FALSE);
     SetDlgItemInt(hDlg, OPT_Stretch, appData.stretch, FALSE);
     CheckDlgButton(hDlg, OPT_Reversed, appData.ignoreColors);
+    CheckDlgButton(hDlg, OPT_Mirror, appData.findMirror);
     switch (appData.searchMode) {
     case 1:
       CheckDlgButton(hDlg, OPT_Exact, TRUE);
@@ -2525,6 +2526,7 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       appData.stretch = GetDlgItemInt(hDlg, OPT_Stretch, &ok, FALSE);
       appData.searchMode = LoadOptionsWhichRadio(hDlg);
       appData.ignoreColors = IsDlgButtonChecked(hDlg, OPT_Reversed);
+      appData.findMirror   = IsDlgButtonChecked(hDlg, OPT_Mirror);
       EndDialog(hDlg, TRUE);
       return TRUE;
 
diff --git a/xoptions.c b/xoptions.c
index 2429c6e..eabebbe 100644
--- a/xoptions.c
+++ b/xoptions.c
@@ -589,9 +589,10 @@ Option loadOptions[] = {
 { 0, 0, 5000, NULL, (void*) &appData.eloThreshold1, "", NULL, Spin, N_("Elo of strongest player at least:") },
 { 0, 0, 5000, NULL, (void*) &appData.eloThreshold2, "", NULL, Spin, N_("Elo of weakest player at least:") },
 { 0, 0, 5000, NULL, (void*) &appData.dateThreshold, "", NULL, Spin, N_("No games before year:") },
+{ 0, 1, 50, NULL, (void*) &appData.stretch, "", NULL, Spin, N_("Minimum nr consecutive positions:") },
 { 1, 0, 180, NULL, (void*) &searchMode, (char*) modeNames, modeValues, ComboBox, N_("Seach mode:") },
 { 0, 0, 0, NULL, (void*) &appData.ignoreColors, "", NULL, CheckBox, N_("Also match reversed colors") },
-{ 0, 1, 50, NULL, (void*) &appData.stretch, "", NULL, Spin, N_("Minimum nr consecutive positions:") },
+{ 0, 0, 0, NULL, (void*) &appData.findMirror, "", NULL, CheckBox, N_("Also match left-right flipped position") },
 { 0,  0, 0, NULL, (void*) &LoadOptionsOK, "", NULL, EndMark , "" }
 };