Changeset 230

Timestamp:

03/02/07 00:27:09 (1 year ago)

Author:

ug

Message:

Fixed continuation statistics for Algo_hash_full.

Files:

• 06/libkombilo/cpptest.cpp (modified) (4 diffs)
• 06/libkombilo/search.cpp (modified) (8 diffs)
• 06/libkombilo/search.h (modified) (1 diff)

06/libkombilo/cpptest.cpp

@@ -67 +67 @@
-  // Pattern p(2,3,4,6, 19, 3, 3, ".X.XXXXOX", vector<MoveNC>()); 
-  
-
+// 
-  // Pattern p(CORNER_NW_PATTERN,19,7,7,".................X.....X......XO.....OO..........");
-  // Pattern p(CORNER_NW_PATTERN,19,7,7,".......................X.........................");
-
-  // gl.gisearch("pw = 'Hane Naoki'");
-// 
+
-  // vector<MoveNC> contList;
-  // contList.push_back(MoveNC(6,15,'X'));
@@ -80 +80 @@
-  // Pattern p(FULLBOARD_PATTERN, 19, 19, 19, "..O.O....X...XXXXX.OOXO....OXO.XXOOOXOXXXXOO.OOXO.OXO..O..X.X..OOX,X.XO.O.....XOOOXOXX..XO......X.XOXXX..XXXO........XOX..XXOOXO.OOO.....OOXOXOO.O...XX...X..OXXOO.XOX........O..OX.,..X..X.....X...OX...X..........O....XXXO...XO...X...OOOXOOXX...X....O..OX.O..OX..........OXX....OX..OO..O.OOOOX..O.OX..XX..OOXXXOX.XOOX..X....XXXXXOX...OX.......X.O.XO.............");
-
+  // Pattern p(FULLBOARD_PATTERN,19,19,19,"........................................................................O......................................................................................................................................................................................................................X.........................................................................");
+
-  // -------------------- set up search options ----------------------------------
-  SearchOptions so;
+  // so.trustHashFull = true;
-  // SearchOptions so(0,0,50); // use move limit
-  // so.searchInVariations = false;
@@ -90 +93 @@
-
-  // ------------------- print some information about current list of games ------------
-=%d\n", gl.size(), gl.numHits(), gl.num_hits
+\n", gl.size(), gl.numHits()
-  // vector<string> res = gl.currentEntriesAsStrings();
-  // for(vector<string>::iterator it = res.begin(); it != res.end(); it++)
@@ -110 +113 @@
-  printf("num hits: %d, num switched: %d, B wins: %d, W wins: %d\n", gl.num_hits, gl.num_switched, gl.Bwins, gl.Wwins);
-
-( B wins / W wins ) | White
+     ( B wins / W wins ) | White     
-  for(int y=0; y<p.sizeY; y++) {
-    for(int x=0; x<p.sizeX; x++) {
-      if (gl.lookupLabel(x,y) != '.') {
-        Continuation cont = gl.lookupContinuation(x,y);
- (    %3d /    %3d ) |   %3d
-wB, cont.lB, cont.
+[%3d] (    %3d /    %3d ) |   %3d[%3d]
+tB, cont.wB, cont.lB, cont.W, cont.t
-            cont.wW*100.0/cont.W, cont.wB*100.0/cont.B);
-      }

06/libkombilo/search.cpp

@@ -722 +722 @@
-  yy = symmetries[index].getY(x,y);
-  cSymm = symmetries[index].getCS(x,y);
-
+ || co == 'B'
-    if (cSymm) cc = 'W'; else cc = 'B';
-  } else {
@@ -2313 +2313 @@
-
-int Algo_hash_full::search(PatternList& patternList, GameList& gl, SearchOptions& options, sqlite3* db) {
+  // printf("enter algo_hash_full::search\n");
+  int numOfHits = 0;
+  int self_numOfSwitched = 0;
+  int Bwins = 0;
+  int Wwins = 0;
+
-  int hash_result = -1; // -1 = failure; 0 = ok, but have to check w/ Algo_movelist, 1 = ok, produced final result
-  int plS = patternList.size();
@@ -2336 +2342 @@
-
-      if (hash_result) {
+        gl.setCurrentFromIndex(index);
+        int numOfSwitched = 0;
-        vector<Hit* >* hits = new vector<Hit* >;
-        while ((*resultIT)->gameid == index) {
@@ -2346 +2354 @@
-            label = patternList.updateContinuations((*resultIT)->orientation, 
-                                                    (*resultIT)->cont->x, (*resultIT)->cont->y, (*resultIT)->cont->color,
-
+
+
-            if (label) {
-              hits->push_back(new Hit((*resultIT)->emn, label));
-              (*resultIT)->emn = 0;
+              numOfSwitched += label[2];
-            }
-          } else {
@@ -2356 +2366 @@
-            label[1] = 0;
-            label[2] = patternList.data[(*resultIT)->orientation].colorSwitch;
+            numOfSwitched += label[2];
-            hits->push_back(new Hit((*resultIT)->emn, label));
-            (*resultIT)->emn = 0;
@@ -2362 +2373 @@
-          if (resultIT == results->end()) break;
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-      } else { // produce Candidate list, check using another algorithm
-        vector<Candidate* >* candidates = new vector<Candidate* >;
@@ -2379 +2400 @@
-    gl.end_sorted();
-  }
-
+
+
+
+
+
-}
-
@@ -3736 +3761 @@
-  sort(gle->hits->begin(), gle->hits->end(), Hit::cmp_pts);
-  currentList->push_back((*oldList)[current]);
+}
+
+void GameList::setCurrentFromIndex(int index) {
+  int start = current;
+  int end = oldList->size();
+  int m = start;
+  while (start < end) {
+    m = (end+start)/2;
+    if (index == (*oldList)[m].first) {
+      break;
+    } else {
+      if (index < (*oldList)[m].first) end = m;
+      else start = m+1;
+    }
+  }
+  current = m;
-}
-

06/libkombilo/search.h

@@ -658 +658 @@
-    void makeIndexCandidate(int index, std::vector<Candidate* > *candidates);
-    void makeIndexHit(int index, std::vector<Hit* > *hits);
+    void setCurrentFromIndex(int index);
-
-  private: