Move draw by material check

mcostalba · mcostalba · commit 490f67a3f894 · 2013-09-08T06:11:35.000-07:00
It is more natural to test this case among
others material distributions.

No functional change.
diff --git a/src/endgame.h b/src/endgame.h
@@ -43,7 +43,7 @@ enum EndgameType {
   KQKP,  // KQ vs KP
   KQKR,  // KQ vs KR
   KBBKN, // KBB vs KN
-  KmmKm, // K and two minors vs K and one or two minors
+  KmmKm, // K and one or two minors vs K and zero or one minor
 
 
   // Scaling functions
diff --git a/src/material.cpp b/src/material.cpp
@@ -173,10 +173,18 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) {
       return e;
   }
 
+  // Draw by insufficient material (trivial draws like KK, KBK and KNK)
+  if (   !pos.pieces(PAWN)
+      &&  pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) <= BishopValueMg)
+  {
+      e->evaluationFunction = &EvaluateKmmKm[pos.side_to_move()];
+      return e;
+  }
+
+  // Minor piece endgame with at least one minor piece per side and
+  // no pawns. Note that the case KmmK is already handled by KXK.
   if (!pos.pieces(PAWN) && !pos.pieces(ROOK) && !pos.pieces(QUEEN))
   {
-      // Minor piece endgame with at least one minor piece per side and
-      // no pawns. Note that the case KmmK is already handled by KXK.
       assert((pos.pieces(WHITE, KNIGHT) | pos.pieces(WHITE, BISHOP)));
       assert((pos.pieces(BLACK, KNIGHT) | pos.pieces(BLACK, BISHOP)));
 
@@ -240,8 +248,7 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) {
       }
   }
 
-  // No pawns makes it difficult to win, even with a material advantage. This
-  // catches some trivial draws like KK, KBK and KNK
+  // No pawns makes it difficult to win, even with a material advantage
   if (!pos.count<PAWN>(WHITE) && npm_w - npm_b <= BishopValueMg)
   {
       e->factor[WHITE] = (uint8_t)
diff --git a/src/position.cpp b/src/position.cpp
@@ -1223,6 +1223,7 @@ Key Position::compute_material_key() const {
 /// game and the endgame. These functions are used to initialize the incremental
 /// scores when a new position is set up, and to verify that the scores are correctly
 /// updated by do_move and undo_move when the program is running in debug mode.
+
 Score Position::compute_psq_score() const {
 
   Score score = SCORE_ZERO;
@@ -1254,15 +1255,11 @@ Value Position::compute_non_pawn_material(Color c) const {
 }
 
 
-/// Position::is_draw() tests whether the position is drawn by material,
-/// repetition, or the 50 moves rule. It does not detect stalemates, this
-/// must be done by the search.
-bool Position::is_draw() const {
+/// Position::is_draw() tests whether the position is drawn by repetition
+/// or the 50 moves rule. It does not detect stalemates, this must be done
+/// by the search.
 
-  // Draw by material?
-  if (   !pieces(PAWN)
-      && (non_pawn_material(WHITE) + non_pawn_material(BLACK) <= BishopValueMg))
-      return true;
+bool Position::is_draw() const {
 
   // Draw by the 50 moves rule?
   if (st->rule50 > 99 && (!checkers() || MoveList<LEGAL>(*this).size()))

Original file line number	Diff line number	Diff line change
`@@ -173,10 +173,18 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) {`
`173`	`173`	`return e;`
`174`	`174`	`}`
`175`	`175`
	`176`	`+ // Draw by insufficient material (trivial draws like KK, KBK and KNK)`
	`177`	`+ if ( !pos.pieces(PAWN)`
	`178`	`+ && pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) <= BishopValueMg)`
	`179`	`+ {`
	`180`	`+ e->evaluationFunction = &EvaluateKmmKm[pos.side_to_move()];`
	`181`	`+ return e;`
	`182`	`+ }`
	`183`	`+`
	`184`	`+ // Minor piece endgame with at least one minor piece per side and`
	`185`	`+ // no pawns. Note that the case KmmK is already handled by KXK.`
`176`	`186`	`if (!pos.pieces(PAWN) && !pos.pieces(ROOK) && !pos.pieces(QUEEN))`
`177`	`187`	`{`
`178`		`- // Minor piece endgame with at least one minor piece per side and`
`179`		`- // no pawns. Note that the case KmmK is already handled by KXK.`
`180`	`188`	`assert((pos.pieces(WHITE, KNIGHT) \| pos.pieces(WHITE, BISHOP)));`
`181`	`189`	`assert((pos.pieces(BLACK, KNIGHT) \| pos.pieces(BLACK, BISHOP)));`
`182`	`190`
`@@ -240,8 +248,7 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) {`
`240`	`248`	`}`
`241`	`249`	`}`
`242`	`250`
`243`		`- // No pawns makes it difficult to win, even with a material advantage. This`
`244`		`- // catches some trivial draws like KK, KBK and KNK`
	`251`	`+ // No pawns makes it difficult to win, even with a material advantage`
`245`	`252`	`if (!pos.count<PAWN>(WHITE) && npm_w - npm_b <= BishopValueMg)`
`246`	`253`	`{`
`247`	`254`	`e->factor[WHITE] = (uint8_t)`