オプションを追加した

nodchip · Nov 11, 2017 · 7d83be2 · 7d83be2
1 parent 0889d62
commit 7d83be2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/TanukiColiseum/Coliseum.cs b/TanukiColiseum/Coliseum.cs
@@ -47,6 +47,8 @@ public void Run(Options options)
                     {"BookMoves", options.NumBookMoves1.ToString()},
                     {"BookFile", options.BookFileName1},
                     {"Threads", options.NumThreads1.ToString()},
+                    {"BookEvalDiff1", options.BookEvalDiff1.ToString()},
+                    {"ConsiderBookMoveCount1", options.ConsiderBookMoveCount1},
                 };
                 Console.WriteLine("Starting the engine process " + (gameIndex * 2));
                 Console.Out.Flush();
@@ -65,6 +67,8 @@ public void Run(Options options)
                     {"BookMoves", options.NumBookMoves2.ToString()},
                     {"BookFile", options.BookFileName2},
                     {"Threads", options.NumThreads2.ToString()},
+                    {"BookEvalDiff2", options.BookEvalDiff2.ToString()},
+                    {"ConsiderBookMoveCount2", options.ConsiderBookMoveCount2},
                 };
                 Console.WriteLine("Starting the engine process " + (gameIndex * 2 + 1));
                 Console.Out.Flush();

diff --git a/TanukiColiseum/Options.cs b/TanukiColiseum/Options.cs
@@ -29,6 +29,10 @@ public enum UserInterface
         public int ProgressIntervalMs { get; set; } = 60 * 1000;
         public int NumThreads1 { get; set; } = 1;
         public int NumThreads2 { get; set; } = 1;
+        public int BookEvalDiff1 { get; set; } = 30;
+        public int BookEvalDiff2 { get; set; } = 30;
+        public string ConsiderBookMoveCount1 { get; set; } = "false";
+        public string ConsiderBookMoveCount2 { get; set; } = "false";
 
         public void Parse(string[] args)
         {
@@ -93,6 +97,18 @@ public void Parse(string[] args)
                     case "--num_threads2":
                         NumThreads2 = int.Parse(args[++i]);
                         break;
+                    case "--book_eval_diff1":
+                        BookEvalDiff1 = int.Parse(args[++i]);
+                        break;
+                    case "--book_eval_diff2":
+                        BookEvalDiff2 = int.Parse(args[++i]);
+                        break;
+                    case "--consider_book_move_count1":
+                        ConsiderBookMoveCount1 = args[++i];
+                        break;
+                    case "--consider_book_move_count2":
+                        ConsiderBookMoveCount2 = args[++i];
+                        break;
                     default:
                         throw new ArgumentException("Unexpected option: " + args[i]);
                 }

diff --git a/exe/book/user_book2.db b/exe/book/user_book2.db
@@ -322804,6 +322804,8 @@ sfen ln1g2snl/1r3kg2/p1spppbpp/2p3p2/1p5P1/2PP5/PPBSPPP1P/2G1G2R1/LN2K1SNL b - 1
 5g5f 7c6d 97 24 0
 3i4h 3a2b 85 24 0
 1g1f 3a2b 61 24 0
+sfen lns+R4l/9/p1ppppk1p/6p2/9/2P6/P2PPPPbP/2G1K4/+r1S2GSNL b 2GSN3Pbnlp 31
+6a1a L*3b 6518 24 0
 sfen ln1gkgsnl/1r1s3b1/p1pp1p1pp/4p1p2/1p7/2PPP4/PPB2PPPP/2G1G2R1/LNS1K1SNL w - 12
 7c7d 5i6i 51 24 0
 3a3b 5h6g -34 24 0
@@ -616116,6 +616118,8 @@ sfen lns2k1nl/1r4gs1/p1pppgbpp/1p3pp2/7P1/2P1P1P2/PP1P1P2P/1BGS1S1R1/LN1K1G1NL b
 4i5h 3c4b 42 24 0
 2i3g 3c4b 35 24 0
 6h5g 7a6b 30 24 0
+sfen lns+R4l/1r7/p1pp1pg1p/1p2pkp2/9/2P6/PP1PPPP1P/2G6/LNS1KGSNL b BGNbs2p 27
+6a7a 3d3e 10207 24 0
 sfen lnsgkgsnl/1r7/p1pppp1pp/1p4p2/2P6/9/PP1PPPPPP/1+bR6/LNSGKGSNL b b 7
 7i8h 3a2b -47 24 0
 7h8h B*4e -143 24 0