Minimize footprint of Polyfish changes to the original SF code

Author: khalid-a-omar

src/search.cpp

@@ -163,21 +163,15 @@ Search::Worker::Worker(SharedState&                    sharedState,
                        std::unique_ptr<ISearchManager> sm,
                        size_t                          thread_id) :
     // Unpack the SharedState struct into member variables
-#if defined(POLYFISH)
     thread_idx(thread_id),
     manager(std::move(sm)),
-    options(sharedState.options),
-    threads(sharedState.threads),
-    tt(sharedState.tt),
+#if defined(POLYFISH)
     bookMan(sharedState.bookMan),
-    evalFiles(sharedState.evalFiles) {
-#else
-    thread_idx(thread_id),
-    manager(std::move(sm)),
+    evalFiles(sharedState.evalFiles),
+#endif
     options(sharedState.options),
     threads(sharedState.threads),
-    tt(sharedState.tt) {
-#endif
+    tt(sharedState.tt){
     clear();
 }
 

src/search.h

@@ -127,26 +127,23 @@ struct LimitsType {
 // This struct is used to easily forward data to the Search::Worker class.
 struct SharedState {
 #if defined(POLYFISH)
-    SharedState(const OptionsMap& o, ThreadPool& tp, TranspositionTable& t, BookManager& bm, Eval::NNUE::EvalFiles& ef) :
-        options(o),
-        threads(tp),
-        tt(t),
+    SharedState(BookManager& bm, Eval::NNUE::EvalFiles& ef, const OptionsMap& o, ThreadPool& tp, TranspositionTable& t) :
         bookMan(bm),
-        evalFiles(ef) {}
+        evalFiles(ef),
 #else
     SharedState(const OptionsMap& o, ThreadPool& tp, TranspositionTable& t) :
+#endif
         options(o),
         threads(tp),
         tt(t) {}
-#endif
 
-    const OptionsMap&   options;
-    ThreadPool&         threads;
-    TranspositionTable& tt;
 #if defined(POLYFISH)
-    BookManager&  bookMan;
+    BookManager& bookMan;
     Eval::NNUE::EvalFiles& evalFiles;
 #endif
+    const OptionsMap&   options;
+    ThreadPool&         threads;
+    TranspositionTable& tt;
 };
 
 class Worker;
@@ -255,13 +252,13 @@ class Worker {
     // The main thread has a SearchManager, the others have a NullSearchManager
     std::unique_ptr<ISearchManager> manager;
 
-    const OptionsMap&   options;
-    ThreadPool&         threads;
-    TranspositionTable& tt;
 #if defined(POLYFISH)
-    BookManager&  bookMan;
+    BookManager& bookMan;
     Eval::NNUE::EvalFiles& evalFiles;
 #endif
+    const OptionsMap&   options;
+    ThreadPool&         threads;
+    TranspositionTable& tt;
 
     friend class Polyfish::ThreadPool;
     friend class Polyfish::UCI;

src/uci.cpp

@@ -57,7 +57,7 @@ UCI::UCI(int argc, char** argv) :
 
     options["Threads"] << Option(1, 1, 1024, [this](const Option&) {
 #if defined(POLYFISH)
-        threads.set({options, threads, tt, bookMan, evalFiles });
+        threads.set({bookMan, evalFiles, options, threads, tt});
 #else
         threads.set({options, threads, tt});
 #endif
@@ -99,7 +99,7 @@ UCI::UCI(int argc, char** argv) :
     });
 
 #if defined(POLYFISH)
-    threads.set({options, threads, tt, bookMan, evalFiles });
+    threads.set({bookMan, evalFiles, options, threads, tt});
 #else
     threads.set({options, threads, tt});
 #endif