add OwnBookPath option

megalodon-chess · Jul 21, 2023 · 4b64734 · 4b64734
1 parent 5c2c3b6
commit 4b64734
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -107,7 +107,6 @@ int main(const int argc, const char* argv[]) {
     } else {
         Hash::init();
         Eval::init();
-        Opening::init();
 
         print_info();
         return loop();

diff --git a/src/opening.cpp b/src/opening.cpp
@@ -23,6 +23,7 @@
 #include <fstream>
 #include "hash.hpp"
 #include "bitboard.hpp"
+#include "options.hpp"
 #include "utils.hpp"
 #include "random.hpp"
 
@@ -37,11 +38,10 @@ using std::getline;
 
 
 namespace Opening {
-    const string OPENINGS_FILE = "openings.txt";
     vector<string> openings;
 
-    void init() {
-        ifstream openings_file(OPENINGS_FILE);
+    void load_openings(Options& options) {
+        ifstream openings_file(options.OwnBookPath);
 
         if (!openings_file.is_open()) {
             cerr << "Warning: could not open openings file." << endl;

diff --git a/src/opening.hpp b/src/opening.hpp
@@ -23,6 +23,7 @@
 #include <vector>
 #include <string>
 #include "bitboard.hpp"
+#include "options.hpp"
 
 using std::cin;
 using std::cout;
@@ -31,6 +32,6 @@ using std::vector;
 using std::string;
 
 namespace Opening {
-    void init();
+    void load_openings(Options&);
     vector<string> get_sequence(const string&);
 }
diff --git a/src/options.cpp b/src/options.cpp
@@ -47,6 +47,7 @@ Options::Options() {
     EvalKings      = 1;
 
     OwnBook        = false;
+    OwnBookPath    = "openings.txt";
 
     hash_table = new Transposition[16];
     set_hash();

diff --git a/src/options.hpp b/src/options.hpp
@@ -70,4 +70,5 @@ EvalKings: type=spin, default=100, min=0, max=1000, weight (percent) of king eva
     float EvalKings;
 
     bool OwnBook;
+    string OwnBookPath;
 };
diff --git a/src/uci.cpp b/src/uci.cpp
@@ -183,6 +183,7 @@ int loop() {
     string cmd;
     Options options;
     Position pos = Bitboard::startpos();
+    Opening::load_openings(options);
     vector<string> move_list = {};
     float prev_eval = 0;
     bool searching = false;
@@ -198,6 +199,7 @@ int loop() {
             cout << "id author Megalodon Developers\n";
 
             cout << "option name OwnBook type check default false\n";
+            cout << "option name OwnBookPath type path default 'openings.txt'\n";
             cout << "option name Hash type spin default 256 min 1 max 65536\n";
 
             cout << "option name EvalMaterial type spin default 100 min 0 max 1000\n";
@@ -234,6 +236,11 @@ int loop() {
                 else std::cerr << "Unknown value: " << value << endl;
             }
 
+            else if (name == "OwnBookPath") {
+                options.OwnBookPath = value;
+                Opening::load_openings(options);
+            }
+
             else std::cerr << "Unknown option: " << name << endl;
         }