Changeset 242 for 06/libkombilo-branches

Timestamp:

03/18/07 23:37:15 (22 months ago)

Author:

ug

Message:

Hashing for center position works now. Further testing is required.
Processing is still too slow at the moment.

Location:

06/libkombilo-branches/hash_center

Files:

• cpptest.cpp (modified) (3 diffs)
• process.py (modified) (1 diff)
• search.cpp (modified) (39 diffs)
• search.h (modified) (7 diffs)
• test_hash_center2.py (added)
• test_hash_center.py (added)

06/libkombilo-branches/hash_center/cpptest.cpp

@@ -31 +31 @@
     // string path = "/home/ug/go/kombilo/06/hash_center";
     // string path = "/home/ug/go/gtl/reviews";
-    string path = "/home/ug/go/gogod06/2000";
+    string path = "/home/ug/go/gogod06/2001";
     int counter = 0;
     for(directory_iterator it(path); it != end_itr; ++it) {
@@ -71 +71 @@
   // Pattern p(2,3,4,6, 19, 3, 3, ".X.XXXXOX", vector<MoveNC>()); 
 
-//   Pattern p(CORNER_NW_PATTERN,19,8,8,
+//   Pattern p(CORNER_NW_PATTERN,19,8,7,
 //                 "........"
 //                 "........"
-//                 "...X...."
-//                 "........"
+//                 "..X....."
 //                 "...O...."
 //                 "........"
 //                 "........"
+//                 "........"
 //                 "........");
-  Pattern p(CORNER_NW_PATTERN,19,7,8,
-            "......."
-            "......."
-            "...O..."
-            "......."
-            "......."
-            "......."
-            "......."
-            ".......");
+//   Pattern p(CENTER_PATTERN,19,5,4,
+//             "...O."
+//             "....."
+//             ".XOO."
+//             "..OXO");
+  Pattern p(CENTER_PATTERN, 19,5, 4,
+            "..XOO"
+            "...XX"
+            "....."
+            "..X..");
+
   // Pattern p(CORNER_NW_PATTERN,19,7,7,".................X.....X......XO.....OO..........");
   // Pattern p(CORNER_NW_PATTERN,19,7,7,".......................X.........................");
@@ -120 +122 @@
   // for(vector<string>::iterator it = res.begin(); it != res.end(); it++)
   //   printf("%s\n", it->c_str());
-//   for(int i=0; i<gl.size(); i++) printf("%s\n", gl.currentEntryAsString(i).c_str());
+  for(int i=0; i<gl.size(); i++) printf("%s\n", gl.currentEntryAsString(i).c_str());
 
   // ------------------- print some statistics ------------------------------------------

06/libkombilo-branches/hash_center/process.py

@@ -31 +31 @@
     counter = 0
     for filename in filenames:
-        # print filename
+        print counter
         try:
             file = open(filename)

06/libkombilo-branches/hash_center/search.cpp

@@ -418 +418 @@
 }
 
-Pattern& Pattern::apply_flip(int f, bool CS) {
+Pattern Pattern::apply_flip(int f, bool CS) {
   int newSizeX = max(Pattern::flipsX(f,0,0,sizeX,sizeY),
       Pattern::flipsX(f,sizeX,sizeY,sizeX,sizeY));
@@ -468 +468 @@
   }
 
-  Pattern* pNew =new Pattern(newLeft, newRight, newTop, newBottom, boardsize,
-                             newSizeX, newSizeY, newInitialPos, newContList);
-
-  pNew->flip = f;
-  if (CS) pNew->colorSwitch = 1;
-  else pNew->colorSwitch = 0;
+  Pattern pNew(newLeft, newRight, newTop, newBottom, boardsize,
+               newSizeX, newSizeY, newInitialPos, newContList);
+
+  pNew.flip = f;
+  if (CS) pNew.colorSwitch = 1;
+  else pNew.colorSwitch = 0;
   delete [] newInitialPos;
-  return *pNew; 
+  return pNew;
 }
 
