Changeset 244

Timestamp:

03/24/07 03:21:42 (1 year ago)

Author:

ug

Message:

Fix bug about small board size.

Files:

• 06/libkombilo/abstractboard.cpp (modified) (17 diffs)
• 06/libkombilo/cpptest.cpp (modified) (1 diff)
• 06/libkombilo/search.cpp (modified) (1 diff)

06/libkombilo/abstractboard.cpp

@@ -82 +82 @@
-
-abstractBoard::abstractBoard(int bs) throw(BoardError) {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::abstractBoard(int) 0\n");
-  boardsize = bs;
-3) throw BoardError(); // FIXME
+1) throw BoardError();
-  status = new char[boardsize*boardsize+1];
-  for (int i = 0; i < boardsize*boardsize; i++)
-      status[i] = ' ';
-  status[boardsize*boardsize] = 0;
-  if (DEBUG_ABSTRACTBOARD) printf("AB::abstractBoard(int) 100\n");
-}
-
-abstractBoard::abstractBoard(const abstractBoard& ab) {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::abstractBoard(abstractBoard) 0\n");
-  boardsize = ab.boardsize;
-  status = new char[boardsize*boardsize+1];
@@ -100 +97 @@
-  status[boardsize*boardsize] = 0;
-  undostack = stack<Move>(ab.undostack);
-  if (DEBUG_ABSTRACTBOARD) printf("AB::abstractBoard(abstractBoard) 100\n");
-}
-
-abstractBoard& abstractBoard::operator=(const abstractBoard& ab) {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::operator= 0\n");
-  if (this != &ab) {
-    boardsize = ab.boardsize;
@@ -113 +108 @@
-    status[boardsize*boardsize] = 0;
-    undostack = stack<Move>(ab.undostack);
-    if (DEBUG_ABSTRACTBOARD) printf("AB::abstractBoard(abstractBoard) 100\n");
-  }
-  return *this;
@@ -119 +113 @@
-
-abstractBoard::~abstractBoard() {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::~abstractBoard 0\n");
-  delete [] status;
-  if (DEBUG_ABSTRACTBOARD) printf("AB::~abstractBoard 100\n");
-}
-
-// abstractBoard& abstractBoard::copy(const abstractBoard& ab) {
-//   if (DEBUG_ABSTRACTBOARD) printf("AB::copy 0\n");
-//   printf("copy assignment operator\n");
-//   if (this != &ab) {
@@ -136 +127 @@
-//     undostack = ab.undostack;
-//   }
-//   if (DEBUG_ABSTRACTBOARD) printf("AB::copy 100\n");
-//   return *this;
-// }
-
-char abstractBoard::getStatus(int x, int y) {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::getStatus 0\n");
-  return status[boardsize*x + y];
-}
-
-void abstractBoard::setStatus(int x, int y, char val) {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::setStatus 0\n");
-  if (val=='b' || val=='B') status[boardsize*x + y] = 'B';
-  else if (val=='w' || val=='W') status[boardsize*x + y] = 'W';
-  else status[boardsize*x + y] = val;
-  if (DEBUG_ABSTRACTBOARD) printf("AB::setStatus 100\n");
-}
-
-int abstractBoard::len_cap_last() throw(BoardError) {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::len_cap_last 0\n");
-  if (!undostack.size()) throw BoardError();
-  Move m = undostack.top();
@@ -162 +148 @@
-
-void abstractBoard::undostack_append_pass() {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::undostack_append_pass 0\n");
-  undostack.push(Move(19,19,'-'));
-  if (DEBUG_ABSTRACTBOARD) printf("AB::undostack_append_pass 100\n");
-}
-
@@ -184 +168 @@
-
-int abstractBoard::play(int x, int y, char* color) throw (BoardError) {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::play(int,int,char*) 0\n");
-  if (x<0 || x>=boardsize || y<0 || y>=boardsize) return 0;
-  if (status[boardsize*x+y] != ' ') {
@@ -199 +182 @@
-    else delete captures;
-    undostack.push(m);
-    if (DEBUG_ABSTRACTBOARD) printf("AB::play(int,int,char*) ret1 100\n");
-    return 1;
-  } 
-  if (DEBUG_ABSTRACTBOARD) printf("AB::play(int,int,char*) ret0 200\n");
-  return 0;
-}
-
-vector<p_cc>* abstractBoard::legal(int x, int y, char color) {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::legal 0\n");
-  vector<p_cc>* c = new vector<p_cc>;
-  int* nb = neighbors(x,y);
@@ -215 +195 @@
-    if (status[boardsize*x1 + y1] == invert(color)) {
-      vector<p_cc>* d = hasNoLibExcP(x1, y1, x*boardsize+y);
-      if (DEBUG_ABSTRACTBOARD) printf("AB::legal 39\n");
-      if (DEBUG_ABSTRACTBOARD) printf("AB::legal 40, %d\n", d->size());
-      vector<p_cc>::iterator it;
-      for(it = d->begin(); it != d->end(); it++) c->push_back(*it);
-      if (DEBUG_ABSTRACTBOARD) printf("AB::legal 41\n");
-      delete d;
-    }
-  }
-  delete [] nb;
-  if (DEBUG_ABSTRACTBOARD) printf("AB::legal 42\n");
-  setStatus(x,y,color);
-
@@ -243 +219 @@
-    }
-    delete c;
-    if (DEBUG_ABSTRACTBOARD) printf("AB::legal 98\n");
-    return captures;
-  }
-  delete c;
-  vector<p_cc>* d = hasNoLibExcP(x, y);
-  if (DEBUG_ABSTRACTBOARD) printf("AB::legal 49\n");
-  if (DEBUG_ABSTRACTBOARD) printf("AB::legal 50, %d\n", d->size());
-  if (d->size()) {
-    delete d;
-    status[boardsize*x + y] = ' ';
-    if (DEBUG_ABSTRACTBOARD) printf("AB::legal 99\n");
-    return 0;
-  }
@@ -259 +231 @@
-    delete d;
-    vector<p_cc>* ret = new vector<p_cc>();
-    if (DEBUG_ABSTRACTBOARD) printf("AB::legal 100\n");
-    return ret;
-  }
@@ -265 +236 @@
-
-vector<p_cc>* abstractBoard::hasNoLibExcP(int x1, int y1, int exc) {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::hasNoLibExcP 0\n");
-  vector<p_cc>* st = new vector<p_cc>;
-  vector<p_cc>* newlyFound = new vector<p_cc>;
@@ -280 +250 @@
-      int y = it1->second;
-      int* nbs = neighbors(x,y);
-      if (DEBUG_ABSTRACTBOARD) printf("AB::hasNoLibExcP 7 (%d,%d) %d\n",x, y,nbs[0]);
-      for (int j=1; j <= nbs[0]; j++) {
-        int yy1 = nbs[j];
-        if (DEBUG_ABSTRACTBOARD) printf("AB::hasNoLibExcP 99\n");
-        if (status[yy1] == ' ' && yy1 != exc) {
-          delete [] nbs;
@@ -322 +290 @@
-    vector<p_cc>::iterator it;
-    for(it=newlyFound->begin(); it!=newlyFound->end(); it++) {
-      if (DEBUG_ABSTRACTBOARD) printf("AB::hasNoLibExcP 10, (%d,%d)\n", it->first, it->second);
-      st->push_back(*it);
-    }
@@ -328 +295 @@
-    newlyFound = n;
-  }
-  if (DEBUG_ABSTRACTBOARD) printf("AB::hasNoLibExcP 100\n");
-  delete n;
-  return st;
@@ -334 +300 @@
-
-void abstractBoard::undo(int n) {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::undo 0\n");
-  for(int i=0; i<n; i++) {
-    if (DEBUG_ABSTRACTBOARD) printf("AB::undo 1 %d\n", i);
-    if (undostack.size()) {
-      Move tuple = undostack.top();
@@ -355 +319 @@
-    }
-  }  
-  if (DEBUG_ABSTRACTBOARD) printf("AB::undo 100\n");
-}
-
-void abstractBoard::remove(int x, int y) {
-  if (DEBUG_ABSTRACTBOARD) printf("AB::remove 0\n");
-  undostack.push(Move(-1, -1, invert(status[boardsize*x+y])));
-  status[boardsize*x+y] = ' ';
-  if (DEBUG_ABSTRACTBOARD) printf("AB::remove 100\n");
-}
-

06/libkombilo/cpptest.cpp

@@ -29 +29 @@
-    gl.start_processing();
-    directory_iterator end_itr;
-// string path = "/home/ug/go/kombilo/06
+string path = "/home/ug/go/kombilo/06/tests1
-    // string path = "/home/ug/go/gtl/reviews";
-
+// 
-    int counter = 0;
-    for(directory_iterator it(path); it != end_itr; ++it) {

06/libkombilo/search.cpp

@@ -4554 +4554 @@
-    if (sz=="") sz = "19";
-    int bs = atoi(sz.c_str());
-3
+1
-      return_val |= UNACCEPTABLE_BOARDSIZE; 
-      process_results_vector.push_back(return_val);
-[] 
+
-      root = root->down;
-      pos++;