Changeset 180

Timestamp:

09/15/06 22:49:02 (2 years ago)

Author:

ug

Message:

Several bug fixes. Implemented use of format string, sort criteria.

Files:

• 06/libkombilo (modified) (1 prop)
• 06/libkombilo/cpptest.cc (modified) (1 diff)
• 06/libkombilo/process.py (modified) (1 diff)
• 06/libkombilo/search.cc (modified) (63 diffs)
• 06/libkombilo/search.h (modified) (13 diffs)
• 06/libkombilo/sgfparser.cc (modified) (1 diff)
• 06/libkombilo/sgfparser.h (modified) (1 diff)
• 06/libkombilo/testsearch.py (modified) (2 diffs)

06/libkombilo/cpptest.cc

@@ -2 +2 @@
-
-int main() {
-
-
+
-        gl.gisearch("pw = 'Hane Naoki'");
-
-
+
-  PatternList pl(p, 0, 0, 19);
-        SearchOptions so;
-        gl.search(pl, so);
-gl.printAll(
+printf("num games: %d\n", gl.size()
-}

06/libkombilo/process.py

@@ -19 +19 @@
-
-    starttime = time.time()
-
+ # | ALGO_HASH_FULL
-    try:
-
+pw,pb,re,dt%%1 - %2 (%3), %4
-    except DBError:
-        print 'Database error'

06/libkombilo/search.cc

@@ -26 +26 @@
-#include "search.h"
-#include <stdio.h>
+#include <string>
-#include <cstring>
-#include <iostream>
-
-
-PatternError::PatternError() {}
@@ -44 +43 @@
-
-Symmetries::Symmetries(char sX, char sY) {
-  // cout << "Enter method Symmetries::Symmetries" << endl; 
-  sizeX = sX;
-  sizeY = sY;
@@ -163 +161 @@
-
-Pattern::Pattern() {
-  // cout << "Enter method Pattern::Pattern()" << endl; 
-  initialPos = 0;
-  finalPos = 0;
-  contList = 0;
-  bits = 0;
-  bitlengths = 0; // FIXME?!
-        flip = 0;
-        colorSwitch = 0;
@@ -176 +171 @@
-
-
+Pattern::Pattern(int type, int boardsize, int sX, int sY,
+                 char* iPos, char* cList, int lenCList, char mOne) {
+  flip = 0;
+  colorSwitch = 0;
+  if (mOne=='B' || mOne=='X') moveOne = 'X';
+  else moveOne = 'O';
+  if (moveOne == 'X') moveTwo = 'O';
+  else moveTwo = 'X';
+  sizeX = sX;
+  sizeY = sY;
+
+        if (type == CORNER_NW_PATTERN || type == FULLBOARD_PATTERN) {
+    left = right = top = bottom = 0;
+        } else if (type == CORNER_NE_PATTERN) {
+                top = bottom = 0;
+    left = right = boardsize -1 - sizeX;
+        } else if (type == CORNER_SE_PATTERN) {
+                top = bottom = boardsize -1 - sizeY;
+    left = right = boardsize -1 - sizeX;
+        } else if (type == CORNER_SW_PATTERN) {
+                top = bottom = boardsize -1 - sizeY;
+                left = right = 0;
+        } else if (type == SIDE_N_PATTERN) {
+                top = bottom = 0;
+                left = 1;
+                right = boardsize -1 - sizeX;
+        } else if (type == SIDE_E_PATTERN) {
+    left = right = boardsize -1 - sizeX;
+                top = 1;
+                bottom = boardsize -1 - sizeY;
+        } else if (type == SIDE_W_PATTERN) {
+                left = right = 0;
+                top = 1;
+                bottom = boardsize -1 - sizeY;
+        } else if (type == SIDE_S_PATTERN) {
+                top = bottom = boardsize -1 - sizeY;
+                left = 1;
+                right = boardsize -1 - sizeX;
+        } else if (type == CENTER_PATTERN) {
+                left = top = 1;
+                right = boardsize -1 - sizeX;
+                bottom = boardsize -1 - sizeY;
+        }
+
+  initialPos = new char[sizeX * sizeY];
+  finalPos = new char[sizeX*sizeY];
+  for(int i=0; i<sizeX*sizeY; i++) {
+    initialPos[i] = iPos[i];
+    finalPos[i] = iPos[i];
+  }
+
+  lenContList = lenCList;
+  contList = new char[lenCList*4+1];
+  for(int i=0; i<4*lenCList; i++) contList[i] = cList[i];
+  for(int i=0; i<lenContList; i++) {
+    finalPos[contList[4*i] + sizeX * contList[4*i+1]] = BW2XO(contList[4*i+2]);
+  }
+  contList[lenCList*4] = 0;
+}
+
-Pattern::Pattern(int le, int ri, int to, int bo, int sX, int sY,
-                 char* iPos, char* cList, int lenCList, char mOne) {
-  // cout << "Enter method Pattern::Pattern" << endl; 
-  flip = 0;
-  colorSwitch = 0;
@@ -191 +245 @@
-  bottom = bo;
-
-  // anchors.sort();
-        
-  sizeX = sX;
-  sizeY = sY;
@@ -210 +262 @@
-  }
-  contList[lenCList*4] = 0;
-
-  bits = new char_p[4];
-  bitlengths = new int[4];
-
-  for(int i=0; i<2; i++) {
-    for(int j=0; j<2; j++) {
-      int xBlocks = (sizeY+i+1)/2;
-      int yBlocks = (sizeX+j+1)/2;
-      char* nextBlock = new char[400];
-      int nextBlockIndex = 0;
-      nextBlock[nextBlockIndex++] = yBlocks;
-
-      for(int k1=0; k1 < yBlocks; k1++) {
-        char nlist[400];
-        int nlistIndex = 0;
-
-        for(int k2=0; k2 < xBlocks; k2++) {
-          int n = 0;
-          for(int x=0; x<2; x++) {
-            for(int y=0; y<2; y++) {
-              int indexX = k1 * 2 + y - j;
-              int indexY = k2 * 2 + x - i;
-              if (0 <= indexX && indexX < sizeX && 0 <= indexY && indexY < sizeY) {
-                if (getFinal(indexX,indexY)=='X')
-                  n |= 1 << (2*(2*x+y));
-                else if (getFinal(indexX,indexY)=='O')
-                  n |= 1 << (2*(2*x+y)+1);
-              }
-            }
-          }
-          nlist[nlistIndex++] = n;
-        }              
-
-        int start = 0;
-        int end = nlistIndex;
-
-        while (start < end && !nlist[start]) start++;
-        while (end > start && !nlist[end-1]) end--;
-
-        nextBlock[nextBlockIndex++] = start;
-        nextBlock[nextBlockIndex++] = end-start;
-        for(int current=start; current < end; current++) 
-          nextBlock[nextBlockIndex++] = nlist[current];
-      }
-      char* nB = new char[nextBlockIndex];
-      for(int ii=0; ii<nextBlockIndex; ii++) nB[ii] = nextBlock[ii];
-      bitlengths[2*i + j] = nextBlockIndex;
-      bits[2*i + j] = nB;
-      delete [] nextBlock;
-    }
-  }
-  // cout << "Leave method Pattern::Pattern(...)" << endl; 
-}
-
-Pattern::~Pattern() {
-  // cout << "Enter method Pattern::~Pattern" << endl; 
-  if (initialPos) delete [] initialPos;
-  if (finalPos) delete [] finalPos;
-  if (contList) delete [] contList;
-  if (bitlengths) {
-    delete [] bitlengths;
-    for(int i=0; i<4; i++)
-      if (bits[i]) delete [] bits[i];
-    delete [] bits;
-  }
-  // cout << "Leave method Pattern::~Pattern" << endl; 
-}
-
-Pattern::Pattern(const Pattern& p) {
-  // cout << "Enter method Pattern::Pattern(const Pattern&)" << endl; 
-  left = p.left;
-  right = p.right;
@@ -303 +294 @@
-  }
-  else contList = 0;
-  if (p.bitlengths) {
-    bits = new char_p[4];
-    bitlengths = new int[4];
-
-    for(int i=0; i<4; i++) {
-      bitlengths[i] = p.bitlengths[i];
-      if (bitlengths[i]>0) bits[i] = new char[bitlengths[i]];
-      else {
-        bits[i] = 0;
-        continue;
-      }
-      for(int j=0; j<bitlengths[i]; j++)
-        bits[i][j] = p.bits[i][j];
-    }
-  }
-  else {
-    bits = 0;
-    bitlengths = 0;
-  }
-}
-
-Pattern& Pattern::operator=(const Pattern& p) {
-  // cout << "Enter method Pattern::operator=" << endl; 
-  if (&p != this) {
-    left = p.left;
@@ -341 +312 @@
-    if (finalPos) delete [] finalPos;
-    if (contList) delete [] contList;
-    if (bits) delete [] bits;
-    if (bitlengths) delete [] bitlengths;
-    
-    initialPos = new char[sizeX*sizeY];
@@ -355 +324 @@
-    contList[lenContList*4] = 0;
-
-    if (p.bitlengths) {
-      bits = new char_p[4];
-      bitlengths = new int[4];
-
-      for(int i=0; i<4; i++) {
-        bitlengths[i] = p.bitlengths[i];
-        if (bitlengths[i]>0) bits[i] = new char[bitlengths[i]];
-        else {
-          bits[i] = 0;
-          continue;
-        }
-        for(int j=0; j<bitlengths[i]; j++)
-          bits[i][j] = p.bits[i][j];
-      }
-    }
-    else {
-      bits = 0;
-      bitlengths = 0;
-    }
-  }
-  return *this;
-  // cout << "Leave method Pattern::op= " << endl; 
-}
-
-
-Pattern& Pattern::copy(const Pattern& p) {
-  // cout << "Enter method Pattern::copy" << endl; 
-  if (&p != this) {
-    left = p.left;
@@ -397 +345 @@
-    if (finalPos) delete [] finalPos;
-    if (contList) delete [] contList;
-    if (bits) delete [] bits;
-    if (bitlengths) delete [] bitlengths;
-    
-    initialPos = new char[sizeX*sizeY];
@@ -410 +356 @@
-    for(int i = 0; i < lenContList*4; i++) contList[i] = p.contList[i];
-    contList[lenContList*4] = 0;
-
-    if (p.bitlengths) {
-      bits = new char_p[4];
-      bitlengths = new int[4];
-
-      for(int i=0; i<4; i++) {
-        bitlengths[i] = p.bitlengths[i];
-        if (bitlengths[i]>0) bits[i] = new char[bitlengths[i]];
-        else {
-          bits[i] = 0;
-          continue;
-        }
-        for(int j=0; j<bitlengths[i]; j++)
-          bits[i][j] = p.bits[i][j];
-      }
-    }
-    else {
-      bits = 0;
-      bitlengths = 0;
-    }
-  }
-  return *this;
-  // cout << "Leave method Pattern::copy " << endl; 
-}
-
@@ -482 +407 @@
-
-PatternList::PatternList(Pattern& p, int fColor, int nMove, int bsize) {
-  // cout << "Enter method PatternList::PatternList(...)" << endl; 
-  pattern.copy(p);
-  fixedColor = fColor;
@@ -488 +412 @@
-  boardsize = bsize;
-  special = -1;
-  // cout << "BP1" << endl; 
-
-  patternList();
-        continuations = new Continuation[pattern.sizeX * pattern.sizeY];
-
-
-
+
+
+
+
+
-
-PatternList::PatternList(const PatternList& pl) {
@@ -504 +429 @@
-  return *this;
-}
-
-        
-char PatternList::invertColor(char co) {
@@ -517 +441 @@
-        
-void PatternList::patternList() {
-  // cout << "Enter method PatternList::patternList" << endl; 
-        
-  vector<Pattern> lCS;
@@ -581 +504 @@
-
-    if (pNew == pattern) sy.push_back(pair<int,int>(f,0));
-    // cout << "BP2" << endl; 
-
-    if (nextMove || !fixedColor) {
@@ -736 +658 @@
-                        else cc = 'B';
-                        cSymm = 1-cSymm;
-
+
+
+
-        }
-
@@ -757 +681 @@
-}
-
+
+char* PatternList::sortContinuations() {
+        char* labels = new char[pattern.sizeX*pattern.sizeY+1];
+        labels[pattern.sizeX * pattern.sizeY] = 0;
+        for(int i=0; i<pattern.sizeX*pattern.sizeY; i++) {
+                if (continuations[i].B || continuations[i].W) labels[i] = '?'; // need to assign label
+                else labels[i] = '.';
+        }
+        string labelList = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+        int labelIndex = 0;
+
+        // FIXME assign labels which are already in the SGF file
+        
+        // now give labels to the remaining points, starting with the one with
+        // most hits
+        
+  int max_hits = 0;
+        int max_hits_index;
+        while (max_hits != -1 && labelIndex < labelList.size()) {
+                for(int i=0; i<pattern.sizeX*pattern.sizeY; i++) {
+                        if (labels[i] == '?' && continuations[i].B + continuations[i].W > max_hits) {
+                                max_hits = continuations[i].B + continuations[i].W;
+                                max_hits_index = i;
+                        }
+                }
+                if (max_hits != 0) { // found another point needing a label
+                        labels[max_hits_index] = labelList[labelIndex++];
+                        max_hits = 0;
+                } else max_hits = -1; // done
+        }
+  return labels;
+}
-
-DBError::DBError() {
@@ -1017 +973 @@
-void Algo_finalpos::search(PatternList& patternList, GameList& gl, SearchOptions& options) { // progress bar?!
-
+        // Put the pattern into bitmap format, which is the format the final
+        // positions are stored in in the database. This makes the comparisons
+        // faster.
+
+        int plS = patternList.size();
+        char_p** allbits = new char_p*[plS];
+  int** allbitlengths = new int*[plS];
+        for(int N=0; N<plS; N++) {
+                Pattern* pattern = &patternList.data[N];
+                allbits[N] = new char_p[4];
+                allbitlengths[N] = new int[4];
+
+                for(int i=0; i<2; i++) {
+                        for(int j=0; j<2; j++) {
+                                int xBlocks = (pattern->sizeY+i+1)/2;
+                                int yBlocks = (pattern->sizeX+j+1)/2;
+                                char* nextBlock = new char[400];
+                                int nextBlockIndex = 0;
+                                nextBlock[nextBlockIndex++] = yBlocks;
+
+                                for(int k1=0; k1 < yBlocks; k1++) {
+                                        char nlist[400];
+                                        int nlistIndex = 0;
+
+                                        for(int k2=0; k2 < xBlocks; k2++) {
+                                                int n = 0;
+                                                for(int x=0; x<2; x++) {
+                                                        for(int y=0; y<2; y++) {
+                                                                int indexX = k1 * 2 + y - j;
+                                                                int indexY = k2 * 2 + x - i;
+                                                                if (0 <= indexX && indexX < pattern->sizeX && 0 <= indexY && indexY < pattern->sizeY) {
+                                                                        if (pattern->getFinal(indexX,indexY)=='X')
+                                                                                n |= 1 << (2*(2*x+y));
+                                                                        else if (pattern->getFinal(indexX,indexY)=='O')
+                                                                                n |= 1 << (2*(2*x+y)+1);
+                                                                }
+                                                        }
+                                                }
+                                                nlist[nlistIndex++] = n;
+                                        }              
+
+                                        int start = 0;
+                                        int end = nlistIndex;
+
+                                        while (start < end && !nlist[start]) start++;
+                                        while (end > start && !nlist[end-1]) end--;
+
+                                        nextBlock[nextBlockIndex++] = start;
+                                        nextBlock[nextBlockIndex++] = end-start;
+                                        for(int current=start; current < end; current++) 
+                                                nextBlock[nextBlockIndex++] = nlist[current];
+                                }
+                                char* nB = new char[nextBlockIndex];
+                                for(int ii=0; ii<nextBlockIndex; ii++) nB[ii] = nextBlock[ii];
+                                allbitlengths[N][2*i + j] = nextBlockIndex;
+                                allbits[N][2*i + j] = nB;
+                                delete [] nextBlock;
+                        }
+                }
+        }
+
-        int index = gl.start();
-        int counter = 0; // to keep track of progress bar
-        int plS = patternList.size();
-        // printf("%d patterns\n", plS);
-  char start;
@@ -1045 +1061 @@
-
-                                        int pIndex = 2*(a1%2) + (a0%2);
-pattern->bits
+allbits[N]
-                                        int pbIndex = 0;
-                                        int fpIndex = a1/2 + (a0/2)*10;
@@ -1074 +1090 @@
-                index = gl.next();
-        }
+        for(int N=0; N<plS; N++) {
+    delete [] allbitlengths[N];
+    for(int i=0; i<4; i++)
+      if (allbits[N][i]) delete [] allbits[N][i];
+    delete [] allbits[N];
+  }
+        delete [] allbitlengths;
+        delete [] allbits;
-}
-
@@ -1084 +1108 @@
-
-Algo_movelist::~Algo_movelist() {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        if (data1l) delete data1l;
-}
@@ -1260 +1294 @@
-                // branchpoints = [];
-
+                // printf("oh oh\n");
-                char* movel = (*data1)[index-1];
-                int movelistIndex = 0;
-                int endMovelist = (*data1l)[index-1];
+                // printf("oh oh\n");
-                // printf("len movelist: %d\n", (*data1l)[index-1]);
-                // int nodeCtr = 0;
@@ -1293 +1329 @@
-                        int dNO = 0;
-                        Pattern* p = &patternList.data[m->orientation];
-X
+Y
-                        for(int i=0; i<p->sizeX; i++) {
-                                for(int j=0; j<p->sizeY; j++) {
@@ -1359 +1395 @@
-
-                        if (!(movel[movelistIndex+1] & REMOVE) && (movel[movelistIndex+1] & (BLACK | WHITE))) {
+                                // printf("mv\n");
-                                if (movel[movelistIndex+1] & BLACK) {
-                                        co = 'X';
@@ -1403 +1440 @@
-                                                        } else {
-                                                                if (dictsDR[mCounter]) { // don't restore
-
+
+
-                                                                        dicts[mCounter] = 0;
-                                                                        continue;
@@ -1416 +1454 @@
-                                                        if (!(fpC[y/4 + 5*(x/2)] & (1 << (x%2 + 2*(y%4))))) {
-                                                                if (!contListIndex[mCounter]) {
-
+
+
-                                                                        dicts[mCounter] = 0;
-                                                                        continue;
@@ -1428 +1467 @@
-                                                        if (!(fpC[y/4 + 5*(x/2)] & (1 << (x%2 + 2*(y%4))))) {
-                                                                if (!contListIndex[mCounter]) {
-
+
+
-                                                                        dicts[mCounter] = 0;
-                                                                        continue;
@@ -1443 +1483 @@
-                        }
-                        else if (movel[movelistIndex+1] & REMOVE) {
+                                // printf("rmv\n");
-                                if (movel[movelistIndex+1] & BLACK) {
-                                        co = 'X';
@@ -1470 +1511 @@
-                                                                } else {
-                                                                        if (dictsDR[mCounter]) {
-
+
+
-                                                                                dicts[mCounter] = 0;
-                                                                                continue;
@@ -1500 +1542 @@
-
-                        if (endOfNode) {
+                                // printf("eon\n");
-                                for (int mCounter = 0; mCounter < currentMatchList->size(); mCounter++) {
-                                        if (!dicts[mCounter]) continue;
@@ -1529 +1572 @@
-                                        if (p->colorSwitch && showColorSwap) {
-                                                char* rstr = new char[3];
-0
+NO_CONT
-                                                rstr[1] = 0;
-                                                rstr[2] = 1;
@@ -1535 +1578 @@
-                                        } else {
-                                                char* rstr = new char[3];
-0
+NO_CONT
-                                                rstr[1] = 0;
-                                                rstr[2] = 0;
@@ -1556 +1599 @@
-                        }
-                        gl.makeCurrentHit(result);
-
+ else delete result;
-                index = gl.next();
-                for(int mCounter=0; mCounter<currentMatchList->size(); mCounter++)
-       
+  
-                delete [] dicts;
-                delete [] dictsDR;
@@ -1571 +1614 @@
-                delete [] contListIndex;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -1626 +1747 @@
-}
-
-int
+long long
-        char* sql = "insert into algo_hash (hash, game, position) values (?,?,?);";
-        sqlite3_stmt *ppStmt=0;
-        int rc = sqlite3_prepare(db, sql, -1, &ppStmt, 0);
-        if (rc != SQLITE_OK || ppStmt==0) return rc; // FIXME: catch certain errors, (and/or throw DBError?)
-
+64
-        if (rc != SQLITE_OK) return rc;
-        rc = sqlite3_bind_text(ppStmt, 2, game, -1, SQLITE_TRANSIENT); 
@@ -1661 +1782 @@
-        moveNumber = new ExtendedMoveNumber(0);
-        currentHashCode = 0; // start with empty board
-int
+long long
-  // branchpoints = []; FIXME
-}
-
-void Algo_hash::AB_process(int x, int y) {
-