@@ -602 +602 @@
     }
     if (foundNewPattern) {
-      printf("new p: %s\n", pNew.printPattern().c_str());
+//       printf("new p: %s\n", pNew.printPattern().c_str());
       flipTable[f] = data.size();
       data.push_back(pNew);
@@ -1054 +1054 @@
   int rc = sqlite3_exec(db, sql, 0, 0, 0);
   if (rc != SQLITE_OK) {
-    printf("error %d\n", rc);
+//     printf("error %d\n", rc);
     throw DBError();
   }
@@ -1723 +1723 @@
                 numOfSwitched += label[2];
                 result->push_back(new Hit(new ExtendedMoveNumber((*it)->dictsF), label));
+//                 printf("hit from %d %d %d\n", (*it)->mx, (*it)->my, (*it)->orientation);
               }
 
@@ -2190 +2191 @@
 
 HashhitF::HashhitF() {
-  printf("oops\n");
+//   printf("oops\n");
   cont = 0;
   emn = 0;
@@ -2575 +2576 @@
 }
 
-HashQuery::HashQuery(std::string SQL, Pattern* p0, int OFF0X, int OFF0Y, int FLIP0, hashtype HASHCODE0, Pattern* p1, int FLIP1) {
+HashQuery::HashQuery(std::string SQL, PatternList* PL0, int OFF0X, int OFF0Y, int FLIP0, hashtype HASHCODE0, 
+                     PatternList* PL1, int OFF1X, int OFF1Y, int FLIP1) {
   sql = SQL;
-  if (p0) {
-    printf("use \n%s\n", p0->printPattern().c_str());
-    pl0 = new PatternList(*p0,1,0);
-    printf("pl size %d\n", pl0->size());
-    offset0 = OFF0X + p0->sizeX * OFF0Y;
-    delete p0;
+  if (PL0) {
+    pl0 = PL0;
+//     printf("pl size %d\n", pl0->size());
+    offset0 = OFF0X + pl0->data[0].sizeX * OFF0Y;
   } else {
     pl0 = 0;
     offset0 = 0;
   }
-  if (p1) {
-    pl1 = new PatternList(*p1,1,0);
-    delete p1;
+  if (PL1) {
+    pl1 = PL1;
   } else {
     pl1 = 0;
+    offset1 = OFF1X + pl1->data[0].sizeX * OFF1Y;
   }
   flip0 = FLIP0;
@@ -2812 +2812 @@
   // printf("leave algo_hash::initialize_processing\n");
 }
-        
+
 void Algo_hash::newgame_process(int game_id) {
   gid = game_id;
@@ -2821 +2821 @@
 void Algo_hash::AB_process(int x, int y) {
   for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++)
-    (*it)->addB(x,y);
+    (*it)->add('B', x, y);
 }
 
 void Algo_hash::AW_process(int x, int y) {
   for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++)
-    (*it)->addW(x,y);
-}                 
+    (*it)->add('W', x, y);
+}
 
 void Algo_hash::AE_process(int x, int y, char removed) {
-  if (removed == 'B') {
-    for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++) (*it)->removeB(x,y);
-  } else { 
-    for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++) (*it)->removeW(x,y);
-  }
+  for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++) (*it)->remove(removed, x, y);
 }
 
@@ -2853 +2849 @@
 
 void Algo_hash::move_process(Move m) throw(DBError) {
-  if (m.color == 'B') {
-    for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++)
-      (*it)->addB(m.x, m.y);
-    if (m.captures) {
-      for(vector<p_cc>::iterator cap_it = m.captures->begin(); cap_it != m.captures->end(); cap_it++) {
-        for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++)
-          (*it)->removeW(cap_it->first, cap_it->second);
-      }
-    }
-  } else {
-    for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++)
-      (*it)->addW(m.x, m.y);
-    if (m.captures) {
-      for(vector<p_cc>::iterator cap_it = m.captures->begin(); cap_it != m.captures->end(); cap_it++) {
-        for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++)
-          (*it)->removeB(cap_it->first, cap_it->second);
-      }
+  for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++)
+    (*it)->add(m.color, m.x, m.y);
+  if (m.captures) {
+    for(vector<p_cc>::iterator cap_it = m.captures->begin(); cap_it != m.captures->end(); cap_it++) {
+      for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++)
+        (*it)->remove(invertColor(m.color), cap_it->first, cap_it->second);
     }
   }
