Changeset 243 for 06/libkombilo-branches

Timestamp:

03/22/07 22:41:18 (2 years ago)

Author:

ug

Message:

Fixed bug w.r.t. pattern anchors in hash_center search. Further small changes.

Files:

• 06/libkombilo-branches/hash_center/cpptest.cpp (modified) (1 diff)
• 06/libkombilo-branches/hash_center/process.py (modified) (2 diffs)
• 06/libkombilo-branches/hash_center/search.cpp (modified) (9 diffs)
• 06/libkombilo-branches/hash_center/search.h (modified) (2 diffs)
• 06/libkombilo-branches/hash_center/test_hash_center2.py (modified) (3 diffs)

06/libkombilo-branches/hash_center/cpptest.cpp

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

06/libkombilo-branches/hash_center/process.py

@@ -10 +10 @@
-
-try: 
-
+# 
-    pass
-except: 
@@ -51 +51 @@
-
-# filelist = glob.glob('./*.sgf')
-
+# 
-# filelist = glob.glob('/home/ug/go/KGS/*/*.sgf')
-# 
+
-
-filelist.sort()

06/libkombilo-branches/hash_center/search.cpp

@@ -2653 +2653 @@
-}
-
-
+, bool do_sort
-  data.push_back(new HashhitCS(gameid, pos, ori, cs));
-//   printf("HashCTREntry::add 1 gid: %d, ori: %d, pos: %d,l: %d\n", gameid, ori, pos, data.size());
-
-
-
-
+o_sort && d
+
+
+, bool do_sort
-  data.push_back(new HashhitCS(gameid, position, cs));
-//   printf("HashCTREntry::add 2 gid: %d, position: %d, l:%d\n", gameid, position, data.size());
-
-
-
-
+o_sort && d
+
+
+unsigned 
-//   printf("to charp\n");
-char* c = new
+unsigned char* c = new unsigned
-  unsigned int i=0;
-  for(vector<HashhitCS* >::iterator it = data.begin(); it != data.end(); it++) {
@@ -2733 +2733 @@
-    // else printf("ok 3\n");
-  }
-
-
+
+
+
+
-    // printf("enter loop\n");
-    HashCTREntry* he = 0;
-    rc = sqlite3_bind_int64(selStmt, 1, it->first);
-    if (rc != SQLITE_OK) printf("error 4a: %d\n", rc); // return rc;
-    rc = sqlite3_step(selStmt);
-    if (rc != SQLITE_DONE && rc != SQLITE_ROW) printf("error 4: %d\n", rc); // throw DBError();
-// else printf("ok 4\n")
+HashCTREntry* he = it->second
-    if (rc == SQLITE_ROW) {
-//       printf("update %lld\n", it->first);
-
-
-
-
-
+
+
-      rc = sqlite3_bind_blob(updStmt, 1, he_charp, he->get_length(), SQLITE_TRANSIENT);
-      if (rc != SQLITE_OK) printf("error 5: %d\n", rc); // return rc;
-      // else printf("ok 5\n");
-      delete [] he_charp;
-      rc = sqlite3_bind_int64(updStmt, 2, it->first);
-      if (rc != SQLITE_OK) printf("error 6: %d\n", rc); // return rc;
-      // else printf("ok 6\n");
-      rc = sqlite3_step(updStmt);
-      if (rc != SQLITE_DONE) printf("error 7: %d\n", rc); // return rc;
-      // else printf("ok 7\n");
-      rc = sqlite3_reset(updStmt);
-      if (rc != SQLITE_OK) printf("error 8: %d\n", rc); // return rc;
-      // else printf("ok 8\n");
-//       sqlite3_reset(selStmt);
-//       rc = sqlite3_step(selStmt);
-//       printf("new length %d\n", sqlite3_column_bytes(selStmt, 0));
-      delete he;
-    } else {
-//       printf("insert %lld\n", it->first);
-      he = new HashCTREntry();
-      he->add(gid, it->second);
-      rc = sqlite3_bind_int64(insStmt, 1, it->first);
-      if (rc != SQLITE_OK) printf("error 9: %d\n", rc); // return rc;
-
-
+
-      rc = sqlite3_bind_blob(insStmt, 2, he_charp, he->get_length(), SQLITE_TRANSIENT);
-      if (rc != SQLITE_OK) printf("error 10: %d\n", rc); // return rc;
-      // else printf("ok 10\n");
-      delete [] he_charp;
-      rc = sqlite3_step(insStmt);
-      if (rc != SQLITE_DONE) printf("error 11: %d\n", rc); // return rc;
-      // else printf("ok 11\n");
-      rc = sqlite3_reset(insStmt);
-      if (rc != SQLITE_OK) printf("error 12: %d\n", rc); // return rc;
-
-
-
-
-
-
+
+
-    rc = sqlite3_reset(selStmt);
-    if (rc != SQLITE_OK) printf("error 13: %d\n", rc); // throw DBError();
-  // else printf("ok 13\n");
-}
+}
+all_hashes.clear();
-  return 0; // success
-}
@@ -2799 +2779 @@
-  // printf("enter algo_hash::initialize_processing\n");
-  db = DB;
+  all_hashes.clear();
-  char buf[200];
-  sprintf(buf, "create table if not exists algo_hash_%d_%s ( hash integer, data blob );", boardsize, dbnameext.c_str());
@@ -2873 +2854 @@
-    (*it)->finalize();
-  if (commit) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
- 
-void Algo_hash::finalize_process() {
-
+
+
+
-  rc = sqlite3_finalize(insStmt);
-  if (rc != SQLITE_OK) printf("error 14: %d\n", rc); // return rc;
@@ -3023 +3015 @@
-          else index = patternList.flipTable[*flip + 8];
-//           printf("%d %d %d %d make cand %d, %d, %d\n", pos, ori, fl, *flip, pos_left, pos_top, index);
-
+
+
-        }
-        delete f_list;
@@ -3142 +3135 @@
-  string sql = buf;
-
-
+ = 0
-  int fl2 = fl;
-  if (patternList.data[patternList.size()-1].colorSwitch) {
@@ -4890 +4883 @@
-      hash_result = ((Algo_hash_corner*)algo_ps[algo_hash_corner+20*bs_index])->search(pl, *this, *searchOptions, algo_dbs[algo_hash_corner+20*bs_index]);
-      if (hash_result == 0) {
+//         printf("hash_corner\n");
-        if (searchOptions->algos & ALGO_MOVELIST && algo_ps[algo_movelist+20*bs_index])
-//           printf("movelist 0\n");
-          algo_ps[algo_movelist+20*bs_index]->search(pl, *this, *searchOptions);
-      }
@@ -4901 +4894 @@
-        hash_result = ((Algo_hash_center*)algo_ps[algo_hash_center+20*bs_index])->search(pl, *this, *searchOptions, algo_dbs[algo_hash_center+20*bs_index]);
-        if (hash_result == 0) {
-movelist after center hash
+hash_center
-          if (searchOptions->algos & ALGO_MOVELIST && algo_ps[algo_movelist+20*bs_index])
-            algo_ps[algo_movelist+20*bs_index]->search(pl, *this, *searchOptions);
@@ -4907 +4900 @@
-      }
-      if (hash_result == -1) {
+//           printf("finalpos\n");
-          if (searchOptions->algos & ALGO_FINALPOS && algo_ps[algo_finalpos+20*bs_index])
-              algo_ps[algo_finalpos+20*bs_index]->search(pl, *this, *searchOptions);
-//           printf("movelist\n");
-          if (searchOptions->algos & ALGO_MOVELIST && algo_ps[algo_movelist+20*bs_index])
-            algo_ps[algo_movelist+20*bs_index]->search(pl, *this, *searchOptions);

06/libkombilo-branches/hash_center/search.h

@@ -524 +524 @@
-
-    void add(unsigned char* c, int l, bool cs, bool do_sort = true);
-
-
-
+, bool do_sort = true
+, bool do_sort = true
+unsigned 
-    int get_length();
-};
@@ -558 +558 @@
-    int maxNumStones;
-    std::set<std::pair<hashtype, int> > hash_vector;
+    std::map<hashtype, HashCTREntry* > all_hashes;
-    virtual int insert_hash(hashtype hashCod, int pos);
-    int insert_all_hashes();

06/libkombilo-branches/hash_center/test_hash_center2.py

@@ -52 +52 @@
-                      (gl.lookupLabel(x,y), cont.B, cont.wB, cont.lB, cont.W, cont.wW, cont.lW))
-
-
-
-
-
+
+
+
+
+
+
+
-    return (nohash_time, hash_time) 
-
@@ -102 +105 @@
-
-start = time.time()
-'t1
+sys.argv[1] + '
-end = time.time()
-print gl.size(), 'games in the database'
@@ -108 +111 @@
-for pattern in pl:
-    print pattern.printPattern()
-
+
+
+
+
-