X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fopening-stats.pl;h=f13e0a83523a358b679ebfd9678f94b8aa68d5aa;hb=e8fea43561352d3573201f4ebad2538ccd38568c;hp=aea5db863bdd6139c5b47ad69d576418d911a1b4;hpb=72a12f5d82a598d423c0a8f38e7e790c29ad5081;p=remoteglot-book

diff --git a/www/opening-stats.pl b/www/opening-stats.pl
index aea5db8..f13e0a8 100755
--- a/www/opening-stats.pl
+++ b/www/opening-stats.pl
@@ -50,26 +50,61 @@ eval {
 };
 
 # Explore one move out.
+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 $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.
-		my ($alt_json_pos, undef) = get_json_move($np, $root_aux_data->{'pos_hash'}, $chld_in, $chld_out);
-		if (!defined($alt_json_pos)) {
+		if (!defined($json_pos_only_this_root)) {
 			$json_pos->{'transpose_only'} = 1;
 		}
 	} else {
-		($json_pos, undef) = get_json_move($np, $root_aux_data->{'pos_hash'}, $chld_in, $chld_out);
+		$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"
@@ -135,14 +170,14 @@ sub get_json_move {
 
 	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 => $white,
-		draw => $draw,
-		black => $black,
-		computer => $computer,
+		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 => $num_elo,
-		opening_num => $opening_num,
+		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,