Remove en passant hack for Rybka 2, which is now obsolete; we would rather have the...

[remoteglot] / Position.pm

diff --git a/Position.pm b/Position.pm
index 371e179b8139d9541b85d874917cbc1255ee1768..807b0035876e3a261dae1f2e0097c371d7160953 100644 (file)
--- a/Position.pm
+++ b/Position.pm
@@ -28,8 +28,16 @@ sub new {
        $pos->{'player_b'} = $x[18];
        $pos->{'player_w'} =~ s/^W?[FCIG]M//;
        $pos->{'player_b'} =~ s/^W?[FCIG]M//;
+       $pos->{'white_clock'} = $x[24];
+       $pos->{'black_clock'} = $x[25];
        $pos->{'move_num'} = $x[26];
+       if ($x[27] =~ /([a-h][1-8])-([a-h][1-8])/) {
+               $pos->{'last_move_uci'} = $1 . $2;
+       } else {
+               $pos->{'last_move_uci'} = undef;
+       }
        $pos->{'last_move'} = $x[29];
+       $pos->{'prettyprint_cache'} = {};
 
        bless $pos, $class;
        return $pos;
@@ -67,27 +75,12 @@ sub fen {
        my $ep = "-";
        if ($pos->{'ep_file_num'} != -1) {
                my $col = $pos->{'ep_file_num'};
-               my $nep = (qw(a b c d e f g h))[$col];
-
-               if ($pos->{'toplay'} eq 'B') {
-                       $nep .= "3";
-               } else {
-                       $nep .= "6";
-               }
+               $ep = (qw(a b c d e f g h))[$col];
 
-               #
-               # Showing the en passant square when actually no capture can be made
-               # seems to confuse at least Rybka. Thus, check if there's actually
-               # a pawn of the opposite side that can do the en passant move, and if
-               # not, just lie -- it doesn't matter anyway. I'm unsure what's the
-               # "right" thing as per the standard, though.
-               #
                if ($pos->{'toplay'} eq 'B') {
-                       $ep = $nep if ($col > 0 && $pos->{'board'}[4][$col-1] eq 'p');
-                       $ep = $nep if ($col < 7 && $pos->{'board'}[4][$col+1] eq 'p');
+                       $ep .= "3";
                } else {
-                       $ep = $nep if ($col > 0 && $pos->{'board'}[3][$col-1] eq 'P');
-                       $ep = $nep if ($col < 7 && $pos->{'board'}[3][$col+1] eq 'P');
+                       $ep .= "6";
                }
        }
        $fen .= " ";
@@ -106,7 +99,14 @@ sub fen {
 
 sub to_json_hash {
        my $pos = shift;
-       my $json = { %$pos, board => undef, fen => $pos->fen() };
+       my $json = { %$pos, fen => $pos->fen() };
+       delete $json->{'board'};
+       delete $json->{'prettyprint_cache'};
+       delete $json->{'black_castle_k'};
+       delete $json->{'black_castle_q'};
+       delete $json->{'white_castle_k'};
+       delete $json->{'white_castle_q'};
+       delete $json->{'time_since_100move_rule_reset'};
        if ($json->{'player_w'} =~ /^base64:(.*)$/) {
                $json->{'player_w'} = MIME::Base64::decode_base64($1);
        }
@@ -121,6 +121,11 @@ sub parse_pretty_move {
        return $pos->{'board'}->parse_pretty_move($move, $pos->{'toplay'});
 }
 
+sub num_pieces {
+       my ($pos) = @_;
+       return $pos->{'board'}->num_pieces();
+}
+
 # Returns a new Position object.
 sub make_move {
         my ($pos, $from_row, $from_col, $to_row, $to_col, $promo) = @_;
@@ -179,9 +184,21 @@ sub make_move {
        $np->{'player_b'} = $pos->{'player_b'};
        my ($move, $nb) = $pos->{'board'}->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
        $np->{'last_move'} = $move;
+       $np->{'last_move_uci'} = Board::move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
+
        return bless $np;
 }
 
+# Returns a new Position object, and the parsed UCI move.
+sub make_pretty_move {
+       my ($pos, $move) = @_;
+
+       my ($from_row, $from_col, $to_row, $to_col, $promo) = $pos->parse_pretty_move($move);
+       my $uci_move = Board::move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
+       $pos = $pos->make_move($from_row, $from_col, $to_row, $to_col, $promo);
+       return ($pos, $uci_move);
+}
+
 sub _pos_to_square {
         my ($row, $col) = @_;
         return sprintf("%c%d", ord('a') + $col, 8 - $row);