Rename "Contempt Factor" to "Contempt"

Suggested by Ronald and Lucas on talkchess.

No functional change.

Conflicts:
	src/ucioption.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 340d993a2bb57bb3b61ef9761e4bcebf4aa96448..945f5bf25d9c9d88687e9a36e0ad3ff3285fe823 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -187,7 +187,7 @@ void Search::think() {
 
   TimeMgr.init(Limits, RootPos.game_ply(), RootPos.side_to_move());
 
-  int cf = Options["Contempt Factor"] * PawnValueEg / 100; // From centipawns
+  int cf = Options["Contempt"] * PawnValueEg / 100; // From centipawns
   DrawValue[ RootPos.side_to_move()] = VALUE_DRAW - Value(cf);
   DrawValue[~RootPos.side_to_move()] = VALUE_DRAW + Value(cf);
 

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index e4ea5b07b03ba5e73a47c18d67999d32ca144575..59b50d3cfe6dd6bc96ab9278bee01ce674098799 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -54,19 +54,19 @@ bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const
 
 void init(OptionsMap& o) {
 
-  o["Write Debug Log"]          << Option(false, on_logger);
-  o["Contempt Factor"]          << Option(0, -100,  100);
-  o["Min Split Depth"]          << Option(0, 0, 12, on_threads);
-  o["Threads"]                  << Option(1, 1, MAX_THREADS, on_threads);
-  o["Hash"]                     << Option(16, 1, 1024 * 1024, on_hash_size);
-  o["Clear Hash"]               << Option(on_clear_hash);
-  o["Ponder"]                   << Option(true);
-  o["MultiPV"]                  << Option(1, 1, 500);
-  o["Skill Level"]              << Option(20, 0, 20);
-  o["Move Overhead"]            << Option(30, 0, 5000);
-  o["Minimum Thinking Time"]    << Option(20, 0, 5000);
-  o["Slow Mover"]               << Option(80, 10, 1000);
-  o["UCI_Chess960"]             << Option(false);
+  o["Write Debug Log"]       << Option(false, on_logger);
+  o["Contempt"]              << Option(0, -100,  100);
+  o["Min Split Depth"]       << Option(0, 0, 12, on_threads);
+  o["Threads"]               << Option(1, 1, MAX_THREADS, on_threads);
+  o["Hash"]                  << Option(16, 1, 1024 * 1024, on_hash_size);
+  o["Clear Hash"]            << Option(on_clear_hash);
+  o["Ponder"]                << Option(true);
+  o["MultiPV"]               << Option(1, 1, 500);
+  o["Skill Level"]           << Option(20, 0, 20);
+  o["Move Overhead"]         << Option(30, 0, 5000);
+  o["Minimum Thinking Time"] << Option(20, 0, 5000);
+  o["Slow Mover"]            << Option(80, 10, 1000);
+  o["UCI_Chess960"]          << Option(false);
 }