Make the Chess960 storage/test a bit more efficient.

[remoteglot] / Position.pm

diff --git a/Position.pm b/Position.pm
index b847d101162a51a23d6bd7b5ff758a9a66a98930..17c8512d65f57f6a4c0c9600296b4429fadedcfe 100644 (file)
--- a/Position.pm
+++ b/Position.pm
@@ -28,6 +28,8 @@ 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;
@@ -36,6 +38,7 @@ sub new {
        }
        $pos->{'last_move'} = $x[29];
        $pos->{'prettyprint_cache'} = {};
+       $pos->{'tbprobe_cache'} = {};
 
        bless $pos, $class;
        return $pos;
@@ -48,6 +51,40 @@ sub start_pos {
        return $class->new("<12> rnbqkbnr pppppppp -------- -------- -------- -------- PPPPPPPP RNBQKBNR W -1 1 1 1 1 0 dummygamenum $white $black -2 dummytime dummyincrement 39 39 dummytime dummytime 1 none (0:00) none 0 0 0");
 }
 
+sub from_fen {
+       my ($class, $fen) = @_;
+       my ($board, $toplay, $castling, $ep_square, $halfmove_clock, $fullmove_clock) = split / /, $fen;
+
+       my $pos = {};
+       $board =~ s/(\d)/"-"x$1/ge;
+       $pos->{'board'} = Board->new(split /\//, $board);
+       $pos->{'toplay'} = uc($toplay);
+
+       if ($ep_square =~ /^([a-h])/) {
+               $pos->{'ep_file_num'} = ord($1) - ord('a');
+       } else {
+               $pos->{'ep_file_num'} = -1;
+       }
+
+       $pos->{'white_castle_k'} = ($castling =~ /K/) ? 1 : 0;
+       $pos->{'white_castle_q'} = ($castling =~ /Q/) ? 1 : 0;
+       $pos->{'black_castle_k'} = ($castling =~ /k/) ? 1 : 0;
+       $pos->{'black_castle_q'} = ($castling =~ /q/) ? 1 : 0;
+       $pos->{'time_since_100move_rule_reset'} = $halfmove_clock // 0;
+       $pos->{'player_w'} = 'white';
+       $pos->{'player_b'} = 'black';
+       $pos->{'white_clock'} = 0;
+       $pos->{'black_clock'} = 0;
+       $pos->{'move_num'} = $fullmove_clock // 0;
+       $pos->{'last_move_uci'} = undef;
+       $pos->{'last_move'} = undef;
+       $pos->{'prettyprint_cache'} = {};
+       $pos->{'tbprobe_cache'} = {};
+       
+       bless $pos, $class;
+       return $pos;
+}
+
 sub fen {
        my $pos = shift;
 
@@ -73,27 +110,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];
+               $ep = (qw(a b c d e f g h))[$col];
 
                if ($pos->{'toplay'} eq 'B') {
-                       $nep .= "3";
+                       $ep .= "3";
                } else {
-                       $nep .= "6";
-               }
-
-               #
-               # 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');
-               } 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 .= " ";
@@ -112,7 +134,16 @@ sub fen {
 
 sub to_json_hash {
        my $pos = shift;
-       my $json = { %$pos, board => undef, prettyprint_cache => undef, fen => $pos->fen() };
+       my $json = { %$pos, fen => $pos->fen() };
+       delete $json->{'board'};
+       delete $json->{'prettyprint_cache'};
+       delete $json->{'tbprobe_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'};
+       delete $json->{'chess960'} if (!$json->{'chess960'});
        if ($json->{'player_w'} =~ /^base64:(.*)$/) {
                $json->{'player_w'} = MIME::Base64::decode_base64($1);
        }
@@ -134,7 +165,7 @@ sub num_pieces {
 
 # Returns a new Position object.
 sub make_move {
-        my ($pos, $from_row, $from_col, $to_row, $to_col, $promo) = @_;
+        my ($pos, $from_row, $from_col, $to_row, $to_col, $promo, $pretty_move) = @_;
 
        my $from_square = _pos_to_square($from_row, $from_col);
        my $to_square = _pos_to_square($to_row, $to_col);
@@ -188,8 +219,16 @@ sub make_move {
        }
        $np->{'player_w'} = $pos->{'player_w'};
        $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->{'chess960'} = $pos->{'chess960'};
+       if (exists($pos->{'start_fen'})) {
+               $np->{'start_fen'} = $pos->{'start_fen'};
+       }
+       if (defined($pretty_move)) {
+               $np->{'last_move'} = $pretty_move;
+       } else {
+               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;