X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=Position.pm;h=c3dbccaedde8b026a9585410c64134798e650d04;hp=6b772a67b82fafe4bcffb5b44a09849a8fb49eeb;hb=5a9dbd3f72666ce02396c30d1b74dae3ab32d40b;hpb=c555a037520769fe44012c04b4fe668eb1849b0a

diff --git a/Position.pm b/Position.pm
index 6b772a6..c3dbcca 100644
--- 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];
-
-		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 .= " ";
@@ -110,9 +132,46 @@ sub fen {
 	return $fen;
 }
 
+# Returns a compact bit string describing the same data as fen(),
+# except for the half-move and full-move clock.
+sub bitpacked_fen {
+	my $pos = shift;
+	my $board = $pos->{'board'}->bitpacked_fen();
+
+	my $bits = "";
+	if ($pos->{'toplay'} eq 'W') {
+		$bits .= "0";
+	} else {
+		$bits .= "1";
+	}
+
+	$bits .= $pos->{'white_castle_k'};
+	$bits .= $pos->{'white_castle_q'};
+	$bits .= $pos->{'black_castle_k'};
+	$bits .= $pos->{'black_castle_q'};
+
+	my $col = $pos->{'ep_file_num'};
+	if ($col == -1) {
+		$bits .= "0";
+	} else {
+		$bits .= "1";
+		$bits .= (qw(000 001 010 011 100 101 110 111))[$col];
+	}
+
+	return $board . pack('b*', $bits);
+}
+
 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'};
 	if ($json->{'player_w'} =~ /^base64:(.*)$/) {
 		$json->{'player_w'} = MIME::Base64::decode_base64($1);
 	}
@@ -127,9 +186,14 @@ 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) = @_;
+        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);
@@ -183,13 +247,27 @@ 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;
+	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;
 }
 
+# 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);