Merge branch 'master' into no_eval_learn

src/extra/nnue_data_binpack_format.h

@@ -41,6 +41,7 @@ THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <array>
 #include <limits>
 #include <climits>
+#include <optional>
 
 #if (defined(_MSC_VER) || defined(__INTEL_COMPILER)) && !defined(__clang__)
 #include <intrin.h>
@@ -7196,4 +7197,4 @@ namespace binpack
 
         std::cout << "Finished. Converted " << numProcessedPositions << " positions.\n";
     }
-}
+}

src/learn/learn.cpp

@@ -1986,7 +1986,13 @@ namespace Learner
         Eval::NNUE::SetBatchSize(nn_batch_size);
         Eval::NNUE::SetOptions(nn_options);
         if (newbob_decay != 1.0 && !Options["SkipLoadingEval"]) {
-            learn_think.best_nn_directory = std::string(Options["EvalDir"]);
+            // Save the current net to [EvalSaveDir]\original.
+            Eval::save_eval("original");
+
+            // Set the folder above to best_nn_directory so that the trainer can
+            // resotre the network parameters from the original net file.
+            learn_think.best_nn_directory =
+                Path::Combine(Options["EvalSaveDir"], "original");
         }
 
         cout << "init done." << endl;

src/ucioption.cpp

@@ -157,7 +157,7 @@ Option::operator double() const {
 }
 
 Option::operator std::string() const {
-  assert(type == "string");
+  assert(type == "check" || type == "spin" || type == "combo" || type == "button" || type == "string");
   return currentValue;
 }