X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=48f23b00dc15e324735a37c3b5c9a400b1982747;hp=e3b3202d14183250bbb840be05803a4481e0d9f8;hb=c7ae0df4abc9ca2168839e94535c1bd39715a57f;hpb=64038487a71aa51ab6906275f3752c5821c4a931 diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js index e3b3202..48f23b0 100644 --- a/www/js/remoteglot.js +++ b/www/js/remoteglot.js @@ -160,7 +160,7 @@ var display_fen = null; * pretty_pv: Array., * move_num: number, * toplay: string, - * score: string, + * scores: Array<{first_move: number, score: Object}>, * start_display_move_num: number * }} DisplayLine * @@ -560,8 +560,8 @@ var compare_by_sort_key = function(refutation_lines, invert, a, b) { }; 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; } @@ -583,14 +583,15 @@ var find_nonstupid_moves = function(data, margin, invert) { 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 []; } } @@ -603,7 +604,8 @@ var find_nonstupid_moves = function(data, margin, invert) { // 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); } @@ -627,18 +629,18 @@ var thousands = function(x) { * @param {Array.} 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); @@ -763,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; } @@ -789,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'] + ""; @@ -807,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, 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; @@ -833,7 +839,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['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); } @@ -890,21 +896,33 @@ 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']) + ")"; + 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); } @@ -1086,8 +1104,15 @@ var update_board = function() { // The score. if (current_display_line && !current_display_line_is_history) { - if (current_display_line.score) { - $("#score").text(format_long_score(current_display_line.score)); + 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"); } @@ -1124,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'], data['score'], 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(); @@ -1266,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') { @@ -1859,7 +1888,7 @@ var get_best_move = function(game, source, target, invert) { } 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; @@ -2001,10 +2030,11 @@ var compute_plot_score = function(score) { /** * @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; @@ -2017,14 +2047,17 @@ var compute_score_sort_key = function(score, invert) { // 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; } /**