* @type {Number}
* @const
* @private */
-var SCRIPT_VERSION = 2016032000;
+var SCRIPT_VERSION = 2016032201;
/**
* The current backend URL.
* name: string,
* url: string,
* id: string,
+ * score: =Object,
+ * result: =string,
* }>}
* @private
*/
* pretty_pv: Array.<string>,
* move_num: number,
* toplay: string,
+ * scores: Array<{first_move: number, score: Object}>,
* start_display_move_num: number
* }} DisplayLine
*
* "start_display_move_num" is the (half-)move number to start displaying the PV at.
+ * "score" is also evaluated at this point.
*/
/** All PVs that we currently know of.
};
var compare_by_score = function(refutation_lines, invert, a, b) {
- var sa = compute_score_sort_key(refutation_lines[b]['score'], invert);
- var sb = compute_score_sort_key(refutation_lines[a]['score'], invert);
+ var sa = compute_score_sort_key(refutation_lines[b]['score'], refutation_lines[b]['depth'], invert);
+ var sb = compute_score_sort_key(refutation_lines[a]['score'], refutation_lines[a]['depth'], invert);
return sa - sb;
}
var best_score = undefined;
var pv_score = undefined;
for (var move in data['refutation_lines']) {
- var score = compute_score_sort_key(data['refutation_lines'][move]['score'], invert);
+ var line = data['refutation_lines'][move];
+ var score = compute_score_sort_key(line['score'], line['depth'], invert);
if (move == data['pv_uci'][0]) {
pv_score = score;
}
if (best_score === undefined || score > best_score) {
best_score = score;
}
- if (!(data['refutation_lines'][move]['depth'] >= 8)) {
+ if (line['depth'] < 8) {
return [];
}
}
// The PV move will always be first.
var moves = [];
for (var move in data['refutation_lines']) {
- var score = compute_score_sort_key(data['refutation_lines'][move]['score'], invert);
+ var line = data['refutation_lines'][move];
+ var score = compute_score_sort_key(line['score'], line['depth'], invert);
if (move != data['pv_uci'][0] && best_score - score <= margin) {
moves.push(move);
}
* @param {Array.<string>} pretty_pv
* @param {number} move_num
* @param {!string} toplay
+ * @param {Array<{ first_move: integer, score: Object }>} scores
* @param {number} start_display_move_num
* @param {number=} opt_limit
* @param {boolean=} opt_showlast
*/
-var add_pv = function(start_fen, pretty_pv, move_num, toplay, start_display_move_num, opt_limit, opt_showlast) {
+var add_pv = function(start_fen, pretty_pv, move_num, toplay, scores, start_display_move_num, opt_limit, opt_showlast) {
display_lines.push({
start_fen: start_fen,
pretty_pv: pretty_pv,
move_num: parseInt(move_num),
toplay: toplay,
- start_display_move_num: start_display_move_num,
+ scores: scores,
+ start_display_move_num: start_display_move_num
});
return print_pv(display_lines.length - 1, opt_limit, opt_showlast);
}
/**
* @param {number} line_num
- * @param {number=} opt_limit
- * @param {boolean=} opt_showlast
+ * @param {number=} opt_limit If set, show at most this number of moves.
+ * @param {boolean=} opt_showlast If limit is set, show the last moves instead of the first ones.
*/
var print_pv = function(line_num, opt_limit, opt_showlast) {
var display_line = display_lines[line_num];
} else {
$("#history").html(
'(<a class="move" href="javascript:collapse_history(true)">collapse</a>) ' +
- print_pv(0, 1, 'W'));
+ print_pv(0));
}
}
// Find out where the lines start from.
var base_line = [];
+ var base_scores = display_lines[1].scores;
var start_display_move_num = 0;
if (hash_refutation_lines) {
base_line = current_display_line.pretty_pv.slice(0, current_display_move + 1);
+ base_scores = current_display_line.scores;
start_display_move_num = base_line.length;
}
tr.appendChild(move_td);
$(move_td).addClass("move");
+ var scores = base_scores.concat([{ first_move: start_display_move_num, score: line['score'] }]);
+
if (line['pv_pretty'].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 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, start_display_move_num));
+ $(pv_td).html(add_pv(base_fen, base_line.concat([ line['pretty_move'] ]), move_num, toplay, scores, start_display_move_num));
tbl.append(tr);
continue;
var depth_td = document.createElement("td");
tr.appendChild(depth_td);
$(depth_td).addClass("depth");
- $(depth_td).text("d" + line['depth']);
+ if (line['depth'] && line['depth'] >= 0) {
+ $(depth_td).text("d" + line['depth']);
+ } else {
+ $(depth_td).text("—");
+ }
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['pv_pretty']), move_num, toplay, start_display_move_num, 10));
+ $(pv_td).html(add_pv(base_fen, base_line.concat(line['pv_pretty']), move_num, toplay, scores, start_display_move_num, 10));
tbl.append(tr);
}
var game_name = document.createTextNode(game['name']);
if (game['url'] === backend_url) {
+ // This game.
game_span.appendChild(game_name);
+
+ if (current_analysis_data && current_analysis_data['position']) {
+ var score;
+ if (current_analysis_data['position']['result']) {
+ score = " (" + current_analysis_data['position']['result'] + ")";
+ } else {
+ score = " (" + format_short_score(current_analysis_data['score']) + ")";
+ }
+ game_span.appendChild(document.createTextNode(score));
+ }
} else {
+ // Some other game.
var game_a = document.createElement("a");
game_a.setAttribute("href", "#" + game['id']);
game_a.appendChild(game_name);
game_span.appendChild(game_a);
+
+ var score;
+ if (game['result']) {
+ score = " (" + game['result'] + ")";
+ } else {
+ score = " (" + format_short_score(game['score']) + ")";
+ }
+ game_span.appendChild(document.createTextNode(score));
}
+
games_div.appendChild(game_span);
}
}
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']);
+ switch_backend(current_games[i]['url'], current_games[i]['hashurl']);
}
return;
}
// 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', 0, 8, true);
+ add_pv('start', current_data['position']['pretty_history'], 1, 'W', null, 0, 8, true);
} else {
display_lines.push(null);
}
if (current_data['games']) {
current_games = current_data['games'];
possibly_switch_game_from_hash();
- update_game_list(current_data['games']);
} else {
current_games = null;
- update_game_list(null);
}
+ update_game_list(current_games);
// The headline. Names are always fetched from current_data;
// the rest can depend a bit.
// The <title> contains a very brief headline.
var title_elems = [];
- if (data['score']) {
- title_elems.push(format_short_score(data['score']).replace(/^ /, ""));
+ if (data['position'] && data['position']['result']) {
+ title_elems.push(data['position']['result']);
+ } else if (data['score']) {
+ title_elems.push(format_short_score(data['score']));
}
if (last_move !== null) {
title_elems.push(last_move);
update_clock();
// The score.
- if (data['score']) {
+ if (current_display_line && !current_display_line_is_history) {
+ if (current_display_line.scores && current_display_line.scores.length > 0) {
+ var score;
+ for (var i = 0; i < current_display_line.scores.length; ++i) {
+ if (current_display_move < current_display_line.scores[i].first_move) {
+ break;
+ }
+ score = current_display_line.scores[i].score;
+ }
+ $("#score").text(format_long_score(score));
+ } else {
+ $("#score").text("No score for this move");
+ }
+ } else if (data['score']) {
$("#score").text(format_long_score(data['score']));
}
// Print the PV.
$("#pvtitle").text("PV:");
- $("#pv").html(add_pv(data['position']['fen'], data['pv_pretty'], data['position']['move_num'], data['position']['toplay'], 0));
+
+ var scores = [{ first_move: -1, score: data['score'] }];
+ $("#pv").html(add_pv(data['position']['fen'], data['pv_pretty'], data['position']['move_num'], data['position']['toplay'], scores, 0));
// Update the PV arrow.
clear_arrows();
clearTimeout(clock_timer);
var data = displayed_analysis_data || current_analysis_data;
+ if (!data) return;
+
if (data['position']) {
var result = data['position']['result'];
if (result === '1-0') {
}
window['next_move'] = next_move;
+var next_game = function() {
+ if (current_games === null) {
+ return;
+ }
+
+ // Try to find the game we are currently looking at.
+ for (var game_num = 0; game_num < current_games.length; ++game_num) {
+ 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']);
+ return;
+ }
+ }
+
+ // Couldn't find it; give up.
+}
+
var update_historic_analysis = function() {
if (!current_display_line_is_history) {
return;
display_lines.push(current_display_line);
$("#pv").html(print_pv(display_lines.length - 1));
display_line_num = display_lines.length - 1;
+
+ // Clear out the PV, so it's not selected by anything later.
+ display_lines[1].pretty_pv = [];
}
highlighted_move = $("#automove" + display_line_num + "-" + (current_display_move - current_display_line.start_display_move_num));
return null;
}
+/** Update the board based on the currently displayed line.
+ *
+ * TODO: This should really be called only whenever something changes,
+ * instead of all the time.
+ */
var update_displayed_line = function() {
if (current_display_line === null) {
$("#linenav").hide();
$("#linemsg").show();
display_fen = base_fen;
- board.position(base_fen);
+ set_board_position(base_fen);
update_imbalance(base_fen);
return;
}
}
var hiddenboard = chess_from(current_display_line.start_fen, current_display_line.pretty_pv, current_display_move);
+ set_board_position(hiddenboard.fen());
+ if (display_fen !== hiddenboard.fen() && !current_display_line_is_history) {
+ // Fire off a hash request, since we're now off the main position
+ // and it just changed.
+ explore_hash(hiddenboard.fen());
+ }
display_fen = hiddenboard.fen();
+ update_imbalance(hiddenboard.fen());
+}
+
+var set_board_position = function(new_fen) {
board_is_animating = true;
var old_fen = board.fen();
- board.position(hiddenboard.fen());
+ board.position(new_fen);
if (board.fen() === old_fen) {
board_is_animating = false;
- } else if (!current_display_line_is_history) {
- // Fire off a hash request, since we're now off the main position
- // and it just changed.
- explore_hash(display_fen);
}
- update_imbalance(hiddenboard.fen());
}
/**
move_hash[moves[i].san] = moves[i];
}
+ // See if we're already exploring some line.
+ if (current_display_line &&
+ current_display_move < current_display_line.pretty_pv.length - 1) {
+ var first_move = current_display_line.pretty_pv[current_display_move + 1];
+ if (move_hash[first_move]) {
+ return move_hash[first_move];
+ }
+ }
+
// History and PV take priority over the display lines.
for (var i = 0; i < 2; ++i) {
var line = display_lines[i];
}
var first_move = line['pv_pretty'][0];
if (move_hash[first_move]) {
- var score = compute_score_sort_key(line['score'], invert);
+ var score = compute_score_sort_key(line['score'], line['depth'], invert);
if (best_move_score === null || score > best_move_score) {
best_move = move_hash[first_move];
best_move_score = score;
if (current_display_line &&
current_display_move < current_display_line.pretty_pv.length - 1 &&
- current_display_line.pretty_pv[current_display_move] === move.san) {
+ current_display_line.pretty_pv[current_display_move + 1] === move.san) {
next_move();
return;
}
}
// End of dragging-related code.
-var pad = function(val, num_digits) {
- var s = val.toString();
- while (s.length < num_digits) {
- s = " " + s;
- }
- return s;
-}
-
var fmt_cp = function(v) {
if (v === 0) {
return "0.00";
}
var format_short_score = function(score) {
+ if (!score) {
+ return "???";
+ }
if (score[0] === 'm') {
if (score[2]) { // Is a bound.
- return score[2] + "\u00a0M" + pad(score[1], 3);
+ return score[2] + "\u00a0M " + score[1];
} else {
- return "M" + pad(score[1], 3);
+ return "M " + score[1];
}
} else if (score[0] === 'd') {
return "TB draw";
if (score[2]) { // Is a bound.
return score[2] + "\u00a0" + fmt_cp(score[1]);
} else {
- return pad(fmt_cp(score[1]), 5);
+ return fmt_cp(score[1]);
}
}
return null;
}
var format_long_score = function(score) {
+ if (!score) {
+ return "???";
+ }
if (score[0] === 'm') {
if (score[1] > 0) {
return "White mates in " + score[1];
/**
* @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.
* @return {number}
*/
-var compute_score_sort_key = function(score, invert) {
+var compute_score_sort_key = function(score, depth, invert) {
var s;
if (!score) {
return -10000000;
// Black mates (note the double negative for score[1]).
s = -99999 - score[1];
}
- if (invert) s = -s;
- return s;
} else if (score[0] === 'd') {
- return 0;
+ s = 0;
} else if (score[0] === 'cp') {
- return invert ? -score[1] : score[1];
+ s = score[1];
+ }
+ if (s) {
+ if (invert) s = -s;
+ return s * 200 + (depth || 0);
+ } else {
+ return null;
}
- return null;
}
/**
* @param {string} new_backend_url
*/
-var switch_backend = function(new_backend_url) {
+var switch_backend = function(new_backend_url, new_backend_hash_url) {
// 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;
current_analysis_data = null;
ims = 0;
request_update();
redraw_arrows();
});
$(window).keyup(function(event) {
- if (event.which == 39) {
+ if (event.which == 39) { // Left arrow.
next_move();
- } else if (event.which == 37) {
+ } else if (event.which == 37) { // Right arrow.
prev_move();
+ } 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']);
+ }
+ } else if (event.which == 78) { // N.
+ next_game();
}
});
window.addEventListener('hashchange', possibly_switch_game_from_hash, false);
projects / remoteglot / blobdiff