Revert "Move draw by material check"

mcostalba · mcostalba · commit 27f2ce8f6e84 · 2013-09-12T08:44:11.000+02:00
Possible regression

bench: 4554579
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 one or two minors vs K and zero or one minor
+  KmmKm, // K and two minors vs K and one or two minors
 
 
   // Scaling functions
diff --git a/src/material.cpp b/src/material.cpp
@@ -173,18 +173,10 @@ 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)));
 
@@ -248,7 +240,8 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) {
       }
   }
 
-  // No pawns makes it difficult to win, even with a material advantage
+  // No pawns makes it difficult to win, even with a material advantage. This
+  // catches some trivial draws like KK, KBK and KNK
   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
@@ -1255,11 +1255,17 @@ Value Position::compute_non_pawn_material(Color c) const {
 }
 
 
-/// Position::is_draw() tests whether the position is drawn by 50 moves rule
-/// or by repetition. It does not detect stalemates.
-
+/// 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 {
 
+  // Draw by material?
+  if (   !pieces(PAWN)
+      && (non_pawn_material(WHITE) + non_pawn_material(BLACK) <= BishopValueMg))
+      return true;
+
+  // Draw by the 50 moves rule?
   if (st->rule50 > 99 && (!checkers() || MoveList<LEGAL>(*this).size()))
       return true;
 

Original file line number	Diff line number	Diff line change
`@@ -173,18 +173,10 @@ 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.`
`186`	`176`	`if (!pos.pieces(PAWN) && !pos.pieces(ROOK) && !pos.pieces(QUEEN))`
`187`	`177`	`{`
	`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.`
`188`	`180`	`assert((pos.pieces(WHITE, KNIGHT) \| pos.pieces(WHITE, BISHOP)));`
`189`	`181`	`assert((pos.pieces(BLACK, KNIGHT) \| pos.pieces(BLACK, BISHOP)));`
`190`	`182`
`@@ -248,7 +240,8 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) {`
`248`	`240`	`}`
`249`	`241`	`}`
`250`	`242`
`251`		`- // No pawns makes it difficult to win, even with a material advantage`
	`243`	`+ // No pawns makes it difficult to win, even with a material advantage. This`
	`244`	`+ // catches some trivial draws like KK, KBK and KNK`
`252`	`245`	`if (!pos.count<PAWN>(WHITE) && npm_w - npm_b <= BishopValueMg)`
`253`	`246`	`{`
`254`	`247`	`e->factor[WHITE] = (uint8_t)`