X-Git-Url: https://git.sesse.net/?p=remoteglot-book;a=blobdiff_plain;f=www%2Fopening-stats.pl;h=58a0f9be02a9ed230808fb00ce281abeef3531e9;hp=edbff24e3303cb103ae85b2201576cede343f70c;hb=HEAD;hpb=507584368c5910dd15f2525b336b1a4d738fac45

diff --git a/www/opening-stats.pl b/www/opening-stats.pl
index edbff24..58a0f9b 100755
--- a/www/opening-stats.pl
+++ b/www/opening-stats.pl
@@ -17,28 +17,21 @@ my $pid = IPC::Open2::open2($chld_out, $chld_in, "../binlookup", "../open.mtbl",
 
 # Root position. Basically ignore everything except the opening (and later some root game stuff).
 my $fen = $cgi->param('fen') // 'rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1';
+my $includetransp = $cgi->param('includetransp') // 1;
+
 my $pos = Position->from_fen($fen);
-my $hex = unpack('H*', $pos->bitpacked_fen);
-print $chld_in $hex, "\n";
-chomp (my $line = <$chld_out>);
-
-my ($white, $draw, $black, $opening_num, $white_avg_elo, $black_avg_elo, $num_elo, $timestamp, $pgn_file_number, $pgn_start_position, @moves) = split / /, $line;
-my @json_moves = ();
-push @json_moves, {
-	white => $white * 1,
-	draw => $draw * 1,
-	black => $black * 1,
-	white_avg_elo => $num_elo == 0 ? undef : $white_avg_elo * 1,
-	black_avg_elo => $num_elo == 0 ? undef : $black_avg_elo * 1,
-	num_elo => $num_elo * 1
-};
+my ($json_root_pos, $root_aux_data) = get_json_move($pos, undef, $chld_in, $chld_out);
 
-my $opening = $openings{$opening_num} // 'A00: Start position';
+my $opening = $openings{$json_root_pos->{'opening_num'}} // 'A00: Start position';
+my @json_moves = ($json_root_pos);
 
 my $root_game;
 eval {
-	die "Missing PGN position data." if (!defined($pgn_file_number) || !defined($pgn_start_position));
-	my $pgntext = read_root_pgn($pgn_file_number, $pgn_start_position);
+	if (!exists($root_aux_data->{'pgn_file_number'}) ||
+	    !exists($root_aux_data->{'pgn_start_position'})) {
+		die "Missing PGN position data."
+	}
+	my $pgntext = read_root_pgn($root_aux_data->{'pgn_file_number'}, $root_aux_data->{'pgn_start_position'});
 	my $pgn = Chess::PGN::Parse->new(undef, $pgntext);
 	$pgn->read_game() or die;
 	$pgn->parse_game() or die;
@@ -53,29 +46,68 @@ eval {
 	$root_game->{'date'} = $pgn->date;
 	$root_game->{'result'} = $pgn->result;
 	$root_game->{'eco'} = $pgn->eco;
-	$root_game->{'moves'} = scalar @{$pgn->moves};
+	$root_game->{'moves'} = int(((scalar @{$pgn->moves}) + 1) / 2);
 };
+if ($@) {
+	print STDERR "Error while getting root move: $@\n";
+}
 
 # Explore one move out.
-for my $move (@moves) {
+my $white_left = $json_root_pos->{'white'};
+my $draw_left = $json_root_pos->{'draw'};
+my $black_left = $json_root_pos->{'black'};
+for my $move (@{$root_aux_data->{'moves'}}) {
 	my ($np, $uci_move) = $pos->make_pretty_move($move);
-	my $hex = unpack('H*', $np->bitpacked_fen);
-	print $chld_in $hex, "\n";
-	my $line = <$chld_out>;
-	my ($white, $draw, $black, $opening_num, $white_avg_elo, $black_avg_elo, $num_elo) = split / /, $line;
-	push @json_moves, {
-		move => $move,
-		white => $white * 1,
-		draw => $draw * 1,
-		black => $black * 1,
-		white_avg_elo => $num_elo == 0 ? undef : $white_avg_elo * 1,
-		black_avg_elo => $num_elo == 0 ? undef : $black_avg_elo * 1,
-		num_elo => $num_elo * 1
+	my $json_pos;
+
+	my ($json_pos_only_this_root, undef) = get_json_move($np, $root_aux_data->{'pos_hash'}, $chld_in, $chld_out);
+	$white_left -= $json_pos_only_this_root->{'white'};
+	$draw_left -= $json_pos_only_this_root->{'draw'};
+	$black_left -= $json_pos_only_this_root->{'black'};
+
+	if ($includetransp) {
+		($json_pos, undef) = get_json_move($np, undef, $chld_in, $chld_out);
+
+		# See if this move exists only due to transpositions.
+		if (!defined($json_pos_only_this_root)) {
+			$json_pos->{'transpose_only'} = 1;
+		}
+	} else {
+		$json_pos = $json_pos_only_this_root;
+	}
+	$json_pos->{'move'} = $move;
+	push @json_moves, $json_pos;
+}
+
+# If there are any positions that are not accounted for by any moves,
+# these have to be games that end here. Add them as pseudo-moves so as
+# not to confuse the user.
+for my $result (['1-0', 'white', $white_left], ['1/2-1/2', 'draw', $draw_left], ['0-1', 'black', $black_left]) {
+	next if ($result->[2] == 0);
+	my $move = {
+		move => $result->[0],
+		white => 0,
+		draw => 0,
+		black => 0
 	};
+	$move->{$result->[1]} = $result->[2];
+	push @json_moves, $move;
 }
 
+# Get stats for the root position, for the human index.
+my $start_pos = Position->start_pos("white", "black");
+my ($json_start_pos, undef) = get_json_move($start_pos, 0, $chld_in, $chld_out);
+my $total_games = $json_start_pos->{'white'} + $json_start_pos->{'draw'} + $json_start_pos->{'black'};
+my $computer_games = $json_start_pos->{'computer'} * 1;
+
 print $cgi->header(-type=>'application/json');
-print JSON::XS::encode_json({ moves => \@json_moves, opening => $opening, root_game => $root_game });
+print JSON::XS::encode_json({
+	moves => \@json_moves,
+	opening => $opening,
+	root_game => $root_game,
+	total_games => $total_games,
+	computer_games => $computer_games
+});
 
 sub read_openings {
 	open my $fh, "../openings.txt"
@@ -93,11 +125,13 @@ sub read_openings {
 }
 
 sub read_root_pgn {
+	my ($pgn_file_number, $pgn_start_position) = @_;
 	my @pgnnames;
 	open my $pgnnamesfh, "<", "../pgnnames.txt"
 		or die "../pgnnames.txt: $!";
 	while (<$pgnnamesfh>) {
 		chomp;
+		s/^comp://;
 		push @pgnnames, $_;
 	}
 	close $pgnnamesfh;
@@ -119,3 +153,41 @@ sub read_root_pgn {
 
 	return $root_pgn;
 }
+
+sub get_json_move {
+	my ($pos, $filter_prev_pos_hash, $chld_in, $chld_out) = @_;
+	my $bpfen_hex = unpack('H*', $pos->bitpacked_fen);
+	my $prev_pos_hash_hex = '';
+	if (defined($filter_prev_pos_hash)) {
+		$prev_pos_hash_hex .= unpack('H*', pack('S', $filter_prev_pos_hash));
+	}
+	print $chld_in $bpfen_hex, "\n", $prev_pos_hash_hex, "\n";
+
+	# Read the hash of this position.
+	chomp (my $pos_hash = <$chld_out>);
+
+	chomp (my $line = <$chld_out>);
+	if ($line eq '-') {
+		warn "Missing pos '" . $pos->fen . "' " . $filter_prev_pos_hash;
+		return (undef, undef);
+	}
+
+	my ($white, $draw, $black, $computer, $opening_num, $white_sum_elo, $black_sum_elo, $num_elo, $timestamp, $pgn_file_number, $pgn_start_position, @moves) = split / /, $line;
+	my $json_pos = {
+		white => int($white),
+		draw => int($draw),
+		black => int($black),
+		computer => int($computer),
+		white_avg_elo => $num_elo == 0 ? undef : $white_sum_elo / $num_elo,
+		black_avg_elo => $num_elo == 0 ? undef : $black_sum_elo / $num_elo,
+		num_elo => int($num_elo),
+		opening_num => $opening_num,  # Keep as string.
+	};
+	my $aux_data = {  # Only relevant for the root.
+		pos_hash => $pos_hash * 1,
+		moves => \@moves,
+		pgn_file_number => $pgn_file_number,
+		pgn_start_position => $pgn_start_position,
+	};
+	return ($json_pos, $aux_data);
+}