Rewrite previous patch using only one counter

Use only rule50 and retire pliesFromNull.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/position.cpp b/src/position.cpp
index 4e9a6dc7b02388ddae1c8224a9bfd8eeedea2368..e30629186fdb65ec9321c1fbb72c064cba268814 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -703,7 +703,7 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) {
   // pointer to point to the new, ready to be updated, state.
   struct ReducedStateInfo {
     Key key, pawnKey, materialKey;
   // pointer to point to the new, ready to be updated, state.
   struct ReducedStateInfo {
     Key key, pawnKey, materialKey;

-    int castleRights, rule50, pliesFromNull;
+    int castleRights, rule50;

     Square epSquare;
     Value mgValue, egValue;
     Value npMaterial[2];
     Square epSquare;
     Value mgValue, egValue;
     Value npMaterial[2];


@@ -724,7 +724,6 @@ void Position::do_move(Move m, StateInfo& newSt, Bitboard dcCandidates) {
   // Increment the 50 moves rule draw counter. Resetting it to zero in the
   // case of non-reversible moves is taken care of later.
   st->rule50++;
   // Increment the 50 moves rule draw counter. Resetting it to zero in the
   // case of non-reversible moves is taken care of later.
   st->rule50++;

-  st->pliesFromNull++;

 
   if (move_is_castle(m))
   {
 
   if (move_is_castle(m))
   {


@@ -1239,11 +1238,11 @@ void Position::do_null_move(StateInfo& backupSt) {
   // Note that differently from normal case here backupSt is actually used as
   // a backup storage not as a new state to be used.
   backupSt.key      = st->key;
   // Note that differently from normal case here backupSt is actually used as
   // a backup storage not as a new state to be used.
   backupSt.key      = st->key;

+  backupSt.rule50   = st->rule50;

   backupSt.epSquare = st->epSquare;
   backupSt.mgValue  = st->mgValue;
   backupSt.egValue  = st->egValue;
   backupSt.previous = st->previous;
   backupSt.epSquare = st->epSquare;
   backupSt.mgValue  = st->mgValue;
   backupSt.egValue  = st->egValue;
   backupSt.previous = st->previous;

-  backupSt.pliesFromNull = st->pliesFromNull;

   st->previous = &backupSt;
 
   // Save the current key to the history[] array, in order to be able to
   st->previous = &backupSt;
 
   // Save the current key to the history[] array, in order to be able to


@@ -1259,8 +1258,7 @@ void Position::do_null_move(StateInfo& backupSt) {
 
   sideToMove = opposite_color(sideToMove);
   st->epSquare = SQ_NONE;
 
   sideToMove = opposite_color(sideToMove);
   st->epSquare = SQ_NONE;

-  st->rule50++;
-  st->pliesFromNull = 0;
+  st->rule50 = 0;

   gamePly++;
 
   st->mgValue += (sideToMove == WHITE)? TempoValueMidgame : -TempoValueMidgame;
   gamePly++;
 
   st->mgValue += (sideToMove == WHITE)? TempoValueMidgame : -TempoValueMidgame;


@@ -1278,15 +1276,14 @@ void Position::undo_null_move() {
   // Restore information from the our backup StateInfo object
   StateInfo* backupSt = st->previous;
   st->key      = backupSt->key;
   // Restore information from the our backup StateInfo object
   StateInfo* backupSt = st->previous;
   st->key      = backupSt->key;

+  st->rule50   = backupSt->rule50;

   st->epSquare = backupSt->epSquare;
   st->mgValue  = backupSt->mgValue;
   st->egValue  = backupSt->egValue;
   st->previous = backupSt->previous;
   st->epSquare = backupSt->epSquare;
   st->mgValue  = backupSt->mgValue;
   st->egValue  = backupSt->egValue;
   st->previous = backupSt->previous;

-  st->pliesFromNull = backupSt->pliesFromNull;

 
   // Update the necessary information
   sideToMove = opposite_color(sideToMove);
 
   // Update the necessary information
   sideToMove = opposite_color(sideToMove);

-  st->rule50--;

   gamePly--;
 }
 
   gamePly--;
 }
 


@@ -1687,7 +1684,7 @@ bool Position::is_draw() const {
       return true;
 
   // Draw by repetition?
       return true;
 
   // Draw by repetition?

-  for (int i = 2; i < Min(Min(gamePly, st->rule50), st->pliesFromNull); i += 2)
+  for (int i = 2; i < Min(gamePly, st->rule50); i += 2)

       if (history[gamePly - i] == st->key)
           return true;
 
       if (history[gamePly - i] == st->key)
           return true;
 

diff --git a/src/position.h b/src/position.h
index 606c7486fc8563db19d155541435f236de61415c..370bb1d45e0476a9618c42725e350b7dc0e018e2 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -88,7 +88,7 @@ enum Phase {
 
 struct StateInfo {
   Key key, pawnKey, materialKey;
 
 struct StateInfo {
   Key key, pawnKey, materialKey;

-  int castleRights, rule50, pliesFromNull;
+  int castleRights, rule50;

   Square epSquare;
   Value mgValue, egValue;
   Value npMaterial[2];
   Square epSquare;
   Value mgValue, egValue;
   Value npMaterial[2];