Changeset 182

Timestamp:

09/21/06 23:57:16 (2 years ago)

Author:

ug

Message:

Finished full board hashing, plus several minor improvements.

Files:

• 06/libkombilo/cpptest.cc (modified) (1 diff)
• 06/libkombilo/process.py (modified) (1 diff)
• 06/libkombilo/search.cc (modified) (42 diffs)
• 06/libkombilo/search.h (modified) (8 diffs)
• 06/libkombilo/sgfparser.cc (modified) (1 diff)
• 06/libkombilo/sgfparser.h (modified) (1 diff)
• 06/libkombilo/testhash.py (added)
• 06/libkombilo/testsearch.py (modified) (2 diffs)

06/libkombilo/cpptest.cc

@@ -2 +2 @@
-
-int main() {
-
-
-
+
+
+
+
-  PatternList pl(p, 0, 0, 19);
-        SearchOptions so;

06/libkombilo/process.py

@@ -19 +19 @@
-
-    starttime = time.time()
-# 
+
-    try:
-        gl = GameList('t1.db', 'id', '', algos, 19)

06/libkombilo/search.cc

@@ -769 +769 @@
-void Algorithm::finalize_process() {}
-int Algorithm::readDB(sqlite3* DB) { return 0; }
-void Algorithm::search(PatternList& patternList, GameList& gl, SearchOptions& options) {
+int Algorithm::search(PatternList& patternList, GameList& gl, SearchOptions& options) { return -1; 
-
-Algo_signature::Algo_signature(int bsize) : Algorithm(bsize) {
@@ -945 +945 @@
-int Algo_finalpos::readDB(sqlite3* DB) { 
-        db = DB;
-        // FIXME: do we want to delete data before adding values?
-        if (data) {
-                for(vector<char* >::iterator it = data->begin(); it != data->end(); it++) delete [] *it;
@@ -971 +970 @@
-}
-
-void
+int
-
-        // Put the pattern into bitmap format, which is the format the final
@@ -1098 +1097 @@
-        delete [] allbitlengths;
-        delete [] allbits;
+        return 0;
-}
-
@@ -1194 +1194 @@
-      
-void Algo_movelist::pass_process() {
-// FIXME !!! need to add pass move here to end up with correct
-// counter!
+movelist.push_back(19);
+movelist.push_back(19);
-}
-
@@ -1265 +1265 @@
-}
-
-void
+int
-        // FIXME progbar, variations!!!
-
@@ -1294 +1294 @@
-                // branchpoints = [];
-
-                // printf("oh oh\n");
-                char* movel = (*data1)[index-1];
-                int movelistIndex = 0;
-                int endMovelist = (*data1l)[index-1];
-                // printf("oh oh\n");
-                // printf("len movelist: %d\n", (*data1l)[index-1]);
-                // int nodeCtr = 0;
@@ -1614 +1612 @@
-                delete [] contListIndex;
-        }
+        return 0;
-}
-
@@ -1748 +1747 @@
-
-int Algo_hash::insert_hash(long long hashCode, ExtendedMoveNumber& mn, Move* continuation) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        sqlite3_stmt *ppStmt=0;
-        int rc = sqlite3_prepare(db, sql, -1, &ppStmt, 0);
@@ -1754 +1772 @@
-        rc = sqlite3_bind_int64(ppStmt, 1, currentHashCode);
-        if (rc != SQLITE_OK) return rc;
-
-
-
+
-        if (rc != SQLITE_OK) return rc;
-text(ppStmt, 3, position, boardsize*boardsize, SQLITE_TRANSIENT);
+blob(ppStmt, 3, buf, 5+2*mn.length, SQLITE_TRANSIENT); 
-        if (rc != SQLITE_OK) return rc;
-        rc = sqlite3_step(ppStmt);
@@ -1764 +1780 @@
-        rc = sqlite3_finalize(ppStmt);
-        if (rc != SQLITE_OK) return rc;
+        delete [] buf;
-        return 0; // success
-}
@@ -1769 +1786 @@
-void Algo_hash::initialize_process(sqlite3* DB) throw(DBError) {
-        db = DB;
-char* zErrMsg = 0
-nt rc = sqlite3_exec(db, "create table if not exists algo_hash ( id integer primary key, hash integer, game text, position text );", 
-                             0, 0, &zErrMsg
+int rc = sqlite3_exec(db, "create table if not exists algo_hash ( id integer primary key, hash integer, gameid integer, hit text );", 0, 0, 0)
+f (rc != SQLITE_OK) throw DBError();
+rc = sqlite3_exec(db, "create index if not exists hash_idx on algo_hash(hash);", 0, 0, 0
-        if (rc != SQLITE_OK) throw DBError();
-}
@@ -1777 +1794 @@
-void Algo_hash::newgame_process(int game_id) {
-        gid = game_id;
-  game = new char[1]; game[0] = 0; // game id FIXME
-        position = new char[boardsize*boardsize];
-        for(int i=0; i<boardsize*boardsize; i++) position[i] = '.';
-        moveNumber = new ExtendedMoveNumber(0);
-        currentHashCode = 0; // start with empty board
@@ -1789 +1803 @@
-        for(vector<pair<long long, ExtendedMoveNumber>* >::iterator it = lfc->begin(); it != lfc->end(); it++) {
-                Move* continuation = new Move(x,y,'B');
-
-
+
-                delete continuation;
-                delete *it;
@@ -1796 +1809 @@
-        delete lfc;
-        lfc = new vector<pair<long long, ExtendedMoveNumber>* >;
-        position[x+boardsize*y] = 'B';
-        currentHashCode += hashCodes[x + boardsize*y];
-}
@@ -1803 +1815 @@
-        for(vector<pair<long long, ExtendedMoveNumber>* >::iterator it = lfc->begin(); it != lfc->end(); it++) {
-                Move* continuation = new Move(x,y,'W');
-
-
+
-                delete continuation;
-                delete *it;
@@ -1810 +1821 @@
-        delete lfc;
-        lfc = new vector<pair<long long, ExtendedMoveNumber>* >;
-        position[x+boardsize*y] = 'W';
-        currentHashCode -= hashCodes[x + boardsize*y];
-}                 
@@ -1817 +1827 @@
-  if (removed == 'B') currentHashCode -= hashCodes[x + boardsize*y];
-  else currentHashCode += hashCodes[x + boardsize*y];
-        position[x+boardsize*y] = '.';
-}
-
@@ -1826 +1835 @@
-
-void Algo_hash::pass_process() {
-FIXME: decide whether we count pass as continuation
+(we do not count pass as continuation)
-}
-
@@ -1839 +1848 @@
-        delete lfc;
-        lfc = new vector<pair<long long, ExtendedMoveNumber>* >;
-
+|| m.color == 'X' 
-        currentHashCode += epsilon * hashCodes[m.x + boardsize*m.y];
-        if (m.color == 'X' || m.color == 'O') printf("strange\n");
-        position[m.x+boardsize*m.y] = m.color;
-
-  if (m.captures) {
@@ -1850 +1857 @@
-                        int yy = it->second;
-
-
-
+
-                }
-  }
@@ -1872 +1878 @@
-        }
-        delete lfc;
-        delete [] game;
-        delete [] position;
-        delete moveNumber;
-}
@@ -1882 +1886 @@
-
-long long Algo_hash::compute_hashkey(Pattern& pattern) {
--1 || pattern.sizeY != boardsize-1) 
+ || pattern.sizeY != boardsize)
-                return NOT_HASHABLE;
-  long long hashkey = 0;
@@ -1897 +1901 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return 0;
-}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -2415 +2509 @@
-        if (p != string::npos) gameInfoStr.replace(p, 3, 1, winner);
-
+        // printf("id %s\n", argv[0]);
-        ((GameList*)gl)->all->push_back(new GameListEntry(atoi(argv[0]), winner, gameInfoStr));
-        return 0;
@@ -2462 +2557 @@
-        if (algos & ALGO_HASH_FULL) 
-                algo_ps[algo_hash_full] = new Algo_hash(boardsize);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        current = -1;
-        all = new vector<GameListEntry* >;
@@ -2476 +2583 @@
-                throw DBError();
-  }
+        rc = sqlite3_exec(db, "pragma synchronous = off;", 0, 0, 0);
+        if (rc) throw DBError();
+        rc = sqlite3_exec(db, "pragma cache_size = 300000;", 0, 0, 0);
+        if (rc) throw DBError();
-
-        string sql = "select "; // those two we need in any case
@@ -2481 +2592 @@
-        sql += " from games order by ";
-        sql += orderby;
+        // printf("sql: %s\n", sql.c_str());
-        rc = sqlite3_exec(db, sql.c_str(), insertEntry, this, 0);
-        if (rc == SQLITE_OK) {
@@ -2516 +2628 @@
-        if (oldList) delete oldList;
-        oldList = currentList;
-GameListEntry*
-->id
+pair<int,int>
+.first
-        else {
-
+if (oldList) 
-                oldList = 0;
-                return -1;
@@ -2527 +2639 @@
-int GameList::next() {
-        current++;
-oldList->size() > current) return (*oldList)[current]->id
+current < oldList->size()) return (*oldList)[current].first
-        else {
-
+if (oldList) 
-                oldList = 0;
-                return -1;
@@ -2535 +2647 @@
-}
-
+bool sndcomp(const pair<int,int>& a, const pair<int,int>& b) {
+        return a.second < b.second;
+}
+
+int GameList::start_sorted() {
+        current = 0;
+        if (oldList) delete oldList;
+        oldList = currentList;
+        currentList = new vector<pair<int,int> >;
+        if (!oldList || !oldList->size()) {
+                if (oldList) delete oldList;
+                oldList = 0;
+                return -1;
+        }
+        sort(oldList->begin(), oldList->end());
+        return 0;
+}
+
+int GameList::end_sorted() {
+        // printf("end sorted\n");
+        sort(currentList->begin(), currentList->end(), sndcomp);
+        delete oldList;
+        oldList = 0;
+        return 0;
+}
+
-char GameList::getCurrentWinner() {
-oldList)[current
+all)[(*oldList)[current].second
-}
-
-vector<Candidate* > * GameList::getCurrentCandidateList() {
-oldList)[current
+all)[(*oldList)[current].second
-}
-
-void GameList::makeCurrentCandidate(vector<Candidate* > * candidates) {
-oldList)[current
+all)[(*oldList)[current].second
-        if (gle->candidates) delete gle->candidates;
-        gle->candidates = candidates;
-gle
+(*oldList)[current]
-}
-
-void GameList::makeCurrentHit(vector<Hit* > * hits) {
-oldList)[current
+all)[(*oldList)[current].second
-        if (gle->hits) delete gle->hits;
-        gle->hits = hits;
-        sort(gle->hits->begin(), gle->hits->end(), Hit::cmp_pts);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-void GameList::reset() {
@@ -2562 +2743 @@
-        oldList = 0;
-        if (currentList) delete currentList;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -2572 +2763 @@
-
-int gis_callback(void *gl, int argc, char **argv, char **azColName) {
-
-
-
-
-
-
-
-
-
-
+
+
-        return 0;
-}
-
-bool sndcomp(const pair<int,int>& a, const pair<int,int>& b) {
-        return a.second < b.second;
-}
-
@@ -2596 +2775 @@
-                throw DBError();
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-int GameList::numHits() {
-        int numHits = 0;
-GameListEntry*
-it)->hits) numHits += (*it)
+pair<int,int>
+all)[it->second]->hits) numHits += (*all)[it->second]
-        }
-        return numHits;
@@ -2674 +2835 @@
-        if (start>end || end > currentList->size()) return result;
-        for(int i=start; i<end; i++) {
-currentList)[i]->gameInfoStr + ", " + resultsStr((*currentList)[i
+all)[(*currentList)[i].second]->gameInfoStr + ", " + resultsStr((*all)[(*currentList)[i].second
-        }
-}
@@ -2688 +2849 @@
-    throw DBError();
-  }
+        rc = sqlite3_exec(db, "pragma synchronous = off;", 0, 0, 0);
+        if (rc) throw DBError();
+        rc = sqlite3_exec(db, "pragma cache_size = 300000;", 0, 0, 0);
+        if (rc) throw DBError();
+
-        if (!readDBs) {
-                for(int a=0; a < 20; a++) if (algo_ps[a]) algo_ps[a]->readDB(db);
@@ -2693 +2859 @@
-        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        sqlite3_close(db);
-        db = 0;
@@ -2722 +2895 @@
-        rc = sqlite3_exec(db, sql1, 0, 0, 0);
-        if( rc!=SQLITE_OK ) throw DBError();
+        rc = sqlite3_exec(db, "pragma synchronous = off;", 0, 0, 0);
+        if (rc) throw DBError();
+        rc = sqlite3_exec(db, "pragma cache_size = 300000;", 0, 0, 0);
+        if (rc) throw DBError();
-
-        char* sql = "begin transaction;";
@@ -2749 +2926 @@
-        sqlite3_close(db);
-        db = 0;
-// FIXME!!! rebuild all, currentList
+readDB();
-}
-
@@ -2763 +2940 @@
-        while (root) {
-                current++;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
-                char_p* rootNodeProperties = parseRootNode(root);
-                string dt;
@@ -2811 +2988 @@
-                                else {
-                                  month_found = ('0' <= dt[p] && dt[p] <= '9' && '0' <= dt[p+1] && dt[p+1] <= '9');
- // success: found 4 digits in a row
+
-                                                date += dt.substr(p,2);
-                                                date += '-';
@@ -2831 +3008 @@
-                                        else {
-                                                day_found = ('0' <= dt[p] && dt[p] <= '9' && '0' <= dt[p+1] && dt[p+1] <= '9');
- // success: found 4 digits in a row
+
-                                                        date += dt.substr(p,2);
-                                                } else {

06/libkombilo/search.h

@@ -162 +162 @@
-        public:
-                ExtendedMoveNumber* pos;
-
+ // this does not really contain the label, but rather the position of the continuation move
-                Hit(ExtendedMoveNumber* POS, char* LABEL);
-                ~Hit();
@@ -189 +189 @@
-                virtual void finalize_process();
-                virtual int readDB(sqlite3* DB);
-void
+int
-
-                int gid;
@@ -239 +239 @@
-                vector<char* > *data;
-                int readDB(sqlite3* DB);
-void
+int
-};
-
@@ -269 +269 @@
-                void finalize_process();
-                int readDB(sqlite3* DB);
-void
+int
-
-                vector<char> movelist;
@@ -279 +279 @@
-
-const long long NOT_HASHABLE = 9223372036854775807LL;
+
+
+class Hashhit {
+        public:
+                int gameid;
+                char orientation;
+                MoveNC* cont;
+                ExtendedMoveNumber* emn;
+
+                Hashhit();
+                Hashhit(int GAMEID, char ORIENTATION, char* blob);
+                ~Hashhit();
+};
+
+
-
-class Algo_hash : public Algorithm {
@@ -296 +311 @@
-                void endgame_process();
-                void finalize_process();
-
-
+
-
-                int insert_hash(long long hashCode, ExtendedMoveNumber& mn, Move* continuation);
-                long long compute_hashkey(Pattern& pattern);
-
-                char* position;
-                char* game;
-                long long currentHashCode;
-                ExtendedMoveNumber* moveNumber;
@@ -390 +402 @@
-                algo_p* algo_ps;
-                vector<GameListEntry* > * all;
-
-
+
+
+
+
-                int current;
-                sqlite3* db;
@@ -417 +431 @@
-                int start();
-                int next();
+                int start_sorted();
+                int end_sorted();
-                char getCurrentWinner();
-                vector<Candidate* > *getCurrentCandidateList();
-                void makeCurrentCandidate(vector<Candidate* > *candidates);
-                void makeCurrentHit(vector<Hit* > *hits);
-ector<pair<int,int> >* sortedList
-ector<pair<int,int> >* oldSortedList
+oid makeIndexCandidate(int index, vector<Candidate* > *candidates)
+oid makeIndexHit(int index, vector<Hit* > *hits)
-
-        private:
-                string resultsStr(GameListEntry* gle);
-                char lookupLabel(char x, char y);
+                void readDB();
-};
-

06/libkombilo/sgfparser.cc

@@ -26 +26 @@
-SGFError::SGFError() {}
-
+ExtendedMoveNumber::ExtendedMoveNumber() {
+        length = 0;
+        data = 0;
+}
+
-ExtendedMoveNumber::ExtendedMoveNumber(int LENGTH, int* DATA) {
-length
+LENGTH
-        if (length) data = new int[length];
-        else data = 0;