Changeset 152 for 06/devel/abstractBoard.cc

Timestamp:

04/14/04 22:27:13 (5 years ago)

Author:

ug

Message:

Fix abstractBoard.cc

Files:

• 06/devel/abstractBoard.cc (modified) (8 diffs)

06/devel/abstractBoard.cc

@@ -254 +254 @@
     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(); d++) c->push_back(*it);
+      for(it = d->begin(); it != d->end(); it++) c->push_back(*it);
+      if (DEBUG_ABSTRACTBOARD) printf("AB::legal 41\n");
       delete d;
     }
   }
-  
+  if (DEBUG_ABSTRACTBOARD) printf("AB::legal 42\n");
   setStatus(x,y,color);
 
@@ -278 +281 @@
     }
     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;
   }
@@ -290 +297 @@
     delete d;
     vector<p_cc>* ret = new vector<p_cc>();
+    if (DEBUG_ABSTRACTBOARD) printf("AB::legal 100\n");
     return ret;
   }
@@ -297 +305 @@
   if (DEBUG_ABSTRACTBOARD) printf("AB::hasNoLibExcP 0\n");
   vector<p_cc>* st = new vector<p_cc>;
-  vector<p_cc> newlyFound;
-  newlyFound.push_back(p_cc(x1, y1));
-
+  vector<p_cc>* newlyFound = new vector<p_cc>;
+  newlyFound->push_back(p_cc(x1, y1));
+  vector<p_cc>* n;
   int foundNew = 1;
         
   while (foundNew) {
     foundNew = 0;
-    vector<p_cc> n;
-    for(unsigned int i=0; i < newlyFound.size(); i++) {
-      p_cc tup = newlyFound[i];
-      int x = tup.first;
-      int y = tup.second;
+    n = new vector<p_cc>;
+    vector<p_cc>::iterator it1;
+    for(it1=newlyFound->begin(); it1!=newlyFound->end(); it1++) {
+      int x = it1->first;
+      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;
@@ -317 +327 @@
         }
         else {
-          p_cc yy(yy1/boardsize, yy1%boardsize);
           if (status[yy1]==status[x*boardsize+y]) {
-            foundNew = 1;
+            p_cc yy(yy1/boardsize, yy1%boardsize);
+            int foundNewHere = 1;
             vector<p_cc>::iterator it;
             for(it = st->begin(); it!=st->end(); it++) {
               if (it->first==yy.first && it->second==yy.second) {
-                foundNew = 0;
+                foundNewHere = 0;
                 break;
               }
             }
-            if (foundNew) {
-              for(it=newlyFound.begin(); it!=newlyFound.end(); it++) {
+            if (foundNewHere) {
+              for(it=newlyFound->begin(); it!=newlyFound->end(); it++) {
                 if (it->first==yy.first && it->second==yy.second) {
-                  foundNew = 0;
+                  foundNewHere = 0;
                   break;
                 }
               }
             }
-            if (foundNew) n.push_back(yy);
+            if (foundNewHere) {
+              n->push_back(yy);
+              foundNew = 1;
+            }
           }
         }
@@ -343 +356 @@
     
     vector<p_cc>::iterator it;
-    for(it=newlyFound.begin(); it!=newlyFound.end(); 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);
+    }
+    delete newlyFound;
     newlyFound = n;
   }
   if (DEBUG_ABSTRACTBOARD) printf("AB::hasNoLibExcP 100\n");
+  delete n;
   return st;
 }
@@ -355 +372 @@
   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();
@@ -365 +383 @@
 
       status[x*boardsize+y] = ' ';
-      for(unsigned int i=0; i < captures->size(); i++) {
-        p_cc t = (*captures)[i];
-        setStatus(t.first, t.second, invert(color));
+      if (captures) {
+        for(unsigned int i=0; i < captures->size(); i++) {
+          p_cc t = (*captures)[i];
+          setStatus(t.first, t.second, invert(color));
+        }
       }
     }