@@ -2945 +2930 @@
   vector<int>* result = new vector<int>;
   bool used[8];
-  printf("pft "); for(int i=0; i<8; i++) printf("%d, ", pattern_ft[i]); printf("\n");
-  printf("sft ");
-  for(int i=0; i<8; i++)
-    printf("%d, ", subpattern_ft[i]);
-  printf("\n");
+//   printf("pft "); for(int i=0; i<8; i++) printf("%d, ", pattern_ft[i]); printf("\n");
+//   printf("sft ");
+//   for(int i=0; i<8; i++)
+//     printf("%d, ", subpattern_ft[i]);
+//   printf("\n");
   { for(int i=0; i<8; i++) used[i] = false;
   }
@@ -2975 +2960 @@
   if (gl.start_sorted() == 0) {
     // query database
-    printf("sql query: %s\n", query.sql.c_str());
+//     printf("sql query: %s\n", query.sql.c_str());
     sqlite3_stmt* selStmt = 0;
     int rc = sqlite3_prepare(db, query.sql.c_str(), -1, &selStmt, 0);
@@ -2987 +2972 @@
     rc = sqlite3_finalize(selStmt);
     if (rc != SQLITE_OK) printf("SQLITE errorB %d\n", rc);
-    printf("%d results\n", results->data.size());
+//     printf("%d results\n", results->data.size());
 
     // communicate results of query to database
@@ -3012 +2997 @@
         if ((*resultIT)->cs) {
            subpattern_flipTable = query.pl1->flipTable;
-           fl = query.flip1;
+           fl = Pattern::PatternInvFlip(query.flip1);
            subp_sizeX = query.pl1->pattern.sizeX;
            subp_sizeY = query.pl1->pattern.sizeY;
         } else {
           subpattern_flipTable = query.pl0->flipTable;
-          fl = query.flip0;
+          fl = Pattern::PatternInvFlip(query.flip0);
           subp_sizeX = query.pl0->pattern.sizeX;
           subp_sizeY = query.pl0->pattern.sizeY;
@@ -3037 +3022 @@
           if (!(*resultIT)->cs) index = patternList.flipTable[*flip];
           else index = patternList.flipTable[*flip + 8];
-//           printf("make cand %d, %d, %d\n", pos_left, pos_top, index);
+//           printf("%d %d %d %d make cand %d, %d, %d\n", pos, ori, fl, *flip, pos_left, pos_top, index);
           candidates->push_back(new Candidate(pos_left, pos_top, index));
         }
@@ -3090 +3075 @@
           char p = pattern->finalPos[i + pattern->sizeX*j];
           if (p == 'x' || p ==  'o' || p == '*') {
-            printf("c_h 0a\n");
+//             printf("c_h 0a\n");
             return CompleteHashKey();
           }
@@ -3127 +3112 @@
 
 HashQuery Algo_hash_corner::searchQuery(PatternList& patternList) {
-  printf("Enter Algo_hash_corner::search\n");
+//   printf("Enter Algo_hash_corner::searchQuery\n");
   if (patternList.data[0].sizeX < size ||\
       patternList.data[0].sizeY < size ||\
@@ -3134 +3119 @@
       (patternList.data[0].left != 0 && patternList.data[0].left != boardsize-size) ||\
       (patternList.data[0].top != 0 && patternList.data[0].top != boardsize-size)) {
-    printf("c_h 0\n");
+//     printf("c_h 0\n");
     return HashQuery();
   }
@@ -3145 +3130 @@
 
   Pattern subp = pattern->subpattern(offsetX, offsetY, size, size);
-  PatternList sub_pl(subp, 0, 0);
-  CompleteHashKey chk0 = compute_hashkey(sub_pl, 0);
+  PatternList* sub_pl = new PatternList(subp, 0, 0);
+  CompleteHashKey chk0 = compute_hashkey(*sub_pl, 0);
   if (chk0.hashCode == NOT_HASHABLE) {
-    printf("0 NH\n");
+//     printf("0 NH\n");
     return HashQuery();
   }
-  int fl = patternList.data[chk0.index].flip;
-
-  char buf[100];
-  sprintf(buf, "select data,hash from algo_hash_%d_%s where hash ",
-      boardsize, dbnameext.c_str());
+  int fl = sub_pl->data[chk0.index].flip;
+
+  char buf[200];
+  sprintf(buf, "select data,hash from algo_hash_%d_%s where hash ", boardsize, dbnameext.c_str());
   string sql = buf;
-  Pattern* p0 = new Pattern(sub_pl.data[0]);
-
+
+  PatternList* sub_pl1;
   int fl2 = fl;
-  Pattern* p1 = 0;
   if (patternList.data[patternList.size()-1].colorSwitch) {
-    CompleteHashKey chk1 = compute_hashkey(sub_pl, 1);
+    CompleteHashKey chk1 = compute_hashkey(*sub_pl, 1);
     // printf("HC2 %lld\n", hashCode2);
     if (chk1.hashCode == NOT_HASHABLE) {
-      printf("1 NH\n");
+//       printf("1 NH\n");
       return HashQuery();
     }
@@ -3173 +3156 @@
       sprintf(buf, "in ('%lld', '%lld')", chk0.hashCode, chk1.hashCode);
       sql += buf;
-      p1 = new Pattern(sub_pl.data[sub_pl.size()/2]);
+      sub_pl1 = new PatternList(sub_pl->data[sub_pl->size()/2], 1, 0);
     } else {
       sprintf(buf, "= '%lld'", chk0.hashCode);
@@ -3182 +3165 @@
     sql += buf;
   }
-  return HashQuery(sql, p0, offsetX, offsetY, fl, chk0.hashCode, p1, fl2);
+  return HashQuery(sql, sub_pl, offsetX, offsetY, fl, chk0.hashCode, sub_pl1, offsetX, offsetY, fl2);
 }
 
@@ -3205 +3188 @@
 
 
-Algo_hash_center::Algo_hash_center(int bsize) : Algo_hash(bsize, "CENTER", 16) {
+Algo_hash_center::Algo_hash_center(int bsize, int L_BOUND, int U_BOUND) : Algo_hash(bsize, "CENTER", 16) {
+  l_bound = L_BOUND;
+  u_bound = U_BOUND;
   // read "frequency" table from kombilo.db
   sqlite3* kombilodb = 0;
@@ -3225 +3210 @@
   rc = sqlite3_close(kombilodb);
   if (rc != SQLITE_OK) printf("SQLITE errorD %d\n", rc);
-}
-        
+  sizeX = 4;
+  sizeY = 4;
+}
+
 void Algo_hash_center::endOfNode_process() {
   for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++) {
@@ -3233 +3220 @@
       pair<hashtype,int> phi = (*it)->cHC();
       map<hashtype, int>::iterator freq_it = frequency.find(phi.first);
-      if (freq_it != frequency.end() && freq_it->second > 100 && freq_it->second < 1000) 
+      if (freq_it != frequency.end() && freq_it->second > l_bound && freq_it->second < u_bound) 
         if (insert_hash(phi.first, phi.second) != 0) throw DBError();
     }
@@ -3242 +3229 @@
   Algo_hash::initialize_process(DB);
   hi = new vector<HashInstance* >;
-  for(int i=0; i<boardsize-3; i++)          // FIXME: boundaries
-    for(int j=0; j<boardsize-3; j++)
-      hi->push_back(new HashInstanceCTR(i, j, 4, 4, boardsize));
-}
-
-hashtype center_hashkey(char* p, int sizeX, int start) {
-  // computes the hash key of the 4x4 pattern in p
-  hashtype currentHashCode[8];
-  for(int f=0; f<8; f++) {
-    for(int x=0; x<4; x++) {
-      for(int y=0; y<4; y++) {
-        char x1 = Pattern::flipsX(f, x, y, 3, 3);
-        char y1 = Pattern::flipsY(f, x, y, 3, 3);
-        char c = p[start + x1*sizeX + y1];
-        // stone at position (x1, y1) at bits 4*x1+yy1 4*x1+y1+1
-        int p = 2*(4*x1+y1);
-        if (c=='X')
-          currentHashCode[f] |= 1 << p; // set to 01 = black
-        else if (c == 'W')
-          currentHashCode[f] |= 1 << (p+1); // set to 10 = white
-        else if (c != '.') return NOT_HASHABLE;
+  for(int i=0; i<boardsize-sizeX+1; i++)          // FIXME: boundaries
+    for(int j=0; j<boardsize-sizeY+1; j++)
+      hi->push_back(new HashInstanceCTR(i, j, sizeX, sizeY, boardsize));
+}
+
+HashQuery Algo_hash_center::searchQuery(PatternList& patternList) {
+//   printf("Enter Algo_hash_center::search\n");
+  Pattern* pattern = &(patternList.data[0]);
+  int offsetX = 0;
+  int offsetY = 0;
+  int fl = 0;
+  int freq = 1000000;
+  hashtype hashCode = NOT_HASHABLE;
+  PatternList* sub_pl = 0;
+  PatternList* pl0 = 0;
+  for(int oX = 0; oX <= pattern->sizeX - sizeX; oX++) {
+    for(int oY = 0; oY <= pattern->sizeY - sizeY; oY++) {
+      Pattern* subp = &pattern->subpattern(oX, oY, sizeX, sizeY);
+      sub_pl = new PatternList(*subp, 1, 0);
+      CompleteHashKey hc = HashInstanceCTR::center_hashkey(*sub_pl, 0);
+      map<hashtype, int>::iterator f_it = frequency.find(hc.hashCode);
+      if (hc.hashCode != NOT_HASHABLE && f_it != frequency.end() && f_it->second > l_bound && f_it->second < u_bound && f_it->second < freq) {
+        hashCode = hc.hashCode;
+        freq = f_it->second;
+        offsetX = oX;
+        offsetY = oY;
+        if (pl0) delete pl0;
+        pl0 = sub_pl;
+        fl = sub_pl->data[hc.index].flip;
+      } else {
+        delete sub_pl;
       }
-    }
-  }
-  hashtype minCHC = currentHashCode[0];
-  for(int f=1; f<8; f++) { 
-    if (currentHashCode[f] < minCHC) {
-      minCHC = currentHashCode[f];
-    }
-  }
-  return minCHC;
-}
-
-CompleteHashKey Algo_hash_center::compute_hashkey(PatternList& pl, int CS) {
-  if (pl.pattern.sizeX < 4 || pl.pattern.sizeY < 4 ||
-      (pl.pattern.sizeX < 5 && (pl.pattern.left == 0 || pl.pattern.right == boardsize-1)) ||
-      (pl.pattern.sizeY < 5 && (pl.pattern.top == 0 || pl.pattern.bottom == boardsize-1)))
-    return CompleteHashKey(); // NOT_HASHABLE
-
-  // go through all center 4x4 sub-patterns, and compute the corresp. hash key
-
-  int X1 = 0;
-  int Y1 = 0;
-  int X2 = pl.pattern.sizeX - 4;
-  int Y2 = pl.pattern.sizeY - 4;
-
-  // if (pl.pattern.left == 0) X1++;
-  // if (pl.pattern.top == 0) Y1++;
-  // if (pl.pattern.right == boardsize - pl.pattern.sizeX) X2--;
-  // if (pl.pattern.bottom == boardsize - pl.pattern.sizeY) Y2--;
-  
-  //
-  return CompleteHashKey(); // NOT_HASHABLE
-}
-
-HashQuery Algo_hash_center::searchQuery(PatternList& patternList) {
-  return HashQuery();
+      delete subp;
+    }
+  }
+
+  if (hashCode == NOT_HASHABLE) {
+    return HashQuery();
+  }
+
+  char buf[200];
+  sprintf(buf, "select data,hash from algo_hash_%d_%s where hash ", boardsize, dbnameext.c_str());
+  string sql = buf;
+
+  int offsetX1 = 0;
+  int offsetY1 = 0;
+  freq = 1000000;
+  hashtype hashCode1 = NOT_HASHABLE;
+  PatternList* sub_pl1;
+  PatternList* pl1 = 0;
+
+  int fl1 = fl;
+  if (patternList.data[patternList.size()-1].colorSwitch) {
+    for(int oX = 0; oX <= pattern->sizeX - sizeX; oX++) {
+      for(int oY = 0; oY <= pattern->sizeY - sizeY; oY++) {
+        Pattern* subp = &patternList.data[patternList.size()/2].subpattern(oX, oY, sizeX, sizeY);
+        sub_pl1 = new PatternList(*subp, 0, 0);
+        CompleteHashKey hc = HashInstanceCTR::center_hashkey(*sub_pl1, 0);
+        map<hashtype, int>::iterator f_it = frequency.find(hc.hashCode);
+        if (hc.hashCode != NOT_HASHABLE && f_it != frequency.end() && f_it->second > l_bound && f_it->second < u_bound && f_it->second < freq) {
+          hashCode1 = hc.hashCode;
+          freq = f_it->second;
+          offsetX1 = oX;
+          offsetY1 = oY;
+          if (pl1) delete pl1;
+          pl1 = sub_pl1;
+          fl1 = sub_pl1->data[hc.index].flip;
+        } else {
+          delete sub_pl1;
+        }
+        delete subp;
+      }
+    }
+
+    if (hashCode1 == NOT_HASHABLE) {
+//       printf("1 NH\n");
+      return HashQuery();
+    }
+
+    if (hashCode != hashCode1) {
+      sprintf(buf, "in ('%lld', '%lld')", hashCode, hashCode1);
+      sql += buf;
+    } else {
+      sprintf(buf, "= '%lld'", hashCode);
+      sql += buf;
+    }
+  } else {
+    sprintf(buf, "= '%lld'", hashCode);
+    sql += buf;
+  }
+  return HashQuery(sql, pl0, offsetX, offsetY, fl, hashCode, pl1, offsetX1, offsetY1, fl1);
 }
 
@@ -3347 +3368 @@
 }
 
