Changeset 238 for 06/libkombilo-branches/hash_center/search.h

Timestamp:

03/06/07 23:08:07 (22 months ago)

Author:

ug

Message:

Backup of current state (does compile, but hashing is not functional ATM).

Files:

• 06/libkombilo-branches/hash_center/search.h (modified) (11 diffs)

06/libkombilo-branches/hash_center/search.h

@@ -82 +82 @@
 const int FULLBOARD_PATTERN = 9;
 
+class PatternList;
+
 class Pattern {
   public:
@@ -99 +101 @@
     char* contLabels;
     std::vector<MoveNC> contList;
+
 
     // Pattern constructors
@@ -117 +120 @@
     Pattern& copy(const Pattern& p);
 
+    Pattern& apply_flip(int f, bool CS = true);
+    Pattern& subpattern(int offsetX, int offsetY, int sizeX, int sizeY);
     char getInitial(int i, int j);
     char getFinal(int i, int j);
@@ -128 +133 @@
     static int PatternInvFlip(int i);
     static int compose_flips(int i, int j); // returns index of flip "first j, then i"
+    // static int compose_flips_CS(int i, int j); // similarly, but taking CS into account (i.e. 0<=i,j<16)
 };
 
@@ -151 +157 @@
     std::vector<Symmetries> symmetries;
     Continuation* continuations;
+    // flipTable encodes the action of the group of symmetries of the square times Z/2 (for color switch)
+    // on pattern: flipTable[i] is the index in data of the pattern resulting from applying flip i and no 
+    // CS (0<=i<8), or flip i-8 and CS (8<=i<16) to pattern.
     int* flipTable;
+    // special is -1, or equal to the inverse of the flip which maps pattern to its CS'ed pattern
     int special;
 
@@ -157 +167 @@
     ~PatternList();
 
-    char invertColor(char co);
+    // static char invertColor(char co);
     void patternList();
     Pattern get(int i);
@@ -342 +352 @@
 };
 
-class HashhitCS { // hasihing hit for corner/side pattern search
+class HashhitCS { // hashing hit for corner/side/center pattern search
   public:
     int gameid;
@@ -443 +453 @@
 };
 
+class CompleteHashKey { 
+  // returned by compute_hashkey 
+  // contains the information about which subpattern was used to compute the actual hashCode
+  public:
+    hashtype hashCode;
+    int offsetX;
+    int offsetY;
+    int index; // index in corresp. patternList
+
+    CompleteHashKey(); // = NOT_HASHABLE
+    CompleteHashKey(hashtype HASHCODE, int OFFSETX, int OFFSETY, int INDEX);
+};
+
+class HashQuery {
+  public:
+    std::string sql;
+    PatternList* pl0;
+    PatternList* pl1;
+    int flip0;
+    int flip1;
+    int offset0;
+    int offset1;
+    hashtype hashCode0;
+
+    HashQuery(std::string SQL, Pattern* p0, int OFF0, int FLIP0, hashtype HASHCODE0, Pattern* p1, int OFF1, int FLIP1);
+    ~HashQuery();
+};
 
 class Algo_hash : public Algorithm {
@@ -463 +500 @@
     virtual void endgame_process();
     virtual void finalize_process();
+    virtual HashQuery searchQuery(PatternList& patternList);
     virtual int search(PatternList& patternList, GameList& gl, SearchOptions& options, sqlite3* db);
 
     virtual int insert_hash(hashtype hashCod, int pos);
-    virtual std::pair<hashtype,int> compute_hashkey(PatternList& pl, int CS);
+    virtual CompleteHashKey compute_hashkey(PatternList& pl, int CS);
     std::vector<HashInstance* >* hi;
     std::string dbnameext;
@@ -477 +515 @@
   public:
     Algo_hash_corner(int bsize, int SIZE=7, int MAXNUMSTONES = 20);
-    std::pair<hashtype,int> compute_hashkey(PatternList& pl, int CS);
+    CompleteHashKey compute_hashkey(PatternList& pl, int CS);
+    void initialize_process(sqlite3* DB) throw(DBError);
+    HashQuery searchQuery(PatternList& patternList);
     int size;
 };
@@ -492 +532 @@
     Algo_hash_center(int bsize);
     void initialize_process(sqlite3* DB) throw(DBError);
+    void finalize_process();
     void endOfNode_process();
-    void finalize_process();
-    std::pair<hashtype,int> compute_hashkey(PatternList& pl, int CS);
+    CompleteHashKey compute_hashkey(PatternList& pl, int CS);
+    HashQuery searchQuery(PatternList& patternList);
 
     std::map<hashtype, int> data;
+  private:
+    std::map<hashtype, int> frequency;
 };