Changeset 223

Timestamp:

02/23/07 22:21:27 (1 year ago)

Author:

ug

Message:

Fixed bugs concerning databases with different board sizes.

Files:

• 06/libkombilo/cpptest.cpp (modified) (4 diffs)
• 06/libkombilo/search.cpp (modified) (15 diffs)
• 06/libkombilo/search.h (modified) (2 diffs)
• 06/libkombilo/sgfparser.cpp (modified) (1 diff)

06/libkombilo/cpptest.cpp

@@ -29 +29 @@
-    gl.start_processing();
-    directory_iterator end_itr;
-// 
+
-    // string path = "/home/ug/go/gtl/reviews";
-
+// 
-    for(directory_iterator it(path); it != end_itr; ++it) {
-      string n = it->string();
@@ -56 +56 @@
-  // ------------------- set up search pattern ----------------------------------------
-
-
+
+
+
-
-  // anchor varies only in small region of board: the first 4 entries 
@@ -80 +82 @@
-  SearchOptions so;
-  // so.searchInVariations = false;
-
+// 
-  
-  // -------------------- do pattern search --------------------------------------
@@ -90 +92 @@
-  // for(vector<string>::iterator it = res.begin(); it != res.end(); it++)
-  //   printf("%s\n", it->c_str());
-// 
+
-
-  // ------------------- print some statistics ------------------------------------------

06/libkombilo/search.cpp

@@ -33 +33 @@
-using std::string;
-using std::vector;
+using std::map;
-using std::pair;
-using std::make_pair;
@@ -962 +963 @@
-Algo_finalpos::~Algo_finalpos() {
-  if (data) {
-vector<char* >::iterator it = data->begin(); it != data->end(); it++) delete [] *it
+map<int, char* >::iterator it = data->begin(); it != data->end(); it++) delete [] it->second
-    delete data;
-  }
@@ -1030 +1031 @@
-  db = DB;
-  if (data) {
-vector<char* >::iterator it = data->begin(); it != data->end(); it++) delete [] *it
+map<int, char* >::iterator it = data->begin(); it != data->end(); it++) delete [] it->second
-    delete data;
-  }
-vector<
+map<int, 
-  int rc = sqlite3_exec(db, "begin transaction;", 0, 0, 0);
-  if (rc) throw DBError();
-  sqlite3_stmt *ppStmt=0;
-  char sql[100];
-
+id, 
-  rc = sqlite3_prepare(db, sql, -1, &ppStmt, 0);
-  if (rc != SQLITE_OK || ppStmt==0) return rc; // FIXME: catch certain errors, (and/or throw DBError?)
-  while (sqlite3_step(ppStmt) == SQLITE_ROW) {
-    // printf("step0\n");
-
+
+
-    // printf("step1\n");
-    char* d1 = new char[100];
@@ -1049 +1051 @@
-    for(int i=0; i<100; i++) d1[i] = d[i];
-    // printf("step3\n");
-
+
+
-  }
-  // printf("done\n");
@@ -1133 +1136 @@
-    // if (progBar && !(counter % 100))
-    //   progBar.redraw((progEnd-progStart)*counter/len(gl.current) + progStart);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    vector<Candidate* > *matchList = new vector<Candidate* >;;
-
@@ -1200 +1205 @@
-Algo_movelist::~Algo_movelist() {
-  if (data1) {
-vector<
-*it
+map<int, 
+it->second
-    }
-    delete data1;
-  }
-  if (data2) {
-vector<
-*it
+map<int, 
+it->second
-    }
-    delete data2;
@@ -1319 +1324 @@
-int Algo_movelist::readDB(sqlite3* DB) {
-  if (data1) {
-vector<char* >::iterator it = data1->begin(); it != data1->end(); it++) delete [] *it
+map<int, char* >::iterator it = data1->begin(); it != data1->end(); it++) delete [] it->second
-    delete data1;
-  }
-vector<
+map<int, 
-  if (data1l) delete data1l;
-vector<
+map<int, 
-  if (data2) {
-vector<char* >::iterator it = data2->begin(); it != data2->end(); it++) delete [] *it
+map<int, char* >::iterator it = data2->begin(); it != data2->end(); it++) delete [] it->second
-    delete data2;
-  }
-vector<
+map<int, 
-  db = DB;
-
@@ -1337 +1342 @@
-  sqlite3_stmt *ppStmt=0;
-  char sql[100];
-
+,id
-  rc = sqlite3_prepare(db, sql, -1, &ppStmt, 0);
-  if (rc != SQLITE_OK || ppStmt==0) return rc; // FIXME: catch certain errors, (and/or throw DBError?)
@@ -1349 +1354 @@
-      // printf("%c", (d[i] & 31)+97);
-    }
+    int index = sqlite3_column_int(ppStmt, 2);
-    // printf("\n");
-push_back(d1
-push_back(l
+insert(make_pair(index, d1)
+insert(make_pair(index, l)
-    d = (char*)sqlite3_column_blob(ppStmt, 1);
-    d1 = new char[50];
@@ -1357 +1363 @@
-      for(int i=0; i<50; i++) d1[i] = d[i];
-    }
-push_back(d1
+insert(make_pair(index, d1)
-  }
-  rc = sqlite3_finalize(ppStmt);
@@ -1463 +1469 @@
-    stack<VecMC* > branchpoints;
-
--1
+
-    int movelistIndex = 0;
--1
--1
+
+
-    // int nodeCtr = 0;
-    // for(int i=0; i<endMovelist/2; i++) {
@@ -1480 +1486 @@
-    // printf("\n");
-
--1
+
-
-    vector<Candidate* > *currentMatchList = gl.getCurrentCandidateList();
@@ -3980 +3986 @@
-  PatternList pl(pattern, searchOptions->fixedColor, searchOptions->nextMove);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    char buf[20];
-    sprintf(buf, "sz = %d", pattern.boardsize);
@@ -3992 +4013 @@
-  int hash_result = -1;
-  // FULL BOARD PATTERN?
-
-])->search(pl, *this, *searchOptions, algo_dbs[algo_hash_full
++20*bs_index
++20*bs_index])->search(pl, *this, *searchOptions, algo_dbs[algo_hash_full+20*bs_index
-    if (hash_result == 1) {
-    } else if (hash_result == 0) {
-
-
++20*bs_index
++20*bs_index
-    }
-  }
@@ -4003 +4024 @@
-
-    // CORNER PATTERN?
-
-])->search(pl, *this, *searchOptions, algo_dbs[algo_hash_corner
++20*bs_index
++20*bs_index])->search(pl, *this, *searchOptions, algo_dbs[algo_hash_corner+20*bs_index
-      if (hash_result == 0) {
-
-
++20*bs_index
++20*bs_index
-      }
-    }
-
-    if (hash_result == -1) {
-
-
-
-
++20*bs_index
++20*bs_index
++20*bs_index
++20*bs_index
-    }
-  }

06/libkombilo/search.h

@@ -245 +245 @@
-    char* fp;
-    int fpIndex;
-vector<
+map<int, 
-    int readDB(sqlite3* DB);
-    int search(PatternList& patternList, GameList& gl, SearchOptions& options);
@@ -316 +316 @@
-    std::vector<char> movelist;
-    char* fpC;
-vector<
-vector<
-vector<
+map<int, 
+map<int, 
+map<int, 
-};
-

06/libkombilo/sgfparser.cpp

@@ -1006 +1006 @@
-  strcpy(t, result);
-
-
+[] 
-  return t;
-}