* pretty_pv: Array.<string>,
* move_num: number,
* toplay: string,
- * score: string,
+ * scores: Array<{first_move: number, score: Object}>,
* start_display_move_num: number
* }} DisplayLine
*
};
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 {!string} score
+ * @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, score, 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,
- score: score,
+ scores: scores,
start_display_move_num: start_display_move_num
});
return print_pv(display_lines.length - 1, opt_limit, opt_showlast);
// 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, line['score'], 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 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, line['score'], 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']) + ")";
+ var score;
+ if (game['result']) {
+ score = " (" + game['result'] + ")";
+ } else {
+ score = " (" + format_short_score(game['score']) + ")";
+ }
+ game_span.appendChild(document.createTextNode(score));
}
- game_span.appendChild(document.createTextNode(score));
games_div.appendChild(game_span);
}
update_clock();
// The score.
- if (current_display_line) {
- if (current_display_line.score) {
- $("#score").text(format_long_score(current_display_line.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");
}
// Print the PV.
$("#pvtitle").text("PV:");
- $("#pv").html(add_pv(data['position']['fen'], data['pv_pretty'], data['position']['move_num'], data['position']['toplay'], data['score'], 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') {
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());
}
/**
}
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;
}
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;
}
/**
projects / remoteglot / blobdiff