X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=48f23b00dc15e324735a37c3b5c9a400b1982747;hp=bba9ad5735bc1cf0249c63e70700fa13ac54e334;hb=c7ae0df4abc9ca2168839e94535c1bd39715a57f;hpb=09a335457afb3006129099ffc0fa8fd1f8b0a834 diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js index bba9ad5..48f23b0 100644 --- a/www/js/remoteglot.js +++ b/www/js/remoteglot.js @@ -7,7 +7,7 @@ * @type {Number} * @const * @private */ -var SCRIPT_VERSION = 2016032000; +var SCRIPT_VERSION = 2016032201; /** * The current backend URL. @@ -48,6 +48,8 @@ var displayed_analysis_data = null; * name: string, * url: string, * id: string, + * score: =Object, + * result: =string, * }>} * @private */ @@ -158,10 +160,12 @@ var display_fen = null; * pretty_pv: Array., * 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. @@ -546,7 +550,8 @@ var create_arrow = function(from_square, to_square, fg_color, line_width, arrow_ arrows.push(arrow); } -var compare_by_sort_key = function(refutation_lines, a, b) { +// Note: invert is ignored. +var compare_by_sort_key = function(refutation_lines, invert, a, b) { var ska = refutation_lines[a]['sort_key']; var skb = refutation_lines[b]['sort_key']; if (ska < skb) return -1; @@ -554,9 +559,9 @@ var compare_by_sort_key = function(refutation_lines, a, b) { return 0; }; -var compare_by_score = function(refutation_lines, a, b) { - var sa = parseInt(refutation_lines[b]['score_sort_key'], 10); - var sb = parseInt(refutation_lines[a]['score_sort_key'], 10); +var compare_by_score = function(refutation_lines, invert, a, b) { + 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; } @@ -567,24 +572,26 @@ var compare_by_score = function(refutation_lines, a, b) { * @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. * @return {Array.} The UCI representation (e.g. e1g1) of all * moves, in score order. */ -var find_nonstupid_moves = function(data, margin) { +var find_nonstupid_moves = function(data, margin, invert) { // First of all, if there are any moves that are more than 0.5 ahead of // the primary move, the refutation lines are probably bunk, so just // kill them all. var best_score = undefined; var pv_score = undefined; for (var move in data['refutation_lines']) { - var score = parseInt(data['refutation_lines'][move]['score_sort_key'], 10); + 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 []; } } @@ -597,12 +604,13 @@ var find_nonstupid_moves = function(data, margin) { // The PV move will always be first. var moves = []; for (var move in data['refutation_lines']) { - var score = parseInt(data['refutation_lines'][move]['score_sort_key'], 10); + 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); } } - moves = moves.sort(function(a, b) { return compare_by_score(data['refutation_lines'], a, b) }); + moves = moves.sort(function(a, b) { return compare_by_score(data['refutation_lines'], data['position']['toplay'] === 'B', a, b) }); moves.unshift(data['pv_uci'][0]); return moves; @@ -621,25 +629,27 @@ var thousands = function(x) { * @param {Array.} 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]; @@ -725,7 +735,7 @@ var update_history = function() { } else { $("#history").html( '(collapse) ' + - print_pv(0, 1, 'W')); + print_pv(0)); } } @@ -755,9 +765,11 @@ var update_refutation_lines = function() { // Find out where the lines start from. var base_line = []; + var base_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; } @@ -765,8 +777,13 @@ var update_refutation_lines = function() { for (var move in refutation_lines) { moves.push(move); } + + var invert = (toplay === 'B'); + if (current_display_line && current_display_move % 2 == 0) { + invert = !invert; + } var compare = sort_refutation_lines_by_score ? compare_by_score : compare_by_sort_key; - moves = moves.sort(function(a, b) { return compare(refutation_lines, a, b) }); + moves = moves.sort(function(a, b) { return compare(refutation_lines, invert, a, b) }); for (var i = 0; i < moves.length; ++i) { var line = refutation_lines[moves[i]]; @@ -776,6 +793,8 @@ var update_refutation_lines = function() { 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 = "" + line['pretty_move'] + ""; @@ -794,7 +813,7 @@ var update_refutation_lines = function() { 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; @@ -806,17 +825,21 @@ var update_refutation_lines = function() { var score_td = document.createElement("td"); tr.appendChild(score_td); $(score_td).addClass("score"); - $(score_td).text(line['pretty_score']); + $(score_td).text(format_short_score(line['score'])); 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); } @@ -873,13 +896,34 @@ var update_game_list = function(games) { 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); } } @@ -897,7 +941,7 @@ var possibly_switch_game_from_hash = function() { 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; } @@ -916,7 +960,7 @@ var update_board = function() { // 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); } @@ -926,11 +970,10 @@ var update_board = function() { 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. @@ -1008,8 +1051,10 @@ var update_board = function() { // The contains a very brief headline. var title_elems = []; - if (data['short_score'] !== undefined && data['short_score'] !== null) { - title_elems.push(data['short_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); @@ -1058,8 +1103,21 @@ var update_board = function() { update_clock(); // The score. - if (data['score'] !== null) { - $("#score").text(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'])); } // The search stats. @@ -1091,7 +1149,9 @@ var update_board = function() { // 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: 0, 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(); @@ -1107,7 +1167,7 @@ var update_board = function() { create_arrow(from, to, '#f66', 6, 20); } - var alt_moves = find_nonstupid_moves(data, 30); + var alt_moves = find_nonstupid_moves(data, 30, data['position']['toplay'] === 'B'); for (var i = 1; i < alt_moves.length && i < 3; ++i) { create_arrow(alt_moves[i].substr(0, 2), alt_moves[i].substr(2, 2), '#f66', 1, 10); @@ -1116,7 +1176,7 @@ var update_board = function() { // See if all semi-reasonable moves have only one possible response. if (data['pv_uci'].length >= 2) { - var nonstupid_moves = find_nonstupid_moves(data, 300); + var nonstupid_moves = find_nonstupid_moves(data, 300, data['position']['toplay'] === 'B'); var response = data['pv_uci'][1]; for (var i = 0; i < nonstupid_moves.length; ++i) { if (nonstupid_moves[i] == data['pv_uci'][0]) { @@ -1187,15 +1247,15 @@ var update_sparkline = function(data) { var scores = []; for (var halfmove_num = first_move_num; halfmove_num <= last_move_num; ++halfmove_num) { if (data['score_history'][halfmove_num]) { - var score = data['score_history'][halfmove_num][0]; + var score = compute_plot_score(data['score_history'][halfmove_num]); + last_score = score; if (score < min_score) min_score = score; if (score > max_score) max_score = score; - last_score = data['score_history'][halfmove_num][0]; } scores.push(last_score); } - if (data['plot_score']) { - scores.push(data['plot_score']); + if (data['score']) { + scores.push(compute_plot_score(data['score'])); } // FIXME: at some widths, calling sparkline() seems to push // #scorecontainer under the board. @@ -1233,6 +1293,8 @@ var update_clock = function() { 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') { @@ -1394,10 +1456,10 @@ var format_tooltip = function(data, halfmove_num) { var short_score; if (halfmove_num === data['position']['pretty_history'].length) { move = data['position']['last_move']; - short_score = data['short_score']; + short_score = format_short_score(data['score']); } else { move = data['position']['pretty_history'][halfmove_num]; - short_score = data['score_history'][halfmove_num][1]; + short_score = format_short_score(data['score_history'][halfmove_num]); } var move_with_number = format_halfmove_with_number(move, halfmove_num); @@ -1485,6 +1547,24 @@ var next_move = function() { } 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; @@ -1559,28 +1639,7 @@ var update_move_highlight = function() { highlighted_move.removeClass('highlight'); } if (current_display_line) { - // See if the current displayed line is identical to any of the ones - // we have on screen. (It might not be if e.g. the analysis reloaded - // since we started looking.) - var display_line_num = null; - for (var i = 0; i < display_lines.length; ++i) { - var line = display_lines[i]; - if (line.start_display_move_num > 0) continue; - if (current_display_line.start_fen !== line.start_fen) continue; - if (current_display_line.pretty_pv.length !== line.pretty_pv.length) continue; - var ok = true; - for (var j = 0; j < line.pretty_pv.length; ++j) { - if (current_display_line.pretty_pv[j] !== line.pretty_pv[j]) { - ok = false; - break; - } - } - if (ok) { - display_line_num = i; - break; - } - } - + var display_line_num = find_display_line_matching_num(); if (display_line_num === null) { // Replace the PV with the (complete) line. $("#pvtitle").text("Exploring:"); @@ -1595,6 +1654,33 @@ var update_move_highlight = function() { } } +/** + * See if the current displayed line is identical to any of the ones + * we have on screen. (It might not be if e.g. the analysis reloaded + * since we started looking.) + * + * @return {?number} + */ +var find_display_line_matching_num = function() { + for (var i = 0; i < display_lines.length; ++i) { + var line = display_lines[i]; + if (line.start_display_move_num > 0) continue; + if (current_display_line.start_fen !== line.start_fen) continue; + if (current_display_line.pretty_pv.length !== line.pretty_pv.length) continue; + var ok = true; + for (var j = 0; j < line.pretty_pv.length; ++j) { + if (current_display_line.pretty_pv[j] !== line.pretty_pv[j]) { + ok = false; + break; + } + } + if (ok) { + return i; + } + } + return null; +} + var update_displayed_line = function() { if (current_display_line === null) { $("#linenav").hide(); @@ -1672,6 +1758,7 @@ var explore_hash = function(fen) { clearTimeout(current_hash_display_timer); current_hash_display_timer = null; } + $("#refutationlines").empty(); current_hash_xhr = $.ajax({ url: backend_hash_url + "?fen=" + fen }).done(function(data, textstatus, xhr) { @@ -1704,7 +1791,7 @@ var onDragStart = function(source, piece, position, orientation) { return false; } - recommended_move = get_best_move(pseudogame, source, null); + recommended_move = get_best_move(pseudogame, source, null, pseudogame.turn() === 'b'); if (recommended_move) { var squareEl = $('#board .square-' + recommended_move.to); squareEl.addClass('highlight1-32417'); @@ -1728,7 +1815,7 @@ var mousedownSquare = function(e) { (pseudogame.turn() === 'w' && position[square].search(/^b/) !== -1) || (pseudogame.turn() === 'b' && position[square].search(/^w/) !== -1)) { reverse_dragging_from = square; - recommended_move = get_best_move(pseudogame, null, square); + recommended_move = get_best_move(pseudogame, null, square, pseudogame.turn() === 'b'); if (recommended_move) { var squareEl = $('#board .square-' + recommended_move.from); squareEl.addClass('highlight1-32417'); @@ -1751,7 +1838,7 @@ var mouseupSquare = function(e) { $("#board").find('.square-55d63').removeClass('highlight1-32417'); } -var get_best_move = function(game, source, target) { +var get_best_move = function(game, source, target, invert) { var moves = game.moves({ verbose: true }); if (source !== null) { moves = moves.filter(function(move) { return move.from == source; }); @@ -1773,6 +1860,15 @@ var get_best_move = function(game, source, target) { 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]; @@ -1787,13 +1883,12 @@ var get_best_move = function(game, source, target) { for (var move in refutation_lines) { var line = refutation_lines[move]; - var score = parseInt(line['score_sort_key'], 10); - if (score < -1000000) { // Two zeros less than in the server (just some margin). + if (!line['score']) { continue; } var first_move = line['pv_pretty'][0]; if (move_hash[first_move]) { - var score = parseInt(line['score_sort_key'], 10); + 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; @@ -1843,7 +1938,7 @@ var onSnapEnd = function(source, target) { 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; } @@ -1864,10 +1959,111 @@ var onSnapEnd = function(source, target) { } // End of dragging-related code. +var fmt_cp = function(v) { + if (v === 0) { + return "0.00"; + } else if (v > 0) { + return "+" + (v / 100).toFixed(2); + } else { + v = -v; + return "-" + (v / 100).toFixed(2); + } +} + +var format_short_score = function(score) { + if (!score) { + return "???"; + } + if (score[0] === 'm') { + if (score[2]) { // Is a bound. + return score[2] + "\u00a0M " + score[1]; + } else { + return "M " + score[1]; + } + } else if (score[0] === 'd') { + return "TB draw"; + } else if (score[0] === 'cp') { + if (score[2]) { // Is a bound. + return score[2] + "\u00a0" + fmt_cp(score[1]); + } else { + return fmt_cp(score[1]); + } + } + return null; +} + +var format_long_score = function(score) { + if (score[0] === 'm') { + if (score[1] > 0) { + return "White mates in " + score[1]; + } else { + return "Black mates in " + (-score[1]); + } + } else if (score[0] === 'd') { + return "Theoretical draw"; + } else if (score[0] === 'cp') { + return "Score: " + format_short_score(score); + } + return null; +} + +var compute_plot_score = function(score) { + if (score[0] === 'm') { + if (score[1] > 0) { + return 500; + } else { + return -500; + } + } else if (score[0] === 'd') { + return 0; + } else if (score[0] === 'cp') { + if (score[1] > 500) { + return 500; + } else if (score[1] < -500) { + return -500; + } else { + return score[1]; + } + } + return null; +} + +/** + * @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, depth, invert) { + var s; + if (!score) { + return -10000000; + } + if (score[0] === 'm') { + if (score[1] > 0) { + // White mates. + s = 99999 - score[1]; + } else { + // Black mates (note the double negative for score[1]). + s = -99999 - score[1]; + } + } else if (score[0] === 'd') { + s = 0; + } else if (score[0] === 'cp') { + s = score[1]; + } + if (s) { + if (invert) s = -s; + return s * 200 + (depth || 0); + } else { + 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; @@ -1897,6 +2093,7 @@ var switch_backend = function(new_backend_url) { // 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(); @@ -1938,10 +2135,17 @@ var init = function() { 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);