Changeset 200

Timestamp:

10/15/06 13:27:55 (2 years ago)

Author:

ug

Message:

Some more bug fixes. Started work on tagging support.

Files:

• 06/libkombilo/cpptest.cc (modified) (1 diff)
• 06/libkombilo/search.cc (modified) (15 diffs)
• 06/libkombilo/search.h (modified) (3 diffs)
• 06/libkombilo/testsearch.py (modified) (1 diff)

06/libkombilo/cpptest.cc

@@ -43 +43 @@
-        while (!infile.eof()) {
-          getline(infile, line);
-
+ + "\n"
-        }
-        infile.close();

06/libkombilo/search.cc

@@ -3193 +3193 @@
-  processVariations = true;
-  sgfInDB = true;
-C
+A
-  algos = ALGO_FINALPOS | ALGO_MOVELIST | ALGO_HASH_FULL | ALGO_HASH_CORNER;
-  algo_hash_full_maxNumStones = 50;
@@ -3200 +3200 @@
-
-ProcessOptions::ProcessOptions(string s) {
-
+
+
-  else processVariations = false;
-
-
+
+
+
+
-  int pn = s.find('|', p) + 1;
-  algos = atoi(s.substr(p, pn-p-1).c_str());
@@ -3220 +3224 @@
-string ProcessOptions::asString() {
-  string result;
-
-
+
+
+
+
-  char buf[200];
-
+|
-  result += buf;
-  return result;
@@ -3229 +3235 @@
-
-void ProcessOptions::validate() {
+  string::iterator it = rootNodeTags.begin();
+  while (it != rootNodeTags.end()) {
+    if (*it == ' ') it = rootNodeTags.erase(it);
+    else it++;
+  }
-  if (rootNodeTags.find("PB") == string::npos) rootNodeTags += ",PB";
-  if (rootNodeTags.find("PW") == string::npos) rootNodeTags += ",PW";
-  if (rootNodeTags.find("RE") == string::npos) rootNodeTags += ",RE";
-  if (rootNodeTags.find("DT") == string::npos) rootNodeTags += ",DT";
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -3753 +3778 @@
-
-string GameList::getSGF(int i) throw(DBError) {
-
-
+
+
+
+
+
+
+
+
-  int index = (*currentList)[i].second;
-  // int rc = sqlite3_open(dbname, &db); 
@@ -3783 +3814 @@
-  sizeX = pattern.sizeX; // need this in lookupLabel
-  PatternList pl(pattern, searchOptions->fixedColor, searchOptions->nextMove);
-
-
+
-  // if (rc) {
-  //   sqlite3_close(db);
@@ -3790 +3820 @@
-  //   throw DBError();
-  // }
-
-
-
-
-
+
+
+
+
-
-  if (boardsizes.size() != 1 || boardsizes[0] != pattern.boardsize) {
@@ -3844 +3873 @@
-}
-
+void GameList::createGamesDB() throw(DBError) {
+  SGFtags = p_op->SGFTagsAsStrings();
+
+  string sql1 =          "create table if not exists GAMES ( ";
+  sql1 +=                  "id integer primary key, ";
+  sql1 +=                  "path text, ";
+  sql1 +=                  "filename text, ";
+  sql1 +=                  "pos integer default 0, ";
+  sql1 +=                  "duplicate integer, ";
+  sql1 +=                  "dbtree text, ";
+  sql1 +=                  "date date";
+
+  sql_ins_rnp =            "insert into games (path, filename, pos, dbtree, date";
+  string question_marks =  "?,?,?,?,?";
+
+  if (p_op->sgfInDB) {
+    sql1 +=                ", sgf text";
+    sql_ins_rnp +=         ", sgf";
+    question_marks += ",?";
+  }
+
+  SGFtagsSize = SGFtags->size();
+  int ctr = 0;
+  posDT = posSZ = posWR = posBR = posHA = -1;
+  for(vector<string>::iterator it = SGFtags->begin(); it != SGFtags->end(); it++) {
+    sql1 += ", " + *it + " text";
+    sql_ins_rnp += ", " + *it;
+    question_marks += ",?";
+    if (*it == "DT") posDT = ctr;
+
+    if (*it == "SZ") posSZ = ctr;
+    if (*it == "WR") posWR = ctr;
+    if (*it == "BR") posBR = ctr;
+    if (*it == "HA") posHA = ctr;
+    ctr++;
+  }
+  if (posDT == -1) throw DBError();
+  if (posSZ == -1) {
+    posSZ = SGFtags->size();
+    SGFtags->push_back("SZ");
+  }
+  if (posWR == -1) {
+    posWR = SGFtags->size();
+    SGFtags->push_back("WR");
+  }
+  if (posBR == -1) {
+    posBR = SGFtags->size();
+    SGFtags->push_back("BR");
+  }
+  if (posHA == -1) {
+    posHA = SGFtags->size();
+    SGFtags->push_back("HA");
+  }
+
+  sql1 +=                  ");";
+  sql_ins_rnp +=           ") values (" + question_marks + ");";
+
+  int rc = sqlite3_exec(db, sql1.c_str(), 0, 0, 0);
+  if(rc != SQLITE_OK) throw DBError();
+
+  sql1 = "create table if not exists TAGS ( id integer primary key, name text, visible integer default 1 );";
+  rc = sqlite3_exec(db, sql1.c_str(), 0, 0, 0);
+  if (rc != SQLITE_OK) throw DBError();
+  char sql[100];
+  sprintf(sql, "insert into TAGS (id, name) values (%d, '%d');", HANDI_TAG, HANDI_TAG);
+  rc = sqlite3_exec(db, sql, 0, 0, 0);
+  if (rc != SQLITE_OK) throw DBError();
+  sprintf(sql, "insert into TAGS (id, name) values (%d, '%d');", PROFESSIONAL_TAG, PROFESSIONAL_TAG);
+  rc = sqlite3_exec(db, sql, 0, 0, 0);
+  if (rc != SQLITE_OK) throw DBError();
+  sql1 = "create table if not exists GAME_TAGS ( id integer primary key, game_id integer, tag_id integer );";
+  rc = sqlite3_exec(db, sql1.c_str(), 0, 0, 0);
+  if( rc!=SQLITE_OK ) throw DBError();
+}
-
-void GameList::start_processing(int PROCESSVARIATIONS) throw(DBError) {
@@ -3850 +3953 @@
-  else processVariations = p_op->processVariations;
-  readDBs = 0;
-  string question_marks = "?,?,?,?"; // path, filename, pos, date
-  tags = new vector<string>;
-  int ctr = 0;
-  unsigned int p = 0;
-  unsigned int pn = p_op->rootNodeTags.find(',', p);
-  while (pn != string::npos) {
-    tags->push_back(p_op->rootNodeTags.substr(p,pn-p));
-    question_marks += ",?";
-    if (p_op->rootNodeTags.substr(p,pn-p) == "DT") posDT = ctr;
-    if (p_op->rootNodeTags.substr(p,pn-p) == "SZ") posSZ = ctr;
-    ctr++;
-    p = pn+1;
-    pn = p_op->rootNodeTags.find(',', p);
-  }
-  tags->push_back(p_op->rootNodeTags.substr(p));
-  question_marks += ",?";
-  if (p_op->rootNodeTags.substr(p) == "DT") posDT = ctr;
-  if (p_op->rootNodeTags.substr(p) == "SZ") posSZ = ctr;
-  // printf("dt %d sz %d\n", posDT, posSZ);
-
-  sql_ins_rnp = "insert into games (path, filename, pos, date, ";
-  if (p_op->sgfInDB) {
-    sql_ins_rnp += "sgf, ";
-    question_marks += ",?";
-  }
-  sql_ins_rnp += p_op->rootNodeTags + ") values (" + question_marks + ");";
-  int rc;
-  // rc = sqlite3_open(dbname, &db); 
@@ -3883 +3962 @@
-  //   throw DBError();
-  // }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-  char* sql = "begin transaction;";
-  rc = sqlite3_exec(db, sql, 0, 0, 0);
-
-
-
-
-
+
-  current = 0;
-  for(unsigned int a=0; a < 20*boardsizes.size(); a++) if (algo_ps[a]) algo_ps[a]->initialize_process(db);
@@ -3935 +3998 @@
-  readDBs = 0;
-  readDB();
-
-
-
-
+
+
+
+
+
+
-
-  Cursor* c = 0;
@@ -3968 +4033 @@
-    //  }
-    // }
-
+SGF
-    // for(vector<string>::iterator rnp = rootNodeProperties->begin(); rnp != rootNodeProperties->end(); rnp++)
-    // printf("rnp %s\n", rnp->c_str());
@@ -4078 +4143 @@
-    rc = sqlite3_bind_int(ppStmt, stmt_ctr++, pos);
-    if (rc != SQLITE_OK) throw DBError();
+    rc = sqlite3_bind_text(ppStmt, stmt_ctr++, dbtree, -1, SQLITE_TRANSIENT);
+    if (rc != SQLITE_OK) throw DBError();
-    rc = sqlite3_bind_text(ppStmt, stmt_ctr++, date.c_str(), -1, SQLITE_TRANSIENT); 
-    if (rc != SQLITE_OK) throw DBError();
@@ -4086 +4153 @@
-    }
-
-vector<string>::iterator it = rootNodeProperties->begin(); it != rootNodeProperties->end(); it
-it->
+int i=0; i < SGFtagsSize; i
+(*rootNodeProperties)[i].
-      if (rc != SQLITE_OK) throw DBError();
-    }
@@ -4095 +4162 @@
-    rc = sqlite3_finalize(ppStmt);
-    if (rc != SQLITE_OK)  throw DBError();
+    int game_id = sqlite3_last_insert_rowid(db);
+
+    // evaluate tags
+    if ((*rootNodeProperties)[posHA] != "") { // handicap game
+      char sql[100];
+      sprintf(sql, "insert into GAME_TAGS (game_id, tag_id) values (%d, %d);", game_id, HANDI_TAG);
+      rc = sqlite3_exec(db, sql, 0, 0, 0);
+      if (rc != SQLITE_OK)  throw DBError();
+    }
+    if ((*rootNodeProperties)[posWR].find('p') != string::npos ||
+        (*rootNodeProperties)[posBR].find('p') != string::npos) { 
+      // at least one of the players is professional
+      char sql[100];
+      sprintf(sql, "insert into GAME_TAGS (game_id, tag_id) values (%d, %d);", game_id, PROFESSIONAL_TAG);
+      rc = sqlite3_exec(db, sql, 0, 0, 0);
+      if (rc != SQLITE_OK)  throw DBError();
+    }
-
-    delete rootNodeProperties;
-    int game_id = sqlite3_last_insert_rowid(db);
-
-    // printf("play through the game\n");

06/libkombilo/search.h

@@ -520 +520 @@
-    std::string asString();
-    void validate();
+    std::vector<std::string>* SGFTagsAsStrings();
-
-    ProcessOptions(); // sets default values which have to be overwritten
@@ -602 +603 @@
-
-    void start_processing(int PROCESSVARIATIONS=-1) throw(DBError);
-
+, const char* DBTREE = 0
-    void finalize_processing() throw(DBError);
-    
@@ -621 +622 @@
-
-  private:
+    void createGamesDB() throw(DBError);
-    void readDB() throw(DBError);
-    void addAlgos(int bs);
-
-
+
+
+
+
+
+
-    int sizeX; // keeps track of width of search pattern during search
-    ProcessOptions* p_op;
-
+SGF
-    std::string sql_ins_rnp; // sql string to insert root node properties
-};
-
+const int HANDI_TAG = 1;
+const int PROFESSIONAL_TAG = 2;
+
-#endif
-

06/libkombilo/testsearch.py

@@ -48 +48 @@
-print 'This search took %.2f seconds.' % (end - start)
-
-
-
+
+
+
-