Fix node type detection (#55)

Aryan1508 · web-flow · commit 7a90cefb807b · 2021-06-24T00:01:00.000+05:30
Bench: 9702384
diff --git a/Bit-Genie/src/search.cpp b/Bit-Genie/src/search.cpp
@@ -114,11 +114,12 @@ namespace
     }
 
     SearchResult pvs(Position &position, Search &search, TTable &tt,
-                     int depth, int alpha = MinEval, int beta = MaxEval, bool pv_node = false, bool do_null = true)
+                     int depth, int alpha = MinEval, int beta = MaxEval, bool do_null = true)
     {
         if (search.limits.stopped)
             return 0;
 
+        bool pv_node = std::abs(alpha - beta) > 1;
         
         if ((search.info.nodes & 2047) == 0)
             search.limits.update();
@@ -152,7 +153,7 @@ namespace
         if (!pv_node && !in_check && depth > 4 && search.info.ply && do_null && position.should_do_null())
         {
             position.apply_null_move(search.info.ply);
-            int score = -pvs(position, search, tt, depth - 4, -beta, -beta + 1, false, false).score;
+            int score = -pvs(position, search, tt, depth - 4, -beta, -beta + 1, false).score;
             position.revert_null_move(search.info.ply);
 
             if (search.limits.stopped)
@@ -197,15 +198,15 @@ namespace
 
                 int RDepth = std::clamp(new_depth - R, 1, new_depth - 1);
 
-                score = -pvs(position, search, tt, RDepth, -alpha - 1, -alpha, false, false).score;
+                score = -pvs(position, search, tt, RDepth, -alpha - 1, -alpha).score;
 
                 if (score > alpha)
-                    score = -pvs(position, search, tt, depth - 1, -beta, -alpha, false).score;
+                    score = -pvs(position, search, tt, depth - 1, -beta, -alpha).score;
             }
             else
             {
                 if (move_num == 1)
-                    score = -pvs(position, search, tt, depth - 1, -beta, -alpha, true).score;
+                    score = -pvs(position, search, tt, depth - 1, -beta, -alpha).score;
                 else
                 {
                     score = -pvs(position, search, tt, depth - 1, -alpha - 1, -alpha).score;
diff --git a/Bit-Genie/src/uci.cpp b/Bit-Genie/src/uci.cpp
@@ -25,7 +25,7 @@
 #include "benchmark.h"
 #include "searchinit.h"
 
-const char *version = "6";
+const char *version = "6.1";
 
 namespace
 {

Original file line number	Diff line number	Diff line change
`@@ -114,11 +114,12 @@ namespace`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`SearchResult pvs(Position &position, Search &search, TTable &tt,`
`117`		`- int depth, int alpha = MinEval, int beta = MaxEval, bool pv_node = false, bool do_null = true)`
	`117`	`+ int depth, int alpha = MinEval, int beta = MaxEval, bool do_null = true)`
`118`	`118`	`{`
`119`	`119`	`if (search.limits.stopped)`
`120`	`120`	`return 0;`
`121`	`121`
	`122`	`+ bool pv_node = std::abs(alpha - beta) > 1;`
`122`	`123`
`123`	`124`	`if ((search.info.nodes & 2047) == 0)`
`124`	`125`	`search.limits.update();`
`@@ -152,7 +153,7 @@ namespace`
`152`	`153`	`if (!pv_node && !in_check && depth > 4 && search.info.ply && do_null && position.should_do_null())`
`153`	`154`	`{`
`154`	`155`	`position.apply_null_move(search.info.ply);`
`155`		`- int score = -pvs(position, search, tt, depth - 4, -beta, -beta + 1, false, false).score;`
	`156`	`+ int score = -pvs(position, search, tt, depth - 4, -beta, -beta + 1, false).score;`
`156`	`157`	`position.revert_null_move(search.info.ply);`
`157`	`158`
`158`	`159`	`if (search.limits.stopped)`
`@@ -197,15 +198,15 @@ namespace`
`197`	`198`
`198`	`199`	`int RDepth = std::clamp(new_depth - R, 1, new_depth - 1);`
`199`	`200`
`200`		`- score = -pvs(position, search, tt, RDepth, -alpha - 1, -alpha, false, false).score;`
	`201`	`+ score = -pvs(position, search, tt, RDepth, -alpha - 1, -alpha).score;`
`201`	`202`
`202`	`203`	`if (score > alpha)`
`203`		`- score = -pvs(position, search, tt, depth - 1, -beta, -alpha, false).score;`
	`204`	`+ score = -pvs(position, search, tt, depth - 1, -beta, -alpha).score;`
`204`	`205`	`}`
`205`	`206`	`else`
`206`	`207`	`{`
`207`	`208`	`if (move_num == 1)`
`208`		`- score = -pvs(position, search, tt, depth - 1, -beta, -alpha, true).score;`
	`209`	`+ score = -pvs(position, search, tt, depth - 1, -beta, -alpha).score;`
`209`	`210`	`else`
`210`	`211`	`{`
`211`	`212`	`score = -pvs(position, search, tt, depth - 1, -alpha - 1, -alpha).score;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`#include "benchmark.h"`
`26`	`26`	`#include "searchinit.h"`
`27`	`27`
`28`		`-const char *version = "6";`
	`28`	`+const char *version = "6.1";`
`29`	`29`
`30`	`30`	`namespace`
`31`	`31`	`{`