Changeset 233

Timestamp:

03/02/07 16:16:43 (1 year ago)

Author:

ug

Message:

Basic functions for hashing of center patterns (no search capability yet).

Files:

• 06/libkombilo-branches/hash_center/cpptest.cpp (modified) (2 diffs)
• 06/libkombilo-branches/hash_center/process.py (modified) (2 diffs)
• 06/libkombilo-branches/hash_center/search.cpp (modified) (9 diffs)
• 06/libkombilo-branches/hash_center/search.h (modified) (4 diffs)

06/libkombilo-branches/hash_center/cpptest.cpp

@@ -19 +19 @@
-  // ----------------- set up processing options -----------------------------------
-  ProcessOptions* p_op = new ProcessOptions;
-
+ | ALGO_HASH_CENTER
-
-  // ----------------- create GameList instance -----------------------------------
-0
+p_op
-  delete p_op;
-
@@ -29 +29 @@
-    gl.start_processing();
-    directory_iterator end_itr;
-string path = "/home/ug/go/kombilo/06
+// string path = "/home/ug/go/kombilo/06/center_hashes
-    // string path = "/home/ug/go/gtl/reviews";
-// 
+
-    for(directory_iterator it(path); it != end_itr; ++it) {
-      string n = it->string();

06/libkombilo-branches/hash_center/process.py

@@ -21 +21 @@
-    try:
-        pop = ProcessOptions()
-# pop.algos = 0
+pop.algos = ALGO_FINALPOS | ALGO_MOVELIST | ALGO_HASH_CENTER
-        # pop.rootNodeTags = 'PW,PB,RE,DT'
-        pop.sgfInDB = False
@@ -46 +46 @@
-
-# filelist = glob.glob('./*.sgf')
-
+
+
-# filelist = glob.glob('/home/ug/go/KGS2005/*.sgf')
-

06/libkombilo-branches/hash_center/search.cpp

@@ -2416 +2416 @@
-
-Algo_hash::~Algo_hash() {
-
+
+
+
+
+
+
-}
-
@@ -2454 +2459 @@
-void Algo_hash::newgame_process(int game_id) {
-  gid = game_id;
-
-it
+* 
+(*it)
-}
-
-void Algo_hash::AB_process(int x, int y) {
-
-it
+* 
+(*it)
-}
-
-void Algo_hash::AW_process(int x, int y) {
-
-it
+* 
+(*it)
-}                 
-
-void Algo_hash::AE_process(int x, int y, char removed) {
-  if (removed == 'B') {
->::iterator it = hi->begin(); it != hi->end(); it++) it
+* >::iterator it = hi->begin(); it != hi->end(); it++) (*it)
-  } else { 
->::iterator it = hi->begin(); it != hi->end(); it++) it
+* >::iterator it = hi->begin(); it != hi->end(); it++) (*it)
-  }
-}
-
-void Algo_hash::endOfNode_process() {
-
-it->numStones <= maxNumStones && it
-it
-it
+* 
+(*it)->numStones <= maxNumStones && (*it)
+(*it)
+(*it)
-      if (insert_hash(phi.first, phi.second) != 0) throw DBError();
-    }
@@ -2492 +2497 @@
-void Algo_hash::move_process(Move m) throw(DBError) {
-  if (m.color == 'B') {
-
-it
+* 
+(*it)
-    if (m.captures) {
-      for(vector<p_cc>::iterator cap_it = m.captures->begin(); cap_it != m.captures->end(); cap_it++) {
-
-it
+* 
+(*it)
-      }
-    }
-  } else {
-
-it
+* 
+(*it)
-    if (m.captures) {
-      for(vector<p_cc>::iterator cap_it = m.captures->begin(); cap_it != m.captures->end(); cap_it++) {
-
-it
+* 
+(*it)
-      }
-    }
@@ -2513 +2518 @@
-
-void Algo_hash::branchpoint_process() {
-
-it
+* 
+(*it)
-}
-
-void Algo_hash::endOfVariation_process() {
-
-it
+* 
+(*it)
-}
-
-void Algo_hash::endgame_process() {
-
-it
+* 
+(*it)
-}
- 
@@ -2643 +2648 @@
-  sprintf(buf, "%d", size);
-  dbnameext += buf;
-
-HashInstance
-HashInstance
-HashInstance
-HashInstance
+* 
+new HashInstanceCO
+new HashInstanceCO
+new HashInstanceCO
+new HashInstanceCO
-}
-
@@ -2712 +2717 @@
-// }
-
+
+Algo_hash_center::Algo_hash_center(int bsize) : Algo_hash(bsize, "CENTER", 16) {
+  hi = new vector<HashInstance* >;
+  for(int i=1; i<bsize-4; i++)
+    for(int j=1; j<bsize-4; j++)
+      hi->push_back(new HashInstanceCTR(i, j, 4, 4, boardsize));
+}
+        
+void Algo_hash_center::endOfNode_process() {
+  for(vector<HashInstance* >::iterator it = hi->begin(); it != hi->end(); it++) {
+    if ((*it)->numStones <= maxNumStones && (*it)->changed) {
+      (*it)->changed = false;
+      pair<hashtype,int> phi = (*it)->cHC();
+      if (phi.first in table of relevant hash codes) 
+        if (insert_hash(phi.first, phi.second) != 0) throw DBError();
+    }
+  }
+}
+
+
+pair<hashtype,int> Algo_hash_center::compute_hashkey(PatternList& pl, int CS) {
+  return make_pair(NOT_HASHABLE,0);
+}
+
+
+
-HashInstance::HashInstance(char X, char Y, char SIZEX, char SIZEY, int BOARDSIZE) {
-  boardsize = BOARDSIZE;
@@ -2757 +2788 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-pair<hashtype,int> HashInstance::cHC() {
@@ -2820 +2819 @@
-  numStones = branchpoints->top().second;
-  branchpoints->pop();
+}
+
+
+HashInstanceCO::HashInstanceCO(char X, char Y, char SIZEX, char SIZEY, int BOARDSIZE) : HashInstance(X, Y, SIZEX, SIZEY, BOARDSIZE) {
+}
+
+HashInstanceCO::~HashInstanceCO() {
+  finalize();
+}
+
+void HashInstanceCO::addB(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::addW(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::removeB(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(i, x-xx, y-yy, 3, 3);
+      char y1 = Pattern::flipsY(i, x-xx, y-yy, 3, 3);
+      // stone at position (x1, y1) at bits 4*x1+yy1 4*x1+y1+1
+      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 (inRelevantRegion(x,y)) {
+    changed = true;
+    for(int i=0; i<8; i++) {
+      char x1 = Pattern::flipsX(i, x-xx, y-yy, 3, 3);
+      char y1 = Pattern::flipsY(i, x-xx, y-yy, 3, 3);
+      // stone at position (x1, y1) at bits 4*x1+yy1 4*x1+y1+1
+      int p = 2*(4*x1+y1);
+      currentHashCode[i] ^= ((currentHashCode[i] >> p)%4) << p; // set to 00
+      currentHashCode[i] |= 1 << p+1; // set to 10 = white
+    }
+  }
+}
+
+void HashInstanceCTR::removeB(char x, char y) {
+  if (inRelevantRegion(x,y)) {
+    changed = true;
+    for(int i=0; i<8; i++) {
+      char x1 = Pattern::flipsX(i, x-xx, y-yy, 3, 3);
+      char y1 = Pattern::flipsY(i, x-xx, y-yy, 3, 3);
+      // stone at position (x1, y1) at bits 4*x1+yy1 4*x1+y1+1
+      int p = 2*(4*x1+y1);
+      currentHashCode[i] ^= ((currentHashCode[i] >> p)%4) << p; // set to 00
+    }
+  }
+}
+
+void HashInstanceCTR::removeW(char x, char y) {
+  if (inRelevantRegion(x,y)) {
+    changed = true;
+    for(int i=0; i<8; i++) {
+      char x1 = Pattern::flipsX(i, x-xx, y-yy, 3, 3);
+      char y1 = Pattern::flipsY(i, x-xx, y-yy, 3, 3);
+      // stone at position (x1, y1) at bits 4*x1+yy1 4*x1+y1+1
+      int p = 2*(4*x1+y1);
+      currentHashCode[i] ^= ((currentHashCode[i] >> p)%4) << p; // set to 00
+    }
+  }
-}
-
@@ -3617 +3726 @@
-  // if (algos & ALGO_HASH_SIDE) 
-  //   algo_ps[algo_hash_side] = new Algo_hash_side(boardsize, 6, 4, p_op->algo_hash_side_maxNumStones);
+  if (p_op->algos & ALGO_HASH_CENTER) {
+    algo_ps[algo_hash_center+20*ctr] = new Algo_hash_center(bs);
+    algo_dbs[algo_hash_center+20*ctr] = algo_db2;
+  }
-}
-

06/libkombilo-branches/hash_center/search.h

@@ -396 +396 @@
-  public:
-    HashInstance(char X, char Y, char SIZEX, char SIZEY, int BOARDSIZE);
-
+virtual 
-    bool inRelevantRegion(char X, char Y);
-
@@ -407 +407 @@
-    bool changed;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    void addB(char x, char y);
-    void removeB(char x, char y);
-    void addW(char x, char y);
-    void removeW(char x, char y);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -445 +467 @@
-    virtual int insert_hash(hashtype hashCod, int pos);
-    virtual std::pair<hashtype,int> compute_hashkey(PatternList& pl, int CS);
-
+* 
-    std::string dbnameext;
-    int maxNumStones;
@@ -465 +487 @@
-//     int sizeY;
-// };
+
+class Algo_hash_center : public Algo_hash {
+  public:
+    Algo_hash_center(int bsize);
+    void initialize_process(sqlite3* DB) throw(DBError);
+    void endOfNode_process();
+    void finalize_process();
+    std::pair<hashtype,int> compute_hashkey(PatternList& pl, int CS);
+
+    std::map<hashtype, int> data;
+};
-
-// class UIntervals {