-void HashInstance::addB(char x, char y) { printf("ouch\n"); }
-
-void HashInstance::addW(char x, char y) { }
-
-void HashInstance::removeB(char x, char y) { }
-
-void HashInstance::removeW(char x, char y) { }
+void HashInstance::add(char co, char x, char y) { printf("ouch\n"); }
+
+void HashInstance::remove(char co, char x, char y) { }
 
 pair<hashtype,int> HashInstance::cHC() {
@@ -3387 +3404 @@
 }
 
-void HashInstanceCO::addB(char x, char y) {
+void HashInstanceCO::add(char co, char x, char y) {
   if (inRelevantRegion(x,y)) {
     changed = true;
     for(int i=0; i<8; i++) {
-      currentHashCode[i] += Algo_hash::hashCodes[Pattern::flipsX(i,x,y,boardsize-1, boardsize-1) + boardsize*Pattern::flipsY(i,x,y,boardsize-1, boardsize-1)];
+      if (co == 'X' || co =='B')
+        currentHashCode[i] += Algo_hash::hashCodes[Pattern::flipsX(i,x,y,boardsize-1, boardsize-1) + boardsize*Pattern::flipsY(i,x,y,boardsize-1, boardsize-1)];
+      else if (co == 'O' || co == 'W')
+        currentHashCode[i] -= Algo_hash::hashCodes[Pattern::flipsX(i,x,y,boardsize-1, boardsize-1) + boardsize*Pattern::flipsY(i,x,y,boardsize-1, boardsize-1)];
+      else printf("ouch\n"); // FIXME
     }
     numStones++;
@@ -3397 +3418 @@
 }
 
-void HashInstanceCO::addW(char x, char y) {
+void HashInstanceCO::remove(char co, char x, char y) {
   if (inRelevantRegion(x,y)) {
     changed = true;
     for(int i=0; i<8; i++) {
-      currentHashCode[i] -= Algo_hash::hashCodes[Pattern::flipsX(i,x,y,boardsize-1, boardsize-1) + boardsize*Pattern::flipsY(i,x,y,boardsize-1, boardsize-1)];
+      if (co == 'X' || co =='B')
+        currentHashCode[i] -= Algo_hash::hashCodes[Pattern::flipsX(i,x,y,boardsize-1, boardsize-1) + boardsize*Pattern::flipsY(i,x,y,boardsize-1, boardsize-1)];
+      else if (co == 'O' || co == 'W')
+        currentHashCode[i] += Algo_hash::hashCodes[Pattern::flipsX(i,x,y,boardsize-1, boardsize-1) + boardsize*Pattern::flipsY(i,x,y,boardsize-1, boardsize-1)];
+      else printf("ouch\n"); // FIXME
     }
     numStones++;
@@ -3407 +3432 @@
 }
 
-void HashInstanceCO::removeB(char x, char y) {
+HashInstanceCTR::HashInstanceCTR(char X, char Y, char SIZEX, char SIZEY, int BOARDSIZE) : HashInstance(X, Y, SIZEX, SIZEY, BOARDSIZE) {
+  if (sizeX != 4 || sizeY != 4) printf("error\n"); // FIXME
+}
+
+HashInstanceCTR::~HashInstanceCTR() {
+  finalize();
+}
+
+void HashInstanceCTR::add(char co, char x, char y) {
   if (inRelevantRegion(x,y)) {
     changed = true;
     for(int i=0; i<8; i++) {
-      currentHashCode[i] -= Algo_hash::hashCodes[Pattern::flipsX(i,x,y,boardsize-1, boardsize-1) + boardsize*Pattern::flipsY(i,x,y,boardsize-1, boardsize-1)];
-    }
-    numStones++;
-  }
-}
-
-void HashInstanceCO::removeW(char x, char y) {
-  if (inRelevantRegion(x,y)) {
-    changed = true;
-    for(int i=0; i<8; i++) {
-      currentHashCode[i] += Algo_hash::hashCodes[Pattern::flipsX(i,x,y,boardsize-1, boardsize-1) + boardsize*Pattern::flipsY(i,x,y,boardsize-1, boardsize-1)];
-    }
-    numStones++;
-  }
-}
-
-
-HashInstanceCTR::HashInstanceCTR(char X, char Y, char SIZEX, char SIZEY, int BOARDSIZE) : HashInstance(X, Y, SIZEX, SIZEY, BOARDSIZE) {
-}
-
-HashInstanceCTR::~HashInstanceCTR() {
-  finalize();
-}
-
-void HashInstanceCTR::addB(char x, char y) {
-  if (inRelevantRegion(x,y)) {
-    changed = true;
-    for(int i=0; i<8; i++) {
+//       char x1 = Pattern::flipsX(Pattern::PatternInvFlip(i), x-xx, y-yy, 3, 3);
+//       char y1 = Pattern::flipsY(Pattern::PatternInvFlip(i), x-xx, y-yy, 3, 3);
       char x1 = Pattern::flipsX(i, x-xx, y-yy, 3, 3);
       char y1 = Pattern::flipsY(i, x-xx, y-yy, 3, 3);
@@ -3444 +3451 @@
       int p = 2*(4*x1+y1);
       currentHashCode[i] ^= ((currentHashCode[i] >> p)%4) << p; // set to 00
-      currentHashCode[i] |= 1 << p; // set to 01 = black
-    }
-  }
-}
-
-void HashInstanceCTR::addW(char x, char y) {
+      if (co == 'X' || co == 'B')
+        currentHashCode[i] |= 1 << p; // set to 01 = black
+      else if (co == 'O' || co == 'W')
+        currentHashCode[i] |= 1 << (p+1); // set to 10 = white
+      else printf("ouch\n"); // FIXME
+    }
+  }
+}
+
+void HashInstanceCTR::remove(char co, char x, char y) {
   if (inRelevantRegion(x,y)) {
     changed = true;
     for(int i=0; i<8; i++) {