Changeset 183

Timestamp:

09/22/06 20:53:40 (2 years ago)

Author:

ug

Message:

Improved contList handling; improved format string handling; minor changes.

Files:

• 06/libkombilo/abstractboard.cc (modified) (2 diffs)
• 06/libkombilo/abstractboard.h (modified) (1 diff)
• 06/libkombilo/cpptest.cc (modified) (1 diff)
• 06/libkombilo/libkombilo.i (modified) (1 diff)
• 06/libkombilo/search.cc (modified) (40 diffs)
• 06/libkombilo/search.h (modified) (5 diffs)
• 06/libkombilo/sgfparser.cc (modified) (1 diff)
• 06/libkombilo/sgfparser.h (modified) (1 diff)
• 06/libkombilo/testhash.py (modified) (2 diffs)
• 06/libkombilo/testsearch.py (modified) (3 diffs)

06/libkombilo/abstractboard.cc

@@ -26 +26 @@
-BoardError::BoardError() {}
-
-
+
+
+
+
+
+
+
-MoveNC::MoveNC(char X, char Y, char COLOR) {
-        x = X;
@@ -33 +39 @@
-}
-
-
+const 
-        if (x == mnc.x && y == mnc.y && color == mnc.color) return true;
-        else return false;

06/libkombilo/abstractboard.h

@@ -46 +46 @@
-                char color;
-
+                MoveNC();
-          MoveNC(char X, char Y, char COLOR);
-
+ const
-};
-

06/libkombilo/cpptest.cc

@@ -2 +2 @@
-
-int main() {
-
+.
-        // gl.gisearch("pw = 'Hane Naoki'");
-        // Pattern p(CENTER_PATTERN, 19, 3, 5, ".X..OX.OX.OXOXO") ;
-
-
+
+
+
+
+
-        SearchOptions so;
-l
+
-        printf("num games: %d\n", gl.size());
+        vector<string> res = gl.currentEntriesAsStrings();
+        for(vector<string>::iterator it = res.begin(); it != res.end(); it++)
+                printf("%s\n", it->c_str());
-}

06/libkombilo/libkombilo.i

@@ -16 +16 @@
-%include "abstractboard.h"
-%include "search.h"
+%template(vectorMNC) vector<MoveNC>;
-
+

06/libkombilo/search.cc

