Removed #if for USE_GLOBAL_OPTIONS.

This commit is contained in:
nodchip
2020-09-08 23:47:04 +09:00
parent aa2452caf3
commit 82dc68ba9f
3 changed files with 0 additions and 34 deletions
-11
View File
@@ -1022,11 +1022,6 @@ namespace Learner
cout << "Error! : Illegal token " << token << endl; cout << "Error! : Illegal token " << token << endl;
} }
#if defined(USE_GLOBAL_OPTIONS)
// Save it for later restore.
auto oldGlobalOptions = GlobalOptions;
#endif
// If search depth2 is not set, leave it the same as search depth. // If search depth2 is not set, leave it the same as search depth.
if (search_depth_max == INT_MIN) if (search_depth_max == INT_MIN)
search_depth_max = search_depth_min; search_depth_max = search_depth_min;
@@ -1103,12 +1098,6 @@ namespace Learner
} }
std::cout << "gensfen finished." << endl; std::cout << "gensfen finished." << endl;
#if defined(USE_GLOBAL_OPTIONS)
// Restore Global Options.
GlobalOptions = oldGlobalOptions;
#endif
} }
} }
#endif #endif
-12
View File
@@ -1636,13 +1636,6 @@ namespace Learner
uint64_t eta1_epoch = 0; // eta2 is not applied by default uint64_t eta1_epoch = 0; // eta2 is not applied by default
uint64_t eta2_epoch = 0; // eta3 is not applied by default uint64_t eta2_epoch = 0; // eta3 is not applied by default
#if defined(USE_GLOBAL_OPTIONS)
// Save it for later restore.
auto oldGlobalOptions = GlobalOptions;
// If you hit the replacement table, pruning may occur at the previous evaluation value, so turn it off.
GlobalOptions.use_hash_probe = false;
#endif
// --- Function that only shuffles the teacher aspect // --- Function that only shuffles the teacher aspect
// normal shuffle // normal shuffle
@@ -2072,11 +2065,6 @@ namespace Learner
// Save once at the end. // Save once at the end.
learn_think.save(true); learn_think.save(true);
#if defined(USE_GLOBAL_OPTIONS)
// Restore Global Options.
GlobalOptions = oldGlobalOptions;
#endif
} }
} // namespace Learner } // namespace Learner
-11
View File
@@ -2070,17 +2070,6 @@ namespace Learner
rootMoves.push_back(Search::RootMove(m)); rootMoves.push_back(Search::RootMove(m));
assert(!rootMoves.empty()); assert(!rootMoves.empty());
//#if defined(USE_GLOBAL_OPTIONS)
// Since the generation of the substitution table for each search thread should be managed,
// Increase the generation of the substitution table for this thread because it is a new search.
//TT.new_search(th->thread_id());
// ª If you call new_search here, it may be a loss because you can't use the previous search result.
// Do not do this here, but caller should do TT.new_search(th->thread_id()) for each station ...
// ¨Because we want to avoid reaching the same final diagram, use the substitution table commonly for all threads when generating teachers.
//#endif
} }
} }