Starting to work now. Use full commands (eg. "build table KRK" instead of "bt KRK") as the short versions doesn't seem to work.

Jesper Torp Kristensen · Jesper Torp Kristensen · commit 82b92eed7934 · 2016-01-04T01:08:42.000+01:00
diff --git a/default.set b/default.set
diff --git a/src/compression/endgame_clustering_functions.cxx b/src/compression/endgame_clustering_functions.cxx
@@ -87,7 +87,7 @@ int KRKB_subset_number(int bishop, __attribute__((unused)) int rook, int _FK_, i
 #define num_values_KQKR (1 + 3 + 3 + 7 + 7)
 int KQKR_subset_number(int brook, __attribute__((unused)) int wqueen, int _FK_, int _BK_ FIFTH_PARAM) {
   _BK_ = INV_REMAP_BOUND_KING[_BK_];
-  
+
   return EDGE_DIST[bk] + CORNER_DIST[bk] + dist(bk,wk) + (7 - dist(bk, brook));
 
 }
@@ -107,15 +107,15 @@ void init_cluster_functions() {
   }
 
   // KRK
-  cluster_functions[DB_WROOK_VALUE] = 
+  cluster_functions[DB_WROOK_VALUE] =
     cluster_functions[DB_BROOK_VALUE] = KRK_subset_number;
-  cluster_functions_num_values[DB_WROOK_VALUE] = 
+  cluster_functions_num_values[DB_WROOK_VALUE] =
     cluster_functions_num_values[DB_BROOK_VALUE] = num_values_KRK;
 
   // Use KRK function for KQK also
-  cluster_functions[DB_WQUEEN_VALUE] = 
+  cluster_functions[DB_WQUEEN_VALUE] =
     cluster_functions[DB_BQUEEN_VALUE] = KRK_subset_number;
-  cluster_functions_num_values[DB_WQUEEN_VALUE] = 
+  cluster_functions_num_values[DB_WQUEEN_VALUE] =
     cluster_functions_num_values[DB_BQUEEN_VALUE] = num_values_KRK;
 
   // KBBK
diff --git a/src/default.set b/src/default.set
@@ -10,6 +10,9 @@ Endgame_cluster_functions_preferred = true
 // MUST be set in the interval [0..64]. 0 represents win/draw/loss information.
 Endgame_bdd_mate_depth_round_up_to_multiples_of_n = 1
 
+// If true, then a mix of DTM and WDL values is used
+Endgame_reduce_information = true
+
 Endgame_calc_sifting = true
 
 // Use mappings[number]. mappings defined in endgame_square_permutations.cxx
@@ -52,26 +55,16 @@ Endgame_output_preprocessed_bdd_tables = false
 Endgame_mark_unreachable_as_dont_cares = true
 
 // if 0, then only static test is performed, otherwise n moves is tried undone
-Endgame_unreachability_depth_test = 3
-
-Endgame_directory = "/users/doktoren/public_html/master_thesis/endgames/"
+Endgame_unreachability_depth_test = 0
 
-Endgame_verify_bdd_with_table = true
+Endgame_directory = "tables/"
 
 // 0 = simple method, 1 = retrograde
 Endgame_construction_method = 1
 
 // If ...show_progress, then for each new mate depth a winning/losing position is shown
 Endgame_construction_show_progress = true
 
-// Determines which endgame is used by engine. 0:own endgames, 1:Nalimov
-Endgame_active_endgame = 0
-
-// Must be at least 16384
-Endgame_Nalimov_cache_size = 1048576
-
-Endgame_Nalimov_directory = "/users/doktoren/public_html/master_thesis/Nalimov/"
-
 //NDEBUG = false
 Eval3_show_evaluation_info = false
 
@@ -133,7 +126,7 @@ Search3_show_line_of_play = false
 Search3_show_value_of_each_move_from_root = true
 
 //NDEBUG : setting still enabled. Only used if XBOARD not defined
-Search3_time_per_move_in_ms = 10000
+Search3_time_per_move_in_ms = 2000
 
 //NDEBUG : not used (false)
 Search3_trace_search = true
@@ -186,4 +179,3 @@ Search3_vulnerable_piece_penalty = 50
 Default_search_function = 3
 
 Default_evaluation_function = 3
-
diff --git a/src/endgames/endgame_functionality.cxx b/src/endgames/endgame_functionality.cxx
@@ -583,9 +583,6 @@ void EndgameFunctionality::init_bdd(BDD &bdd, int player, bool delete_table) {
 bool EndgameFunctionality::name_match(string name_pattern) {
   // divide name and _name into white parts and black parts
   string::size_type tmp;
-
-  if (name_pattern == "*") name_pattern = "K*K*";
-
   tmp = name_pattern.find('K', 1);
   if (tmp == string::npos) return false;
   string np[2];
@@ -606,7 +603,6 @@ bool EndgameFunctionality::name_match(string name_pattern) {
     if (np[side].size()==2  &&
         (int)n[side].size() == 1+(np[side][1] - '0')) continue;
 
-
     string _n = n[side];
     for (uint i=1; i<_n.size(); i++) {
       assert(n[side][i] != 'K');
diff --git a/src/endgames/endgame_material.hxx b/src/endgames/endgame_material.hxx
@@ -6,6 +6,7 @@
 
 #include "../piece_pos.hxx"
 #include "../board_constants.hxx"
+#include "../experimenting.hxx"
 
 #ifdef ALLOW_5_MEN_ENDGAME
 
diff --git a/src/experimenting.hxx b/src/experimenting.hxx
@@ -2,6 +2,9 @@
 #define _EXPERIMENTING_
 // This file contains all the defines that control the compression
 
+#include <iostream>
+using namespace std;
+
 // MAX_MEN must be 4 or 5
 // The files generated will be the same no matter if MAX_MEN is 4 or 5.
 #define MAX_MEN 5
@@ -26,8 +29,7 @@ inline void load_define_value(int fd, char value, string name) {
   char tmp;
   read(fd, &tmp, 1);
   if (tmp != value) {
-    cerr << "Error: Loaded file was created using different defined\n"
-	 << "value for " << name << "\n";
+    cerr << "Error: Loaded file was created using different defined" << endl << "value for " << name << "\n";
     exit(1);
   }
 }