@@ -136 +136 @@
-  if (sizeX != p.sizeX || sizeY != p.sizeY) return 0;
-  if (left != p.left || right != p.right || top != p.top || bottom != p.bottom) return 0; 
-  // if (moveOne != p.moveOne) return 0;
-  for(int i=0; i < sizeX*sizeY; i++)
-    if (initialPos[i] != p.initialPos[i]) return 0;
-
-
+
-  return 1;
-}
@@ -163 +161 @@
-  initialPos = 0;
-  finalPos = 0;
-  contList = 0;
-        flip = 0;
-        colorSwitch = 0;
@@ -171 +168 @@
-
-
-
-
+
-  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;
@@ -221 +213 @@
-    finalPos[i] = iPos[i];
-  }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-  flip = 0;
-  colorSwitch = 0;
-  if (mOne=='B' || mOne=='X') moveOne = 'X';
-  else moveOne = 'O';
-  if (moveOne == 'X') moveTwo = 'O';
-  else moveTwo = 'X';
-       
-  left = le;
-  right = ri;
-  top = to;
-  bottom = bo;
-
-  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];
@@ -255 +262 @@
-  }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
+
+
-}
-
@@ -267 +291 @@
-  if (initialPos) delete [] initialPos;
-  if (finalPos) delete [] finalPos;
-  if (contList) delete [] contList;
-}
-
@@ -279 +302 @@
-  flip = p.flip;
-  colorSwitch = p.colorSwitch;
-  moveOne = p.moveOne;
-  moveTwo = p.moveTwo;
-
-  initialPos = new char[sizeX*sizeY];
@@ -288 +309 @@
-    finalPos[i] = p.finalPos[i];
-  }
-
-
-
-
-
-
+
-}
-
@@ -306 +322 @@
-    flip = p.flip;
-    colorSwitch = p.colorSwitch;
-    moveOne = p.moveOne;
-    moveTwo = p.moveTwo;
-
-    if (initialPos) delete [] initialPos;
-    if (finalPos) delete [] finalPos;
-    if (contList) delete [] contList;
-    
-    initialPos = new char[sizeX*sizeY];
@@ -319 +332 @@
-      finalPos[i] = p.finalPos[i];
-    }
-
-
-
-
-
+
-  }
-  return *this;
@@ -339 +348 @@
-    flip = p.flip;
-    colorSwitch = p.colorSwitch;
-    moveOne = p.moveOne;
-    moveTwo = p.moveTwo;
-
-    if (initialPos) delete [] initialPos;
-    if (finalPos) delete [] finalPos;
-    if (contList) delete [] contList;
-    
-    initialPos = new char[sizeX*sizeY];
@@ -352 +358 @@
-      finalPos[i] = p.finalPos[i];
-    }
-
-
-
-
+
-  }
-  return *this;
@@ -473 +476 @@
-    }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-    newContList[pattern.lenContList*4] = 0;
-
-    Pattern pNew(newLeft, newRight, newTop, newBottom, newSizeX, newSizeY,
-, pattern.lenContList, pattern.moveOne
+
-
-    pNew.flip = f;
@@ -491 +492 @@
-
-    delete [] newInitialPos;
-    delete [] newContList;
-
-    vector<Pattern>::iterator it;
@@ -513 +513 @@
-        }
-      }
-
-
-
-
-
-
-
-      
-
+
+
+
+
+
+
+
+                       
+
-
-                        // printf("new size %d %d", newSizeX, newSizeY);
-      Pattern pNew1(newLeft, newRight, newTop, newBottom, newSizeX, newSizeY,
-, pattern.lenContList, pattern.moveTwo
+
-      pNew1.flip = f;
-      pNew1.colorSwitch = 1;
-
-      delete [] newInitialPos;
-      delete [] newContList;
-
-      if (!fixedColor) {
@@ -1265 +1264 @@
-}
-
+
+MovelistCand::MovelistCand(Pattern* P, int ORIENTATION, char* DICTS, int NO, char X, char Y) {
+        orientation = ORIENTATION;
+        p = P;
+        mx = X;
+        my = Y;
+        Xinterv = make_pair(mx, mx+p->sizeX);
+        Yinterv = make_pair(my, my+p->sizeY);
+
+        dicts = DICTS;
+        dictsNO = NO;
+        contListIndex = 0;
+        dictsF = -1;
+        dictsFI = -1;
+        dictsDR = false;
+        contList = p->contList;
+}
+
+MovelistCand::~MovelistCand() {
+        delete [] dicts;
+}
+
+char MovelistCand::dictsget(char x, char y) {
+  return dicts[x-mx + p->sizeX*(y-my)];
+}
+
+void MovelistCand::dictsset(char x, char y, char d) {
+  dicts[x-mx + p->sizeX*(y-my)] = d;
+}
+
+bool MovelistCand::in_relevant_region(char x, char y) {
+        return (mx <= x && x < mx + p->sizeX && my <= y && y < my + p->sizeY);
+}
+
+
-int Algo_movelist::search(PatternList& patternList, GameList& gl, SearchOptions& options) { 
-        // FIXME progbar, variations!!!
@@ -1274 +1308 @@
-        int Wwins = 0;
-
-
-
-
-
+
-
-        int index = gl.start();
@@ -1312 +1343 @@
-
-                vector<Candidate* > *currentMatchList = gl.getCurrentCandidateList();
-
-
-
-
-
-
-
-
-
-
+
+
-
-                for(int mCounter=0; mCounter<currentMatchList->size(); mCounter++) {
@@ -1336 +1359 @@
-                                }
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                }
-
@@ -1373 +1380 @@
-                        //                               Pattern p = patternList.get(m[0]); // FIXME: besser pointer uebergeben?
-                        //                               if (p.colorSwitch) numOfSwitched++;
- && showColorSwap
+
-                        //                                       result->append((dicts[m]['found'], '-'));
-                        //                               else result->append((dicts[m]['found'], ''));
@@ -1404 +1411 @@
-                                }
-
-
-
-
-
-
-
+
+
+
+
-                                                        char* label;
-                                                        label = patternList.updateContinuations(
-m
-Xinterv[mCounter].first, y-Yinterv[mCounter].first
+(*it)
+(*it)->mx, y-(*it)->my
-                                                                invco, // color of continuation
-dictsF[mCounter]
+(*it)->dictsF
-                                                                        gl.getCurrentWinner()
-                                                                        );
-                                                        if (!label) { // no hit because continuation has wrong color (i.e. nextMove set)
-[] dicts[mCounter]
-dicts[mCounter]
+*it
+*it
-                                                                continue;
-                                                        }
@@ -1426 +1431 @@
-                                                        numOfSwitched += label[2];
-
-dictsF[mCounter]
-[] dicts[mCounter]
-dicts[mCounter]
+(*it)->dictsF
+*it
+*it
-                                                        continue;
-dictsFI[mCounter]
-contList[mCounter])[contListIndex[mCounter]
-contListIndex[mCounter]
-contListIndex[mCounter] == contList[mCounter]
-dictsF[mCounter]
+(*it)->dictsFI
+(*it)->contList)[(*it)->contListIndex
+(*it)->contListIndex
+(*it)->contListIndex == (*it)->contList
+(*it)->dictsF
-                                                                }
-                                                        } else {
-
-
-
-
+
+
+
-                                                                        continue;
-                                                                } else {
-contListIndex[mCounter]
-dictsFI[mCounter]
+(*it)->contListIndex
+(*it)->dictsFI
-                                                                }
-                                                        }
-                                                }
-
-dicts[mCounter][x-m->x + dictsPS[mCounter]*(y-m->y)]
+(*it)->dictsget(x,y)
-                                                        if (!(fpC[y/4 + 5*(x/2)] & (1 << (x%2 + 2*(y%4))))) {
-
-
-
-
+
+
+
-                                                                        continue;
-dictsDR[mCounter] = 1
+(*it)->dictsDR = true
-                                                        } else {
-dicts[mCounter][x-m->x + dictsPS[mCounter]*(y-m->y)] = '.'
-dictsNO[mCounter]
+(*it)->dictsset(x,y,'.')
+(*it)->dictsNO
-                                                        }
-dicts[mCounter][x-m->x + dictsPS[mCounter]*(y-m->y)]
-
+(*it)->dictsget(x,y)
+ of the wrong color
-                                                        if (!(fpC[y/4 + 5*(x/2)] & (1 << (x%2 + 2*(y%4))))) {
-
-
-
-
+
+
+
-                                                                        continue;
-dictsDR[mCounter] = 1
-dictsNO[mCounter]
-dicts[mCounter][x-m->x + dictsPS[mCounter]*(y-m->y)]
+(*it)->dictsDR = true
+(*it)->dictsNO
+(*it)->dictsget(x,y)
-                                                        // this move gives us the stone we are looking for
-
-
-
+
+
-                                                }
-                                        }
@@ -1481 +1482 @@
-                        }
-                        else if (movel[movelistIndex+1] & REMOVE) {
-                                // printf("rmv\n");
-                                if (movel[movelistIndex+1] & BLACK) {
-                                        co = 'X';
@@ -1488 +1488 @@
-                                        co = 'O';
-                                        invco = 'X';
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                                                                        ii++;
-contList[mCounter].size() && contList[mCounter]
-contList[mCounter]
-contList[mCounter][ii] = contList[mCounter][contListIndex[mCounter]
-contList[mCounter][contListIndex[mCounter]
-
-contListIndex[mCounter]
+(*it)->contList.size() && (*it)->contList
+(*it)->contList
+(*it)->contList[ii] = (*it)->contList[(*it)->contListIndex
+(*it)->contList[(*it)->contListIndex
+
+(*it)->contListIndex
-                                                                } else {
-
-
-
-
+
+
+
-                                                                                continue;
-                                                                        } else {
-contListIndex[mCounter]
-dictsFI[mCounter]
+(*it)->contListIndex
+(*it)->dictsFI
-                                                                        }
-                                                                }
-                                                        }
-dicts[mCounter][x-m->x + dictsPS[mCounter]*(y-m->y)]
+(*it)->dictsget(x,y)
-                                                                // the stone at this position was what we needed,
-                                                                // since it was captured, we are once again looking for it:
-dicts[mCounter][x-m->x + dictsPS[mCounter]*(y-m->y)] = co
-dictsNO[mCounter]
+(*it)->dictsset(x,y,co)
+(*it)->dictsNO
-                                                        }
-dicts[mCounter][x-m->x + dictsPS[mCounter]*(y-m->y)]
-dictsNO[mCounter]
+(*it)->dictsget(x,y)
+(*it)->dictsNO
-                                                        }
-
-
-
-
-
+
+