for my $pos ($pos_waiting, $pos_calculating) {
next if (!defined($pos));
if ($pos->fen() eq $pos_for_movelist->fen()) {
- $pos->{'pretty_history'} = \@pretty_movelist;
+ $pos->{'history'} = \@pretty_movelist;
}
}
$getting_movelist = 0;
if ($pgn->result eq '1-0' || $pgn->result eq '1/2-1/2' || $pgn->result eq '0-1') {
$pos->{'result'} = $pgn->result;
}
- $pos->{'pretty_history'} = \@repretty_moves;
+ $pos->{'history'} = \@repretty_moves;
extract_clock($pgn, $pos);
$refutation_lines{$pretty_move} = {
depth => $info->{'depth' . $mpv},
score => score_digest($info, $pos_calculating, $mpv),
- pretty_move => $pretty_move,
+ move => $pretty_move,
pv => \@pretty_pv,
};
};
$json->{'refutation_lines'} = \%refutation_lines;
# Piece together historic score information, to the degree we have it.
- if (!$historic_json_only && exists($pos_calculating->{'pretty_history'})) {
+ if (!$historic_json_only && exists($pos_calculating->{'history'})) {
my %score_history = ();
my $q = $dbh->prepare('SELECT * FROM scores WHERE id=?');
my $pos = Position->start_pos('white', 'black');
my $halfmove_num = 0;
- for my $move (@{$pos_calculating->{'pretty_history'}}) {
+ for my $move (@{$pos_calculating->{'history'}}) {
my $id = id_for_pos($pos, $halfmove_num);
my $ref = $dbh->selectrow_hashref($q, undef, $id);
if (defined($ref)) {
$last_written_json = $encoded;
}
- if (exists($pos_calculating->{'pretty_history'}) &&
+ if (exists($pos_calculating->{'history'}) &&
defined($remoteglotconf::json_history_dir)) {
my $id = id_for_pos($pos_calculating);
my $filename = $remoteglotconf::json_history_dir . "/" . $id . ".json";
sub id_for_pos {
my ($pos, $halfmove_num) = @_;
- $halfmove_num //= scalar @{$pos->{'pretty_history'}};
+ $halfmove_num //= scalar @{$pos->{'history'}};
(my $fen = $pos->fen()) =~ tr,/ ,-_,;
return "move$halfmove_num-$fen";
}
# TODO(sesse): Maybe we can get the number of moves somehow else for FICS games.
# The history is needed for id_for_pos.
- if (!exists($pos->{'pretty_history'})) {
+ if (!exists($pos->{'history'})) {
return;
}
if (line['move'] && line['move']['from_sq']) {
var promo = line['move']['promotion'];
if (promo) {
- r['pretty_move'] = board.move({ from: line['move']['from_sq'], to: line['move']['to_sq'], promotion: promo.toLowerCase() }).san;
+ r['move'] = board.move({ from: line['move']['from_sq'], to: line['move']['to_sq'], promotion: promo.toLowerCase() }).san;
} else {
- r['pretty_move'] = board.move({ from: line['move']['from_sq'], to: line['move']['to_sq'] }).san;
+ r['move'] = board.move({ from: line['move']['from_sq'], to: line['move']['to_sq'] }).san;
}
} else {
- r['pretty_move'] = '';
+ r['move'] = '';
}
- r['sort_key'] = r['pretty_move'];
if (!line['found']) {
r['pv_pretty'] = [];
return r;
// Convert the PV.
var pv = [];
- if (r['pretty_move']) {
- pv.push(r['pretty_move']);
+ if (r['move']) {
+ pv.push(r['move']);
}
for (var j = 0; j < line['pv'].length; ++j) {
var move = line['pv'][j];
// Note: invert is ignored.
var compare_by_name = function(refutation_lines, invert, a, b) {
- var ska = refutation_lines[a]['pretty_move'];
- var skb = refutation_lines[b]['pretty_move'];
+ var ska = refutation_lines[a]['move'];
+ var skb = refutation_lines[b]['move'];
if (ska < skb) return -1;
if (ska > skb) return 1;
return 0;
if (line['pv'].length == 0) {
// Not found, so just make a one-move PV.
- var move = "<a class=\"move\" href=\"javascript:show_line(" + display_lines.length + ", " + 0 + ");\">" + line['pretty_move'] + "</a>";
+ var move = "<a class=\"move\" href=\"javascript:show_line(" + display_lines.length + ", " + 0 + ");\">" + line['move'] + "</a>";
$(move_td).html(move);
var score_td = document.createElement("td");
var pv_td = document.createElement("td");
tr.appendChild(pv_td);
$(pv_td).addClass("pv");
- $(pv_td).html(add_pv(base_fen, base_line.concat([ line['pretty_move'] ]), move_num, toplay, scores, start_display_move_num));
+ $(pv_td).html(add_pv(base_fen, base_line.concat([ line['move'] ]), move_num, toplay, scores, start_display_move_num));
tbl.append(tr);
continue;
}
- var move = "<a class=\"move\" href=\"javascript:show_line(" + display_lines.length + ", " + 0 + ");\">" + line['pretty_move'] + "</a>";
+ var move = "<a class=\"move\" href=\"javascript:show_line(" + display_lines.length + ", " + 0 + ");\">" + line['move'] + "</a>";
$(move_td).html(move);
var score_td = document.createElement("td");
// Print the history. This is pretty much the only thing that's
// unconditionally taken from current_data (we're not interested in
// historic history).
- if (current_data['position']['pretty_history']) {
- add_pv('start', current_data['position']['pretty_history'], 1, 'W', null, 0, 8, true);
+ if (current_data['position']['history']) {
+ add_pv('start', current_data['position']['history'], 1, 'W', null, 0, 8, true);
} else {
display_lines.push(null);
}
*/
var format_tooltip = function(data, halfmove_num) {
if (data['score_history'][halfmove_num] ||
- halfmove_num === data['position']['pretty_history'].length) {
+ halfmove_num === data['position']['history'].length) {
var move;
var short_score;
- if (halfmove_num === data['position']['pretty_history'].length) {
+ if (halfmove_num === data['position']['history'].length) {
move = data['position']['last_move'];
short_score = format_short_score(data['score']);
} else {
- move = data['position']['pretty_history'][halfmove_num];
+ move = data['position']['history'][halfmove_num];
short_score = format_short_score(data['score_history'][halfmove_num]);
}
var move_with_number = format_halfmove_with_number(move, halfmove_num);
} else {
for (var i = halfmove_num; i --> 0; ) {
if (data['score_history'][i]) {
- var move = data['position']['pretty_history'][i];
+ var move = data['position']['history'][i];
return "[Analysis kept from " + format_halfmove_with_number(move, i) + "]";
}
}