* @type {Number}
* @const
* @private */
-var SCRIPT_VERSION = 2016032202;
+var SCRIPT_VERSION = 2016091401;
/**
* The current backend URL.
* @type {?Array.<{
* name: string,
* url: string,
+ * hashurl: string,
* id: string,
- * score: =Object,
- * result: =string,
+ * score: Object=,
+ * result: string=,
* }>}
* @private
*/
location.reload(true);
}
- possibly_play_sound(current_analysis_data, new_data);
- current_analysis_data = new_data;
- update_board();
- update_num_viewers(num_viewers);
+ // Verify that the PV makes sense.
+ var valid = true;
+ if (new_data['pv']) {
+ var hiddenboard = new Chess(new_data['position']['fen']);
+ for (var i = 0; i < new_data['pv'].length; ++i) {
+ if (hiddenboard.move(new_data['pv'][i]) === null) {
+ valid = false;
+ break;
+ }
+ }
+ }
+
+ var timeout = 100;
+ if (valid) {
+ possibly_play_sound(current_analysis_data, new_data);
+ current_analysis_data = new_data;
+ update_board();
+ update_num_viewers(num_viewers);
+ } else {
+ console.log("Received invalid update, waiting five seconds and trying again.");
+ location.reload(true);
+ }
// Next update.
- current_analysis_request_timer = setTimeout(function() { request_update(); }, 100);
+ current_analysis_request_timer = setTimeout(function() { request_update(); }, timeout);
}).fail(function(jqXHR, textStatus, errorThrown) {
if (textStatus === "abort") {
// Aborted because we are switching backends. Abandon and don't retry,
* @param {!Object} data
* @param {number} margin The maximum number of centipawns worse than the
* best move can be and still be included.
- * @param {boolean} margin Whether black is to play.
+ * @param {boolean} invert Whether black is to play.
* @return {Array.<string>} The FEN representation (e.g. Ne4) of all
* moves, in score order.
*/
var pv_score = undefined;
for (var move in data['refutation_lines']) {
var line = data['refutation_lines'][move];
- var score = compute_score_sort_key(line['score'], line['depth'], invert);
+ var score = compute_score_sort_key(line['score'], line['depth'], invert, false);
if (move == data['pv'][0]) {
pv_score = score;
}
for (var i = 0; i < current_games.length; ++i) {
if (current_games[i]['id'] === hash) {
if (backend_url !== current_games[i]['url']) {
- switch_backend(current_games[i]['url'], current_games[i]['hashurl']);
+ switch_backend(current_games[i]);
}
return;
}
if (displayed_analysis_data) {
// Displaying some non-current position, pick out the last move
// from the history. This will work even if the fetch failed.
- last_move = format_halfmove_with_number(
- current_display_line.pv[current_display_move],
- current_display_move + 1);
- headline += ' after ' + last_move;
+ if (current_display_move !== -1) {
+ last_move = format_halfmove_with_number(
+ current_display_line.pv[current_display_move],
+ current_display_move);
+ headline += ' after ' + last_move;
+ }
} else if (data['position']['last_move'] !== 'none') {
last_move = format_move_with_number(
data['position']['last_move'],
data['position']['move_num'],
- data['position']['toplay'] == 'W');
+ data['position']['toplay'] == 'B');
headline += ' after ' + last_move;
} else {
last_move = null;
if (data['position'] && data['position']['last_move_uci']) {
highlight_from = data['position']['last_move_uci'].substr(0, 2);
highlight_to = data['position']['last_move_uci'].substr(2, 2);
- } else if (current_display_line_is_history && current_display_move >= 0) {
+ } else if (current_display_line_is_history && current_display_line && current_display_move >= 0) {
// We don't have historic analysis for this position, but we
// can reconstruct what the last move was by just replaying
// from the start.
var hiddenboard = chess_from(null, current_display_line.pv, current_display_move);
var moves = hiddenboard.history({ verbose: true });
- var last_move = moves.pop();
+ last_move = moves.pop();
highlight_from = last_move.from;
highlight_to = last_move.to;
} else {
break;
}
var line = data['refutation_lines'][nonstupid_moves[i]];
- var hiddenboard = new Chess(base_fen);
+ hiddenboard = new Chess(base_fen);
hiddenboard.move(line['pv'][0]);
var this_response = hiddenboard.move(line['pv'][1]);
if (response.from !== this_response.from || response.to !== this_response.to) {
chartRangeMin: min_score,
chartRangeMax: max_score,
tooltipFormatter: function(sparkline, options, fields) {
- return format_tooltip(data, fields[0].offset + first_move_num);
+ // score_history contains the Nth _position_, but format_tooltip
+ // wants to format the Nth _move_; thus the -1.
+ return format_tooltip(data, fields[0].offset + first_move_num - 1);
}
});
} else {
var white_clock_ms = null;
var black_clock_ms = null;
- var show_seconds = false;
// Static clocks.
if (data['position'] &&
/**
* @param {string} move
- * @param {Number} move_num
- * @param {boolean} white_to_play
+ * @param {Number} move_num Move number of this move.
+ * @param {boolean} white_to_play Whether white is to play this move.
*/
var format_move_with_number = function(move, move_num, white_to_play) {
var ret;
if (white_to_play) {
- ret = (move_num - 1) + '… ';
- } else {
ret = move_num + '. ';
+ } else {
+ ret = move_num + '… ';
}
ret += move;
return ret;
/**
* @param {string} move
- * @param {Number} halfmove_num
+ * @param {Number} halfmove_num Half-move number that is to be played,
+ * starting from 0.
*/
var format_halfmove_with_number = function(move, halfmove_num) {
return format_move_with_number(
* @param {Number} halfmove_num
*/
var format_tooltip = function(data, halfmove_num) {
- if (data['score_history'][halfmove_num] ||
- halfmove_num === data['position']['history'].length) {
+ if (data['score_history'][halfmove_num + 1] ||
+ (halfmove_num + 1) === data['position']['history'].length) {
+ // Position is in the history, or it is the current position
+ // (which is implicitly tacked onto the history).
var move;
var short_score;
- if (halfmove_num === data['position']['history'].length) {
+ if ((halfmove_num + 1) === data['position']['history'].length) {
move = data['position']['last_move'];
short_score = format_short_score(data['score']);
} else {
move = data['position']['history'][halfmove_num];
- short_score = format_short_score(data['score_history'][halfmove_num]);
+ short_score = format_short_score(data['score_history'][halfmove_num + 1]);
+ }
+ if (halfmove_num === -1) {
+ return "Start position: " + short_score;
+ } else {
+ var move_with_number = format_halfmove_with_number(move, halfmove_num);
+ return "After " + move_with_number + ": " + short_score;
}
- var move_with_number = format_halfmove_with_number(move, halfmove_num);
-
- return "After " + move_with_number + ": " + short_score;
} else {
- for (var i = halfmove_num; i --> 0; ) {
+ for (var i = halfmove_num; i --> -1; ) {
if (data['score_history'][i]) {
var move = data['position']['history'][i];
- return "[Analysis kept from " + format_halfmove_with_number(move, i) + "]";
+ if (i === -1) {
+ return "[Analysis kept from start position]";
+ } else {
+ return "[Analysis kept from " + format_halfmove_with_number(move, i) + "]";
+ }
}
}
}
var game = current_games[game_num];
if (game['url'] === backend_url) {
var next_game_num = (game_num + 1) % current_games.length;
- switch_backend(current_games[next_game_num]['url'], current_games[next_game_num]['hashurl']);
+ switch_backend(current_games[next_game_num]);
return;
}
}
// this move, then select that. Note that this gives us a good priority
// order (history first, then PV, then multi-PV lines).
for (var i = 0; i < display_lines.length; ++i) {
+ if (i == 1 && current_display_line) {
+ // Do not choose PV if not on it.
+ continue;
+ }
var line = display_lines[i];
if (line.pv[line.start_display_move_num] === move.san) {
show_line(i, 0);
* @param score The score digest tuple.
* @param {?number} depth Depth the move has been computed to, or null.
* @param {boolean} invert Whether black is to play.
+ * @param {boolean=} depth_secondary_key
* @return {number}
*/
-var compute_score_sort_key = function(score, depth, invert) {
+var compute_score_sort_key = function(score, depth, invert, depth_secondary_key) {
var s;
if (!score) {
return -10000000;
}
if (s) {
if (invert) s = -s;
- return s * 200 + (depth || 0);
+ if (depth_secondary_key) {
+ return s * 200 + (depth || 0);
+ } else {
+ return s;
+ }
} else {
return null;
}
}
/**
- * @param {string} new_backend_url
+ * @param {Object} game
*/
-var switch_backend = function(new_backend_url, new_backend_hash_url) {
+var switch_backend = function(game) {
// Stop looking at historic data.
current_display_line = null;
current_display_move = null;
}
// Request an immediate fetch with the new backend.
- backend_url = new_backend_url;
- backend_hash_url = new_backend_hash_url;
+ backend_url = game['url'];
+ backend_hash_url = game['hashurl'];
+ window.location.hash = '#' + game['id'];
current_analysis_data = null;
ims = 0;
request_update();
} else if (event.which >= 49 && event.which <= 57) { // 1-9.
var num = event.which - 49;
if (current_games && current_games.length >= num) {
- switch_backend(current_games[num]['url'], current_games[num]['hashurl']);
+ switch_backend(current_games[num]);
}
} else if (event.which == 78) { // N.
next_game();