Changeset 213

Timestamp:

01/30/07 22:17:29 (1 year ago)

Author:

ug

Message:

Fixed bug in pattern search (if !nextMove is used)

Files:

• 06/libkombilo/cpptest.cpp (modified) (2 diffs)
• 06/libkombilo/search.cpp (modified) (2 diffs)
• 06/libkombilo/testsearch.py (modified) (1 diff)

06/libkombilo/cpptest.cpp

@@ -55 +55 @@
-
-  // ------------------- set up search pattern ----------------------------------------
-
+
+
+
-  // Pattern p(CORNER_NW_PATTERN,19,7,7,".................X.....X......XO.....OO..........");
-  // Pattern p(CORNER_NW_PATTERN,19,7,7,".......................X.........................");
@@ -71 +73 @@
-  SearchOptions so;
-  // so.searchInVariations = false;
+  so.nextMove = 2;
-  
-  // -------------------- do pattern search --------------------------------------

06/libkombilo/search.cpp

@@ -714 +714 @@
-
-  if ((nextMove == 1 && cc == 'W') || (nextMove == 2 && cc == 'B')) {
-
+
+
+
-      xx = Pattern::flipsX(special, xx, yy, pattern.sizeX-1, pattern.sizeY-1);
-
+
+
-      if (cc == 'B') cc = 'W';
-      else cc = 'B';
@@ -731 +734 @@
-    else if (winner == 'W') continuations[xx + pattern.sizeX*yy].lB++;
-  } else {
+    // printf("xx %d, yy %d\n", xx, yy);
-    continuations[xx + pattern.sizeX*yy].W++;
-    if (tenuki) continuations[xx + pattern.sizeX*yy].tW++;

06/libkombilo/testsearch.py

@@ -14 +14 @@
-print gl.size(), 'games in the database'
-
-
+
+
-# p = Pattern(CENTER_PATTERN, 19, 5, 4, '..XOO'+ '...XX'+ '.....'+ '..X..') 
-so = SearchOptions()
-# so.fixedColor = True
+so.nextMove = 2
-start = time.time()
-gl.search(p, so)