Changeset 253 for 06/libkombilo/search.cpp

Timestamp:

06/02/07 16:04:49 (1 year ago)

Author:

ug

Message:

Fixed bug in search with wildcards.

Files:

• 06/libkombilo/search.cpp (modified) (6 diffs)

06/libkombilo/search.cpp

@@ -1777 +1777 @@
-
-    while (movelistIndex < endMovelist) {
+      // printf("\nnextmove %d\n", counter.total_move_num());
-      if (counter.total_move_num() == movelimit+1) {
-        for(vector<MovelistCand* >::iterator it = cands->begin(); it != cands->end(); it++) {
@@ -1845 +1846 @@
-          if (*it == 0) continue;
-          if ((*it)->in_relevant_region(x,y)) {
+            // printf("loop 1\n %c", (*it)->dictsget(x,y));
-            if ((*it)->dictsFound) { // found, so now we have found the continuation
+              // printf("found\n");
-              char* label;
-              label = patternList.updateContinuations(
@@ -1893 +1896 @@
-              } else {
-                (*it)->dictsset(x,y,'.');
-
+ // printf("++ A\n");
-              }
-            } else if ((*it)->dictsget(x,y) == lower_invco) {
@@ -1904 +1907 @@
-                  continue;
-                } else (*it)->dictsDR = true;
-
+ // printf("++ B\n");
-            } else if ((*it)->dictsget(x,y) == co) {
-              // this move gives us the stone we are looking for
-              (*it)->dictsset(x,y,0);
-
+ // printf("-- A\n");
-            }
-          }
@@ -1917 +1920 @@
-          co = 'X';
-          invco = 'O';
+          lower_invco = 'o';
-        } else if (movel[movelistIndex+1] & WHITE) {
-          co = 'O';
-          invco = 'X';
+          lower_invco = 'x';
-        }
-
-        for(vector<MovelistCand* >::iterator it = cands->begin(); it != cands->end(); it++) {
+          // printf("loop 2\n");
-          if (*it == 0) continue;
-          if (!(*it)->dictsFound) { // not found yet
@@ -1953 +1959 @@
-                // since it was captured, we are once again looking for it:
-                (*it)->dictsset(x,y,co);
-
+ // printf("++ C\n");
-              }
-              else if ((*it)->dictsget(x,y) == lower_invco) { 
-
+ // printf("-- B\n");
-              }
-              else if ((*it)->dictsget(x,y) == '.') {
-                // we are looking for an empty spot here, so this capture is helpful:
-                (*it)->dictsset(x,y,0);
-
+ // printf("-- C\n");
-              }
-            }