Fig bugs, new code for larger data

nguyenpham · Sep 22, 2018 · 3d9c221 · 3d9c221
1 parent fb0f643
commit 3d9c221
Show file tree

Hide file tree

Showing 220 changed files with 3,116 additions and 125 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,7 @@
 *.zip
 .vs
 x64
-FelicityEgtb.xcodeproj/project.xcworkspace/xcshareddata
-FelicityEgtb.xcodeproj/project.xcworkspace/xcuserdata/
+Debug
+FelicityEgtb.xcodeproj/project.xcworkspace/xcshareddata/*
+FelicityEgtb.xcodeproj/project.xcworkspace/xcuserdata/*
+FelicityEgtb.xcodeproj/project.xcworkspace/xcuserdata
diff --git a/FelicityEgtb.xcodeproj/project.pbxproj b/FelicityEgtb.xcodeproj/project.pbxproj
diff --git a/FelicityEgtb.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/FelicityEgtb.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...codeproj/project.xcworkspace/xcuserdata/TonyPham.xcuserdatad/IDEFindNavigatorScopes.plist b/...codeproj/project.xcworkspace/xcuserdata/TonyPham.xcuserdatad/IDEFindNavigatorScopes.plist
diff --git a/...deproj/project.xcworkspace/xcuserdata/TonyPham.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/TonyPham.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...proj/project.xcworkspace/xcuserdata/TonyPham.xcuserdatad/xcdebugger/Expressions.xcexplist b/...proj/project.xcworkspace/xcuserdata/TonyPham.xcuserdatad/xcdebugger/Expressions.xcexplist
diff --git a/FelicityEgtb.xcodeproj/xcuserdata/TonyPham.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/FelicityEgtb.xcodeproj/xcuserdata/TonyPham.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,4 +2,102 @@
 <Bucket
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "source/main.cpp"
+            timestampString = "559140013.47207"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "93"
+            endingLineNumber = "93"
+            landmarkName = "main(int argc, const char * argv[])"
+            landmarkType = "9">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "source/main.cpp"
+            timestampString = "559140013.472145"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "87"
+            endingLineNumber = "87"
+            landmarkName = "main(int argc, const char * argv[])"
+            landmarkType = "9">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "source/main.cpp"
+            timestampString = "559140013.472206"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "70"
+            endingLineNumber = "70"
+            landmarkName = "main(int argc, const char * argv[])"
+            landmarkType = "9">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "source/EgtbDb.cpp"
+            timestampString = "559140013.4722511"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "149"
+            endingLineNumber = "149"
+            landmarkName = "EgtbDb::getScore(const int* pieceList, Side side, AcceptScore accept)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "source/EgtbFile.cpp"
+            timestampString = "559185287.015555"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "403"
+            endingLineNumber = "403"
+            landmarkName = "EgtbFile::checkToLoadHeaderAndTable(Side side)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "source/EgtbFile.cpp"
+            timestampString = "559185287.015605"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "402"
+            endingLineNumber = "402"
+            landmarkName = "EgtbFile::checkToLoadHeaderAndTable(Side side)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>
diff --git a/FelicityEgtb.xcodeproj/xcuserdata/TonyPham.xcuserdatad/xcschemes/FelicityEgtb.xcscheme b/FelicityEgtb.xcodeproj/xcuserdata/TonyPham.xcuserdatad/xcschemes/FelicityEgtb.xcscheme
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -43,10 +42,9 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-      language = ""
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "YES"
       customWorkingDirectory = "$PROJECT_DIR"

diff --git a/FelicityEgtb.xcodeproj/xcuserdata/TonyPham.xcuserdatad/xcschemes/xcschememanagement.plist b/FelicityEgtb.xcodeproj/xcuserdata/TonyPham.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/README.md b/README.md
@@ -88,6 +88,45 @@ Now you may query scores (distance to mate) for any position. Your input could b
     std::cout << "Queried, score: " << score << std::endl;
 
 
+Search
+--------
+Serch in alphabeta function only, not in quescience function:
+
+    if not root node && the last move is capture && total attack pieces <= egtbDb.attackPieceCount {
+        int egtbScore = egtbDb.getScore(current board);
+        if (egtbScore != EGTB_SCORE_MISSING && egtbScore != EGTB_SCORE_UNKNOWN) {
+        if (egtbScore == EGTB_SCORE_DRAW) {
+            value = VALUE_DRAW;
+        } else {
+            value = VALUE_MATE - abs(egtbScore) - current_ply - 1;
+            if (score < 0) value = -value;
+        }
+        return value;
+    }
+
+
+Notations
+-----------
+Felicity egtb uses following notations:
+- k: king, a: advisor, e: elephant, r: rook, c: cannon, h: horse, p: pawn
+- m: ministry (other name for elephant pieces) when number of elephants is from 0 to 2. This symbol is used to denote the endgame is a special one, applied our research to reduce file sizes significally.
+- w: white, b: black
+
+
+File extensions
+-----------------
+- .xtb: xiangqi tablebase, not compressed
+- .ztb: xiangqi tablebase, compressed
+- .znt: xiangqi tablebase, compressed, using our special techniques to reduce file sizes significally
+- .ltb: lookup table, support for our special technique files
+- .zlt: lookup table, compressed
+
+
+UCI options
+-------------
+You may share Felicity egtb between engines. So far those may need only the path of the main folder of the egtb. That path can pass from UCI GUI via UCI option. We suggest to use the name "FelicityPath" for that option.
+
+
 Compile
 ----------
 If you use other C++ IDE such as Visual Studio, xCode, you need to creat a new project and add all our code with prefix Egtb and all file in lzma folder, set compile flags to C++11, then those IDEs can compile those source code automatically.

diff --git a/VisualStudio.sln b/VisualStudio.sln
diff --git a/VisualStudio.vcxproj b/VisualStudio.vcxproj
diff --git a/VisualStudio.vcxproj.user b/VisualStudio.vcxproj.user
diff --git a/build.sh b/build.sh
diff --git a/demo1.png b/demo1.png
diff --git a/egtb/.DS_Store b/egtb/.DS_Store
diff --git a/egtb/1/kcaamkaaeb.znb b/egtb/1/kcaamkaaeb.znb
diff --git a/egtb/1/kcaamkaaeeb.znb b/egtb/1/kcaamkaaeeb.znb
diff --git a/egtb/1/kcaamkaaw.znb b/egtb/1/kcaamkaaw.znb
diff --git a/egtb/1/kcaamkab.znb b/egtb/1/kcaamkab.znb
diff --git a/egtb/1/kcaamkaeb.znb b/egtb/1/kcaamkaeb.znb
diff --git a/egtb/1/kcaamkaeeb.znb b/egtb/1/kcaamkaeeb.znb
diff --git a/egtb/1/kcaamkb.znb b/egtb/1/kcaamkb.znb
diff --git a/egtb/1/kcaamkeb.znb b/egtb/1/kcaamkeb.znb
diff --git a/egtb/1/kcaamkeeb.znb b/egtb/1/kcaamkeeb.znb
diff --git a/egtb/1/kcamkaaeb.znb b/egtb/1/kcamkaaeb.znb
diff --git a/egtb/1/kcamkaaeeb.znb b/egtb/1/kcamkaaeeb.znb
diff --git a/egtb/1/kcamkaaw.znb b/egtb/1/kcamkaaw.znb
diff --git a/egtb/1/kcamkab.znb b/egtb/1/kcamkab.znb
diff --git a/egtb/1/kcamkaeb.znb b/egtb/1/kcamkaeb.znb
diff --git a/egtb/1/kcamkaeeb.znb b/egtb/1/kcamkaeeb.znb
diff --git a/egtb/1/kcamkb.znb b/egtb/1/kcamkb.znb
diff --git a/egtb/1/kcamkeb.znb b/egtb/1/kcamkeb.znb
diff --git a/egtb/1/kcamkeeb.znb b/egtb/1/kcamkeeb.znb
diff --git a/egtb/1/kcmkaab.znb b/egtb/1/kcmkaab.znb
diff --git a/egtb/1/kcmkaaeb.znb b/egtb/1/kcmkaaeb.znb
diff --git a/egtb/1/kcmkaaeeb.znb b/egtb/1/kcmkaaeeb.znb
diff --git a/egtb/1/kcmkab.znb b/egtb/1/kcmkab.znb
diff --git a/egtb/1/kcmkaeb.znb b/egtb/1/kcmkaeb.znb
diff --git a/egtb/1/kcmkaeeb.znb b/egtb/1/kcmkaeeb.znb
diff --git a/egtb/1/kcmkb.znb b/egtb/1/kcmkb.znb
diff --git a/egtb/1/kcmkeb.znb b/egtb/1/kcmkeb.znb
diff --git a/egtb/1/kcmkeeb.znb b/egtb/1/kcmkeeb.znb
diff --git a/egtb/1/khaamkaab.znb b/egtb/1/khaamkaab.znb
diff --git a/egtb/1/khaamkaaeb.znb b/egtb/1/khaamkaaeb.znb
diff --git a/egtb/1/khaamkaaeeb.znb b/egtb/1/khaamkaaeeb.znb
diff --git a/egtb/1/khaamkab.znb b/egtb/1/khaamkab.znb
diff --git a/egtb/1/khaamkaeb.znb b/egtb/1/khaamkaeb.znb
diff --git a/egtb/1/khaamkaeeb.znb b/egtb/1/khaamkaeeb.znb
diff --git a/egtb/1/khaamkeb.znb b/egtb/1/khaamkeb.znb
diff --git a/egtb/1/khaamkeeb.znb b/egtb/1/khaamkeeb.znb
diff --git a/egtb/1/khaamkw.znb b/egtb/1/khaamkw.znb
diff --git a/egtb/1/khamkaab.znb b/egtb/1/khamkaab.znb
diff --git a/egtb/1/khamkaaeb.znb b/egtb/1/khamkaaeb.znb
diff --git a/egtb/1/khamkaaeeb.znb b/egtb/1/khamkaaeeb.znb
diff --git a/egtb/1/khamkab.znb b/egtb/1/khamkab.znb
diff --git a/egtb/1/khamkaeb.znb b/egtb/1/khamkaeb.znb
diff --git a/egtb/1/khamkaeeb.znb b/egtb/1/khamkaeeb.znb
diff --git a/egtb/1/khamkeb.znb b/egtb/1/khamkeb.znb
diff --git a/egtb/1/khamkeeb.znb b/egtb/1/khamkeeb.znb
diff --git a/egtb/1/khamkw.znb b/egtb/1/khamkw.znb
diff --git a/egtb/1/khmkaab.znb b/egtb/1/khmkaab.znb
diff --git a/egtb/1/khmkaaeb.znb b/egtb/1/khmkaaeb.znb
diff --git a/egtb/1/khmkaaeeb.znb b/egtb/1/khmkaaeeb.znb
diff --git a/egtb/1/khmkab.znb b/egtb/1/khmkab.znb
diff --git a/egtb/1/khmkaeb.znb b/egtb/1/khmkaeb.znb
diff --git a/egtb/1/khmkaeeb.znb b/egtb/1/khmkaeeb.znb
diff --git a/egtb/1/khmkb.znb b/egtb/1/khmkb.znb
diff --git a/egtb/1/khmkeb.znb b/egtb/1/khmkeb.znb
diff --git a/egtb/1/khmkeeb.znb b/egtb/1/khmkeeb.znb
diff --git a/egtb/1/kpaamkaab.znb b/egtb/1/kpaamkaab.znb
diff --git a/egtb/1/kpaamkaaeb.znb b/egtb/1/kpaamkaaeb.znb
diff --git a/egtb/1/kpaamkaaeeb.znb b/egtb/1/kpaamkaaeeb.znb
diff --git a/egtb/1/kpaamkab.znb b/egtb/1/kpaamkab.znb
diff --git a/egtb/1/kpaamkaeb.znb b/egtb/1/kpaamkaeb.znb
diff --git a/egtb/1/kpaamkaeeb.znb b/egtb/1/kpaamkaeeb.znb
diff --git a/egtb/1/kpaamkeb.znb b/egtb/1/kpaamkeb.znb
diff --git a/egtb/1/kpaamkeeb.znb b/egtb/1/kpaamkeeb.znb
diff --git a/egtb/1/kpaamkw.znb b/egtb/1/kpaamkw.znb
diff --git a/egtb/1/kpamkaab.znb b/egtb/1/kpamkaab.znb
diff --git a/egtb/1/kpamkaaeb.znb b/egtb/1/kpamkaaeb.znb
diff --git a/egtb/1/kpamkaaeeb.znb b/egtb/1/kpamkaaeeb.znb
diff --git a/egtb/1/kpamkab.znb b/egtb/1/kpamkab.znb
diff --git a/egtb/1/kpamkaeb.znb b/egtb/1/kpamkaeb.znb
diff --git a/egtb/1/kpamkaeeb.znb b/egtb/1/kpamkaeeb.znb
diff --git a/egtb/1/kpamkeb.znb b/egtb/1/kpamkeb.znb
diff --git a/egtb/1/kpamkeeb.znb b/egtb/1/kpamkeeb.znb
diff --git a/egtb/1/kpamkw.znb b/egtb/1/kpamkw.znb
diff --git a/egtb/1/kpmkaab.znb b/egtb/1/kpmkaab.znb
diff --git a/egtb/1/kpmkaaeb.znb b/egtb/1/kpmkaaeb.znb
diff --git a/egtb/1/kpmkaaeeb.znb b/egtb/1/kpmkaaeeb.znb
diff --git a/egtb/1/kpmkab.znb b/egtb/1/kpmkab.znb
diff --git a/egtb/1/kpmkaeb.znb b/egtb/1/kpmkaeb.znb
diff --git a/egtb/1/kpmkaeeb.znb b/egtb/1/kpmkaeeb.znb
diff --git a/egtb/1/kpmkb.znb b/egtb/1/kpmkb.znb
diff --git a/egtb/1/kpmkeb.znb b/egtb/1/kpmkeb.znb
diff --git a/egtb/1/kpmkeeb.znb b/egtb/1/kpmkeeb.znb
diff --git a/egtb/1/kraamkaaeew.znb b/egtb/1/kraamkaaeew.znb
diff --git a/egtb/1/kraamkaaew.znb b/egtb/1/kraamkaaew.znb
diff --git a/egtb/1/kraamkaaw.znb b/egtb/1/kraamkaaw.znb
diff --git a/egtb/1/kraamkab.znb b/egtb/1/kraamkab.znb
diff --git a/egtb/1/kraamkaeew.znb b/egtb/1/kraamkaeew.znb
diff --git a/egtb/1/kraamkaew.znb b/egtb/1/kraamkaew.znb
diff --git a/egtb/1/kraamkeew.znb b/egtb/1/kraamkeew.znb
diff --git a/egtb/1/kraamkew.znb b/egtb/1/kraamkew.znb
diff --git a/egtb/1/kraamkw.znb b/egtb/1/kraamkw.znb
diff --git a/egtb/1/kramkaaeew.znb b/egtb/1/kramkaaeew.znb
diff --git a/egtb/1/kramkaaew.znb b/egtb/1/kramkaaew.znb
diff --git a/egtb/1/kramkaaw.znb b/egtb/1/kramkaaw.znb
diff --git a/egtb/1/kramkaeew.znb b/egtb/1/kramkaeew.znb
diff --git a/egtb/1/kramkaew.znb b/egtb/1/kramkaew.znb
diff --git a/egtb/1/kramkaw.znb b/egtb/1/kramkaw.znb
diff --git a/egtb/1/kramkeew.znb b/egtb/1/kramkeew.znb
diff --git a/egtb/1/kramkew.znb b/egtb/1/kramkew.znb
diff --git a/egtb/1/kramkw.znb b/egtb/1/kramkw.znb
diff --git a/egtb/1/krmkaaeew.znb b/egtb/1/krmkaaeew.znb
diff --git a/egtb/1/krmkaaew.znb b/egtb/1/krmkaaew.znb
diff --git a/egtb/1/krmkaaw.znb b/egtb/1/krmkaaw.znb
diff --git a/egtb/1/krmkaeew.znb b/egtb/1/krmkaeew.znb
diff --git a/egtb/1/krmkaew.znb b/egtb/1/krmkaew.znb
diff --git a/egtb/1/krmkaw.znb b/egtb/1/krmkaw.znb
diff --git a/egtb/1/krmkeew.znb b/egtb/1/krmkeew.znb
diff --git a/egtb/1/krmkew.znb b/egtb/1/krmkew.znb
diff --git a/egtb/1/krmkw.znb b/egtb/1/krmkw.znb
diff --git a/egtb/1/lu/kcaamkaaeb.zlt b/egtb/1/lu/kcaamkaaeb.zlt
diff --git a/egtb/1/lu/kcaamkaaeeb.zlt b/egtb/1/lu/kcaamkaaeeb.zlt
diff --git a/egtb/1/lu/kcaamkaaw.zlt b/egtb/1/lu/kcaamkaaw.zlt
diff --git a/egtb/1/lu/kcaamkab.zlt b/egtb/1/lu/kcaamkab.zlt
diff --git a/egtb/1/lu/kcaamkaeb.zlt b/egtb/1/lu/kcaamkaeb.zlt
diff --git a/egtb/1/lu/kcaamkaeeb.ltb b/egtb/1/lu/kcaamkaeeb.ltb
diff --git a/egtb/1/lu/kcaamkb.zlt b/egtb/1/lu/kcaamkb.zlt
diff --git a/egtb/1/lu/kcaamkeb.zlt b/egtb/1/lu/kcaamkeb.zlt
diff --git a/egtb/1/lu/kcaamkeeb.zlt b/egtb/1/lu/kcaamkeeb.zlt
diff --git a/egtb/1/lu/kcamkaaeb.zlt b/egtb/1/lu/kcamkaaeb.zlt
diff --git a/egtb/1/lu/kcamkaaeeb.zlt b/egtb/1/lu/kcamkaaeeb.zlt
diff --git a/egtb/1/lu/kcamkaaw.zlt b/egtb/1/lu/kcamkaaw.zlt
diff --git a/egtb/1/lu/kcamkab.zlt b/egtb/1/lu/kcamkab.zlt
diff --git a/egtb/1/lu/kcamkaeb.zlt b/egtb/1/lu/kcamkaeb.zlt
diff --git a/egtb/1/lu/kcamkaeeb.ltb b/egtb/1/lu/kcamkaeeb.ltb
diff --git a/egtb/1/lu/kcamkb.zlt b/egtb/1/lu/kcamkb.zlt
diff --git a/egtb/1/lu/kcamkeb.zlt b/egtb/1/lu/kcamkeb.zlt
diff --git a/egtb/1/lu/kcamkeeb.zlt b/egtb/1/lu/kcamkeeb.zlt
diff --git a/egtb/1/lu/kcmkaab.ltb b/egtb/1/lu/kcmkaab.ltb
diff --git a/egtb/1/lu/kcmkaaeb.ltb b/egtb/1/lu/kcmkaaeb.ltb
diff --git a/egtb/1/lu/kcmkaaeeb.ltb b/egtb/1/lu/kcmkaaeeb.ltb
diff --git a/egtb/1/lu/khaamkaab.ltb b/egtb/1/lu/khaamkaab.ltb
diff --git a/egtb/1/lu/khaamkaaeb.ltb b/egtb/1/lu/khaamkaaeb.ltb
diff --git a/egtb/1/lu/khaamkaaeeb.ltb b/egtb/1/lu/khaamkaaeeb.ltb
diff --git a/egtb/1/lu/khaamkab.zlt b/egtb/1/lu/khaamkab.zlt
diff --git a/egtb/1/lu/khaamkaeb.ltb b/egtb/1/lu/khaamkaeb.ltb
diff --git a/egtb/1/lu/khaamkaeeb.ltb b/egtb/1/lu/khaamkaeeb.ltb
diff --git a/egtb/1/lu/khaamkeb.ltb b/egtb/1/lu/khaamkeb.ltb
diff --git a/egtb/1/lu/khaamkeeb.ltb b/egtb/1/lu/khaamkeeb.ltb
diff --git a/egtb/1/lu/khaamkw.zlt b/egtb/1/lu/khaamkw.zlt
diff --git a/egtb/1/lu/khamkab.zlt b/egtb/1/lu/khamkab.zlt
diff --git a/egtb/1/lu/khamkaeb.ltb b/egtb/1/lu/khamkaeb.ltb
diff --git a/egtb/1/lu/khamkeb.ltb b/egtb/1/lu/khamkeb.ltb
diff --git a/egtb/1/lu/khamkw.ltb b/egtb/1/lu/khamkw.ltb
diff --git a/egtb/1/lu/khmkab.ltb b/egtb/1/lu/khmkab.ltb
diff --git a/egtb/1/lu/khmkaeb.ltb b/egtb/1/lu/khmkaeb.ltb
diff --git a/egtb/1/lu/khmkb.ltb b/egtb/1/lu/khmkb.ltb
diff --git a/egtb/1/lu/khmkeb.ltb b/egtb/1/lu/khmkeb.ltb
diff --git a/egtb/1/lu/kpaamkab.ltb b/egtb/1/lu/kpaamkab.ltb
diff --git a/egtb/1/lu/kpaamkw.ltb b/egtb/1/lu/kpaamkw.ltb
diff --git a/egtb/1/lu/kpamkab.ltb b/egtb/1/lu/kpamkab.ltb
diff --git a/egtb/1/lu/kpamkw.ltb b/egtb/1/lu/kpamkw.ltb
diff --git a/egtb/1/lu/kpmkb.ltb b/egtb/1/lu/kpmkb.ltb
diff --git a/egtb/1/lu/kraamkaaeew.zlt b/egtb/1/lu/kraamkaaeew.zlt
diff --git a/egtb/1/lu/kraamkaaew.zlt b/egtb/1/lu/kraamkaaew.zlt
diff --git a/egtb/1/lu/kraamkaaw.zlt b/egtb/1/lu/kraamkaaw.zlt
diff --git a/egtb/1/lu/kraamkab.zlt b/egtb/1/lu/kraamkab.zlt
diff --git a/egtb/1/lu/kraamkaeew.zlt b/egtb/1/lu/kraamkaeew.zlt
diff --git a/egtb/1/lu/kraamkaew.zlt b/egtb/1/lu/kraamkaew.zlt
diff --git a/egtb/1/lu/kraamkeew.zlt b/egtb/1/lu/kraamkeew.zlt
diff --git a/egtb/1/lu/kraamkew.zlt b/egtb/1/lu/kraamkew.zlt
diff --git a/egtb/1/lu/kraamkw.zlt b/egtb/1/lu/kraamkw.zlt
diff --git a/egtb/1/lu/kramkaaeew.zlt b/egtb/1/lu/kramkaaeew.zlt
diff --git a/egtb/1/lu/kramkaaew.zlt b/egtb/1/lu/kramkaaew.zlt
diff --git a/egtb/1/lu/kramkaaw.zlt b/egtb/1/lu/kramkaaw.zlt
diff --git a/egtb/1/lu/kramkaeew.zlt b/egtb/1/lu/kramkaeew.zlt
diff --git a/egtb/1/lu/kramkaew.zlt b/egtb/1/lu/kramkaew.zlt
diff --git a/egtb/1/lu/kramkaw.zlt b/egtb/1/lu/kramkaw.zlt
diff --git a/egtb/1/lu/kramkeew.zlt b/egtb/1/lu/kramkeew.zlt
diff --git a/egtb/1/lu/kramkew.zlt b/egtb/1/lu/kramkew.zlt
diff --git a/egtb/1/lu/kramkw.zlt b/egtb/1/lu/kramkw.zlt
diff --git a/egtb/1/lu/krmkaaeew.zlt b/egtb/1/lu/krmkaaeew.zlt
diff --git a/egtb/1/lu/krmkaaew.zlt b/egtb/1/lu/krmkaaew.zlt
diff --git a/egtb/1/lu/krmkaaw.zlt b/egtb/1/lu/krmkaaw.zlt
diff --git a/egtb/1/lu/krmkaeew.zlt b/egtb/1/lu/krmkaeew.zlt
diff --git a/egtb/1/lu/krmkaew.zlt b/egtb/1/lu/krmkaew.zlt
diff --git a/egtb/1/lu/krmkaw.zlt b/egtb/1/lu/krmkaw.zlt
diff --git a/egtb/1/lu/krmkeew.zlt b/egtb/1/lu/krmkeew.zlt
diff --git a/egtb/1/lu/krmkew.zlt b/egtb/1/lu/krmkew.zlt
diff --git a/egtb/1/lu/krmkw.ltb b/egtb/1/lu/krmkw.ltb
diff --git a/source/.DS_Store b/source/.DS_Store
diff --git a/source/Egtb.cpp b/source/Egtb.cpp
@@ -51,6 +51,7 @@
 
 namespace egtb {
     bool egtbVerbose = false;
+    int  availableAttackerTotal = 0;
 
     void toLower(std::string& str) {
         for(int i = 0; i < str.size(); ++i) {
@@ -171,22 +172,54 @@ namespace egtb {
         return res == SZ_OK ? (int)dstLen : -1;
     }
 
-    i64 decompressAllBlocks(int blocksize, int blocknum, u32* blocktable, char *dest, i64 uncompressedlen, const char *src, i64 slen) {
+    i64 decompressAllBlocks(int blocksize, int blocknum, u8* blocktable, char *dest, i64 uncompressedlen, const char *src, i64 slen) {
         auto *s = src;
         auto p = dest;
 
+//        for(int i = 0; i < blocknum; i++) {
+//            int blocksz = (blocktable[i] & ~EGTB_UNCOMPRESS_BIT) - (i == 0 ? 0 : (blocktable[i - 1] & ~EGTB_UNCOMPRESS_BIT));
+//            int uncompressed = blocktable[i] & EGTB_UNCOMPRESS_BIT;
+//
+//            if (uncompressed) {
+//                memcpy(p, s, blocksz);
+//                p += blocksz;
+//            } else {
+//                auto left = uncompressedlen - (i64)(p - dest);
+//                auto curBlockSize = (int)MIN(left, (i64)blocksize);
+//
+//                auto originSz = decompress((char*)p, curBlockSize, s, blocksz);
+//                p += originSz;
+//            }
+//            s += blocksz;
+//        }
+
+        int blockTableItemSize = slen > EGTB_SMALL_COMPRESS_SIZE ? 5 : 4;
         for(int i = 0; i < blocknum; i++) {
-            int blocksz = (blocktable[i] & ~EGTB_UNCOMPRESS_BIT) - (i == 0 ? 0 : (blocktable[i - 1] & ~EGTB_UNCOMPRESS_BIT));
-            int uncompressed = blocktable[i] & EGTB_UNCOMPRESS_BIT;
+            bool uncompressed = false;
+            int blocksz;
+            if (blockTableItemSize == 4) {
+                const u32* p = (u32*)blocktable;
+                blocksz = (p[i] & EGTB_SMALL_COMPRESS_SIZE) - (i == 0 ? 0 : (p[i - 1] & EGTB_SMALL_COMPRESS_SIZE));
+                uncompressed = (p[i] & EGTB_UNCOMPRESS_BIT) != 0;
+            } else {
+                const u8* p = blocktable + i * blockTableItemSize;
+                i64 sz1 = *((i64*)p) & EGTB_LARGE_COMPRESS_SIZE;
+                i64 sz0 = i == 0 ? 0 : (*((i64*)(p - blockTableItemSize)) & EGTB_LARGE_COMPRESS_SIZE);
+                blocksz = (int)(sz1 - sz0);
+                uncompressed = (*((i64*)p) & EGTB_UNCOMPRESS_BIT_FOR_LARGE_COMPRESSTABLE) != 0;
+            }
 
             if (uncompressed) {
+                assert(i + 1 == blocknum || blocksz == blocksize);
                 memcpy(p, s, blocksz);
                 p += blocksz;
             } else {
-                auto left = uncompressedlen - (i64)(p - dest);
+                // Size of uncompressed data (dest, not src)
+                auto left = uncompressedlen - (i64)(p - dest); assert(left > 0);
                 auto curBlockSize = (int)MIN(left, (i64)blocksize);
 
                 auto originSz = decompress((char*)p, curBlockSize, s, blocksz);
+                assert(originSz == curBlockSize || (i + 1 == blocknum && originSz > 0));
                 p += originSz;
             }
             s += blocksz;

diff --git a/source/Egtb.h b/source/Egtb.h
@@ -83,6 +83,9 @@ namespace egtb {
     const int W                         = 1;
 
     const int EGTB_UNCOMPRESS_BIT       = 1 << 31;
+    const int64_t EGTB_SMALL_COMPRESS_SIZE  = (1LL << 31) - 1;
+    const int64_t EGTB_UNCOMPRESS_BIT_FOR_LARGE_COMPRESSTABLE = (1LL << 39);
+    const int64_t EGTB_LARGE_COMPRESS_SIZE  = (EGTB_UNCOMPRESS_BIT_FOR_LARGE_COMPRESSTABLE - 1); // 7fffffffff
 
     enum EgtbMemMode {
         tiny,           // load minimum data into memory
@@ -121,7 +124,7 @@ namespace egtb {
     };
 
     enum class EgtbType {
-        dtm, newdtm, lookup, none
+        dtm, newdtm, lookup, tmp, none
     };
 
     enum EgtbLoadStatus {
@@ -141,20 +144,22 @@ namespace egtb {
     std::vector<std::string> listdir(std::string dirname);
 
     int decompress(char *dst, int uncompresslen, const char *src, int slen);
-    i64 decompressAllBlocks(int blocksize, int blocknum, u32* blocktable, char *dest, i64 uncompressedlen, const char *src, i64 slen);
+//    i64 decompressAllBlocks(int blocksize, int blocknum, u32* blocktable, char *dest, i64 uncompressedlen, const char *src, i64 slen);
+    i64 decompressAllBlocks(int blocksize, int blocknum, u8* blocktable, char *dest, i64 uncompressedlen, const char *src, i64 slen);
 
     extern const int egtbPieceListStartIdxByType[7];
     extern const PieceType egtbPieceListIdxToType[16];
 
     // set it to true if you want to print out more messages
     extern bool egtbVerbose;
+    extern int availableAttackerTotal;
 
     class Piece;
     class Move;
     class MoveList;
     class EgtbFile;
     class EgtbLookup;
-    class EgtbDb;
+    class _EgtbDb;
     class EgtbBoard;
     class EgtbKeyRec;
     class EgtbKey;

diff --git a/source/EgtbBoard.cpp b/source/EgtbBoard.cpp
diff --git a/source/EgtbBoard.h b/source/EgtbBoard.h
@@ -168,11 +168,14 @@ namespace egtb {
             }
             return stringStream.str();
         }
+        bool isEmpty() const {
+            return end == 0;
+        }
     };
 
 
     class EgtbBoard {
-    private:
+    protected:
         Piece pieces[90];
 
     public:
@@ -231,7 +234,7 @@ namespace egtb {
             return pieceList_isThereAttacker((const int *)pieceList);
         }
 
-    private:
+    protected:
         std::string toString() const;
 
         void gen_addMove(MoveList& moveList, int from, int dest, bool capOnly) const;

diff --git a/source/EgtbDb.cpp b/source/EgtbDb.cpp
@@ -31,7 +31,7 @@ using namespace egtb;
 EgtbDb::EgtbDb() {
 }
 
-EgtbDb::EgtbDb(const std::string& folder, EgtbMemMode egtbMemMode) {
+EgtbDb::EgtbDb(const std::string& folder, EgtbMemMode egtbMemMode){
     preload(folder, egtbMemMode);
 }
 
@@ -64,6 +64,10 @@ void EgtbDb::addFolder(const std::string& folderName) {
     folders.push_back(folderName);
 }
 
+EgtbFile* EgtbDb::createEgtbFile() const {
+    return new EgtbFile();
+}
+
 EgtbFile* EgtbDb::getEgtbFile(const std::string& name) {
     return nameMap[name];
 }
@@ -82,7 +86,7 @@ void EgtbDb::preload(EgtbMemMode egtbMemMode, EgtbLoadMode loadMode) {
         for (auto && path : vec) {
             auto p = EgtbFile::getExtensionType(path);
             if (p.first == EgtbType::dtm || p.first == EgtbType::newdtm) {
-                EgtbFile *egtbFile = new EgtbFile();
+                EgtbFile *egtbFile = createEgtbFile(); //new EgtbFile();
                 if (egtbFile->preload(path, egtbMemMode, loadMode)) {
                     auto pos = map.find(egtbFile->materialsignWB);
                     if (pos == map.end()) {
@@ -146,12 +150,12 @@ int EgtbDb::getScore(const int* pieceList, Side side, AcceptScore accept) {
         return EGTB_SCORE_MISSING;
     }
 
-    pEgtbFile->checkToLoadHeaderAndTable(side);
+    pEgtbFile->checkToLoadHeaderAndTable(Side::none); // load all sides
     auto r = pEgtbFile->getKey(pieceList);
-    auto querySide = r.second ? getXSide(side) : side;
+    auto querySide = r.flipSide ? getXSide(side) : side;
 
     if (pEgtbFile->header->isSide(querySide)) {
-        auto score = pEgtbFile->getScore(r.first, querySide);
+        auto score = pEgtbFile->getScore(r.key, querySide);
         if ((score == EGTB_SCORE_WINNING && accept == AcceptScore::real) || score == EGTB_SCORE_UNKNOWN) {
             score = pEgtbFile->lookup((const int *)pieceList, querySide);
         }
@@ -196,6 +200,10 @@ int EgtbDb::getScore(const EgtbBoard& board, AcceptScore accept) {
     return getScore((const int*)board.pieceList, board.side, accept);
 }
 
+int EgtbDb::getScore(const EgtbBoard& board, Side side, AcceptScore accept) {
+    return getScore((const int*)board.pieceList, side, accept);
+}
+
 int EgtbDb::getScore(const char* fenString, AcceptScore accept) {
     EgtbBoard board;
     board.setFen(fenString);