X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=8cffebdeda197c78022ad443fdc2ea73c7fc56e7;hp=128568aa465253acb4d613d1cf79eb9f6b55264e;hb=071760a7bd1a175ebe9c77b460b8d0f654eeee48;hpb=e7dc2e5b82c4c050fcacc2646e1f79194e0b14d5 diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js index 128568a..8cffebd 100644 --- a/www/js/remoteglot.js +++ b/www/js/remoteglot.js @@ -1,53 +1,98 @@ +(function() { + +/** @type {window.ChessBoard} @private */ var board = null; + +/** @type {window.ChessBoard} @private */ var hiddenboard = null; + +/** @type {Array.<{ + * from_col: number, + * from_row: number, + * to_col: number, + * to_row: number, + * line_width: number, + * arrow_size: number, + * fg_color: string + * }>} + * @private + */ var arrows = []; -var arrow_targets = []; + +/** @type {Array.>} */ var occupied_by_arrows = []; + var refutation_lines = []; + +/** @type {!number} @private */ var move_num = 1; + +/** @type {!string} @private */ var toplay = 'W'; + +/** @type {number} @private */ var ims = 0; -var sort_refutation_lines_by_score = 0; + +/** @type {boolean} @private */ +var sort_refutation_lines_by_score = false; + +/** @type {!string|undefined} @private */ var highlight_from = undefined; + +/** @type {!string|undefined} @private */ var highlight_to = undefined; + +/** @type {!number} @private */ var unique = Math.random(); +/** The current position on the board, represented as a FEN string. + * @type {?string} + * @private + */ var fen = null; + +/** @typedef {{ + * start_fen: string, + * uci_pv: Array., + * pretty_pv: Array. + * }} DisplayLine + */ + +/** @type {Array.} + * @private + */ var display_lines = []; + +/** @type {?DisplayLine} @private */ var current_display_line = null; + +/** @type {?number} @private */ var current_display_move = null; -var request_update = function(board) { +var request_update = function() { $.ajax({ url: "http://analysis.sesse.net/analysis.pl?ims=" + ims + "&unique=" + unique //url: "http://analysis.sesse.net:5000/analysis.pl?ims=" + ims + "&unique=" + unique }).done(function(data, textstatus, xhr) { ims = xhr.getResponseHeader('X-Remoteglot-Last-Modified'); var num_viewers = xhr.getResponseHeader('X-Remoteglot-Num-Viewers'); - update_board(board, data, num_viewers); + update_board(data, num_viewers); }).fail(function() { // Wait ten seconds, then try again. - setTimeout(function() { request_update(board); }, 10000); + setTimeout(function() { request_update(); }, 10000); }); } var clear_arrows = function() { for (var i = 0; i < arrows.length; ++i) { - if (arrows[i].connection1) { - jsPlumb.detach(arrows[i].connection1); - } - if (arrows[i].connection2) { - jsPlumb.detach(arrows[i].connection2); + if (arrows[i].svg) { + arrows[i].svg.parentElement.removeChild(arrows[i].svg); + delete arrows[i].svg; } } arrows = []; - for (var i = 0; i < arrow_targets.length; ++i) { - document.body.removeChild(arrow_targets[i]); - } - arrow_targets = []; - - occupied_by_arrows = []; + occupied_by_arrows = []; for (var y = 0; y < 8; ++y) { occupied_by_arrows.push([false, false, false, false, false, false, false, false]); } @@ -59,6 +104,9 @@ var redraw_arrows = function() { } } +/** @param {!number} x + * @return {!number} + */ var sign = function(x) { if (x > 0) { return 1; @@ -69,7 +117,11 @@ var sign = function(x) { } } -// See if drawing this arrow on the board would cause unduly amount of confusion. +/** See if drawing this arrow on the board would cause unduly amount of confusion. + * @param {!string} from The square the arrow is from (e.g. e4). + * @param {!string} to The square the arrow is to (e.g. e4). + * @return {boolean} + */ var interfering_arrow = function(from, to) { var from_col = from.charCodeAt(0) - "a1".charCodeAt(0); var from_row = from.charCodeAt(1) - "a1".charCodeAt(1); @@ -101,16 +153,63 @@ var interfering_arrow = function(from, to) { return false; } -var add_target = function() { - var elem = document.createElement("div"); - $(elem).addClass("window"); - elem.id = "target" + arrow_targets.length; - document.body.appendChild(elem); - arrow_targets.push(elem); - return elem.id; +/** Find a point along the coordinate system given by the given line, + * units forward from the start of the line, units to the right of it. + * @param {!number} x1 + * @param {!number} x2 + * @param {!number} y1 + * @param {!number} y2 + * @param {!number} t + * @param {!number} u + * @return {!string} The point in "x y" form, suitable for SVG paths. + */ +var point_from_start = function(x1, y1, x2, y2, t, u) { + var dx = x2 - x1; + var dy = y2 - y1; + + var norm = 1.0 / Math.sqrt(dx * dx + dy * dy); + dx *= norm; + dy *= norm; + + var x = x1 + dx * t + dy * u; + var y = y1 + dy * t - dx * u; + return x + " " + y; } - + +/** Find a point along the coordinate system given by the given line, + * units forward from the end of the line, units to the right of it. + * @param {!number} x1 + * @param {!number} x2 + * @param {!number} y1 + * @param {!number} y2 + * @param {!number} t + * @param {!number} u + * @return {!string} The point in "x y" form, suitable for SVG paths. + */ +var point_from_end = function(x1, y1, x2, y2, t, u) { + var dx = x2 - x1; + var dy = y2 - y1; + + var norm = 1.0 / Math.sqrt(dx * dx + dy * dy); + dx *= norm; + dy *= norm; + + var x = x2 + dx * t + dy * u; + var y = y2 + dy * t - dx * u; + return x + " " + y; +} + var position_arrow = function(arrow) { + if (arrow.svg) { + arrow.svg.parentElement.removeChild(arrow.svg); + delete arrow.svg; + } + if (current_display_line !== null) { + return; + } + + var pos = $(".square-a8").position(); + var zoom_factor = $("#board").width() / 400.0; var line_width = arrow.line_width * zoom_factor; var arrow_size = arrow.arrow_size * zoom_factor; @@ -121,73 +220,65 @@ var position_arrow = function(arrow) { var from_x = (arrow.from_col + 0.5)*square_width; var to_x = (arrow.to_col + 0.5)*square_width; - var dx = to_x - from_x; - var dy = to_y - from_y; - var len = Math.sqrt(dx * dx + dy * dy); - dx /= len; - dy /= len; - var pos = $(".square-a8").position(); - $("#" + arrow.s1).css({ top: pos.top + from_y + (0.5 * arrow_size) * dy, left: pos.left + from_x + (0.5 * arrow_size) * dx }); - $("#" + arrow.d1).css({ top: pos.top + to_y - (0.5 * arrow_size) * dy, left: pos.left + to_x - (0.5 * arrow_size) * dx }); - $("#" + arrow.s1v).css({ top: pos.top + from_y - 0 * dy, left: pos.left + from_x - 0 * dx }); - $("#" + arrow.d1v).css({ top: pos.top + to_y + 0 * dy, left: pos.left + to_x + 0 * dx }); - - if (arrow.connection1) { - jsPlumb.detach(arrow.connection1); - } - if (arrow.connection2) { - jsPlumb.detach(arrow.connection2); - } - if (current_display_line !== null) { - delete arrow.connection1; - delete arrow.connection2; - return; - } - arrow.connection1 = jsPlumb.connect({ - source: arrow.s1, - target: arrow.d1, - connector:["Straight"], - cssClass:"c1", - endpoint:"Blank", - endpointClass:"c1Endpoint", - anchor:"Continuous", - paintStyle:{ - lineWidth:line_width, - strokeStyle:arrow.fg_color, - outlineWidth:1, - outlineColor:"#666", - opacity:"60%" - } - }); - arrow.connection2 = jsPlumb.connect({ - source: arrow.s1v, - target: arrow.d1v, - connector:["Straight"], - cssClass:"vir", - endpoint:"Blank", - endpointClass:"c1Endpoint", - anchor:"Continuous", - paintStyle:{ - lineWidth:0, - strokeStyle:arrow.fg_color, - outlineWidth:0, - outlineColor:"#666" - }, - overlays : [ - ["Arrow", { - cssClass:"l1arrow", - location:1.0, - width: arrow_size, - length: arrow_size, - paintStyle: { - lineWidth:line_width, - strokeStyle:"#000" - } - }] - ] - }); + var SVG_NS = "http://www.w3.org/2000/svg"; + var XHTML_NS = "http://www.w3.org/1999/xhtml"; + var svg = document.createElementNS(SVG_NS, "svg"); + svg.setAttribute("width", /** @type{number} */ ($("#board").width())); + svg.setAttribute("height", /** @type{number} */ ($("#board").height())); + svg.setAttribute("style", "position: absolute"); + svg.setAttribute("position", "absolute"); + svg.setAttribute("version", "1.1"); + svg.setAttribute("class", "c1"); + svg.setAttribute("xmlns", XHTML_NS); + + var x1 = from_x; + var y1 = from_y; + var x2 = to_x; + var y2 = to_y; + + // Draw the line. + var outline = document.createElementNS(SVG_NS, "path"); + outline.setAttribute("d", "M " + point_from_start(x1, y1, x2, y2, arrow_size / 2, 0) + " L " + point_from_end(x1, y1, x2, y2, -arrow_size / 2, 0)); + outline.setAttribute("xmlns", XHTML_NS); + outline.setAttribute("stroke", "#666"); + outline.setAttribute("stroke-width", line_width + 2); + outline.setAttribute("fill", "none"); + svg.appendChild(outline); + + var path = document.createElementNS(SVG_NS, "path"); + path.setAttribute("d", "M " + point_from_start(x1, y1, x2, y2, arrow_size / 2, 0) + " L " + point_from_end(x1, y1, x2, y2, -arrow_size / 2, 0)); + path.setAttribute("xmlns", XHTML_NS); + path.setAttribute("stroke", arrow.fg_color); + path.setAttribute("stroke-width", line_width); + path.setAttribute("fill", "none"); + svg.appendChild(path); + + // Then the arrow head. + var head = document.createElementNS(SVG_NS, "path"); + head.setAttribute("d", + "M " + point_from_end(x1, y1, x2, y2, 0, 0) + + " L " + point_from_end(x1, y1, x2, y2, -arrow_size, -arrow_size / 2) + + " L " + point_from_end(x1, y1, x2, y2, -arrow_size * .623, 0.0) + + " L " + point_from_end(x1, y1, x2, y2, -arrow_size, arrow_size / 2) + + " L " + point_from_end(x1, y1, x2, y2, 0, 0)); + head.setAttribute("xmlns", XHTML_NS); + head.setAttribute("stroke", "#000"); + head.setAttribute("stroke-width", "1"); + head.setAttribute("fill", arrow.fg_color); + svg.appendChild(head); + + $(svg).css({ top: pos.top, left: pos.left }); + document.body.appendChild(svg); + arrow.svg = svg; } +/** + * @param {!string} from_square + * @param {!string} to_square + * @param {!string} fg_color + * @param {number} line_width + * @param {number} arrow_size + */ var create_arrow = function(from_square, to_square, fg_color, line_width, arrow_size) { var from_col = from_square.charCodeAt(0) - "a1".charCodeAt(0); var from_row = from_square.charCodeAt(1) - "a1".charCodeAt(1); @@ -196,16 +287,12 @@ var create_arrow = function(from_square, to_square, fg_color, line_width, arrow_ // Create arrow. var arrow = { - s1: add_target(), - d1: add_target(), - s1v: add_target(), - d1v: add_target(), from_col: from_col, from_row: from_row, to_col: to_col, to_row: to_row, line_width: line_width, - arrow_size: arrow_size, + arrow_size: arrow_size, fg_color: fg_color }; @@ -214,36 +301,44 @@ var create_arrow = function(from_square, to_square, fg_color, line_width, arrow_ } var compare_by_sort_key = function(refutation_lines, a, b) { - var ska = refutation_lines[a].sort_key; - var skb = refutation_lines[b].sort_key; + var ska = refutation_lines[a]['sort_key']; + var skb = refutation_lines[b]['sort_key']; if (ska < skb) return -1; if (ska > skb) return 1; return 0; }; - + var compare_by_score = function(refutation_lines, a, b) { - var sa = parseInt(refutation_lines[b].score_sort_key); - var sb = parseInt(refutation_lines[a].score_sort_key); + var sa = parseInt(refutation_lines[b]['score_sort_key'], 10); + var sb = parseInt(refutation_lines[a]['score_sort_key'], 10); return sa - sb; } -// Fake multi-PV using the refutation lines. Find all “relevant” moves, -// sorted by quality, descending. +/** + * Fake multi-PV using the refutation lines. Find all “relevant” moves, + * sorted by quality, descending. + * + * @param {!Object} data + * @param {number} margin The maximum number of centipawns worse than the + * best move can be and still be included. + * @return {Array.} The UCI representation (e.g. e1g1) of all + * moves, in score order. + */ var find_nonstupid_moves = function(data, margin) { // 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); - if (move == data.pv_uci[0]) { + for (var move in data['refutation_lines']) { + var score = parseInt(data['refutation_lines'][move]['score_sort_key'], 10); + 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 (!(data['refutation_lines'][move]['depth'] >= 8)) { return []; } } @@ -255,23 +350,35 @@ var find_nonstupid_moves = function(data, margin) { // Now find all moves that are within “margin” of the best score. // 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); - if (move != data.pv_uci[0] && best_score - score <= margin) { + for (var move in data['refutation_lines']) { + var score = parseInt(data['refutation_lines'][move]['score_sort_key'], 10); + 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.unshift(data.pv_uci[0]); + moves = moves.sort(function(a, b) { return compare_by_score(data['refutation_lines'], a, b) }); + moves.unshift(data['pv_uci'][0]); return moves; } +/** + * @param {number} x + * @return {!string} + */ var thousands = function(x) { return String(x).split('').reverse().join('').replace(/(\d{3}\B)/g, '$1,').split('').reverse().join(''); } -var print_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, limit) { +/** + * @param {!string} fen + * @param {Array.} uci_pv + * @param {Array.} pretty_pv + * @param {number} move_num + * @param {!string} toplay + * @param {number=} opt_limit + */ +var print_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, opt_limit) { display_lines.push({ start_fen: fen, uci_pv: uci_pv, @@ -284,14 +391,14 @@ var print_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, limit) { var move = "" + pretty_pv[0] + ""; pv = move_num + '. … ' + move; toplay = 'W'; - ++i; + ++i; ++move_num; } for ( ; i < pretty_pv.length; ++i) { var move = "" + pretty_pv[i] + ""; if (toplay == 'W') { - if (i > limit) { + if (i > opt_limit) { return pv + ' (…)'; } if (pv != '') { @@ -308,7 +415,7 @@ var print_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, limit) { return pv; } -var update_highlight = function() { +var update_highlight = function() { $("#board").find('.square-55d63').removeClass('nonuglyhighlight'); if (current_display_line === null && highlight_from !== undefined && highlight_to !== undefined) { $("#board").find('.square-' + highlight_from).addClass('nonuglyhighlight'); @@ -316,7 +423,10 @@ var update_highlight = function() { } } -var update_refutation_lines = function(board) { +var update_refutation_lines = function() { + if (fen === null) { + return; + } if (display_lines.length > 1) { display_lines = [ display_lines[0] ]; } @@ -338,54 +448,58 @@ var update_refutation_lines = function(board) { var move_td = document.createElement("td"); tr.appendChild(move_td); $(move_td).addClass("move"); - if (line.pv_uci.length == 0) { - $(move_td).text(line.pretty_move); + if (line['pv_uci'].length == 0) { + $(move_td).text(line['pretty_move']); } else { - var move = "" + line.pretty_move + ""; + var move = "" + line['pretty_move'] + ""; $(move_td).html(move); } var score_td = document.createElement("td"); tr.appendChild(score_td); $(score_td).addClass("score"); - $(score_td).text(line.pretty_score); + $(score_td).text(line['pretty_score']); var depth_td = document.createElement("td"); tr.appendChild(depth_td); $(depth_td).addClass("depth"); - $(depth_td).text("d" + line.depth); + $(depth_td).text("d" + line['depth']); var pv_td = document.createElement("td"); tr.appendChild(pv_td); $(pv_td).addClass("pv"); - $(pv_td).html(print_pv(fen, line.pv_uci, line.pv_pretty, move_num, toplay, 10)); + $(pv_td).html(print_pv(fen, line['pv_uci'], line['pv_pretty'], move_num, toplay, 10)); tbl.append(tr); } // Make one of the links clickable and the other nonclickable. if (sort_refutation_lines_by_score) { - $("#sortbyscore0").html("Move"); + $("#sortbyscore0").html("Move"); $("#sortbyscore1").html("Score"); } else { $("#sortbyscore0").html("Move"); - $("#sortbyscore1").html("Score"); + $("#sortbyscore1").html("Score"); } } -var update_board = function(board, data, num_viewers) { +/** + * @param {Object} data + * @param {number} num_viewers + */ +var update_board = function(data, num_viewers) { display_lines = []; // The headline. var headline = 'Analysis'; - if (data.position.last_move !== 'none') { + if (data['position']['last_move'] !== 'none') { headline += ' after ' - if (data.position.toplay == 'W') { - headline += (data.position.move_num-1) + '… '; + if (data['position']['toplay'] == 'W') { + headline += (data['position']['move_num']-1) + '… '; } else { - headline += data.position.move_num + '. '; + headline += data['position']['move_num'] + '. '; } - headline += data.position.last_move; + headline += data['position']['last_move']; } $("#headline").text(headline); @@ -399,51 +513,50 @@ var update_board = function(board, data, num_viewers) { } // The score. - if (data.score !== null) { - $("#score").text(data.score); + if (data['score'] !== null) { + $("#score").text(data['score']); } // The search stats. - if (data.nodes && data.nps && data.depth) { - var stats = thousands(data.nodes) + ' nodes, ' + thousands(data.nps) + ' nodes/sec, depth ' + data.depth + ' ply'; - if (data.seldepth) { - stats += ' (' + data.seldepth + ' selective)'; + if (data['nodes'] && data['nps'] && data['depth']) { + var stats = thousands(data['nodes']) + ' nodes, ' + thousands(data['nps']) + ' nodes/sec, depth ' + data['depth'] + ' ply'; + if (data['seldepth']) { + stats += ' (' + data['seldepth'] + ' selective)'; } - if (data.tbhits && data.tbhits > 0) { - if (data.tbhits == 1) { + if (data['tbhits'] && data['tbhits'] > 0) { + if (data['tbhits'] == 1) { stats += ', one Nalimov hit'; } else { - stats += ', ' + data.tbhits + ' Nalimov hits'; + stats += ', ' + data['tbhits'] + ' Nalimov hits'; } } - $("#searchstats").text(stats); } // Update the board itself. - fen = data.position.fen; + fen = data['position']['fen']; update_displayed_line(); - if (data.position.last_move_uci) { - highlight_from = data.position.last_move_uci.substr(0, 2); - highlight_to = data.position.last_move_uci.substr(2, 4); + if (data['position']['last_move_uci']) { + highlight_from = data['position']['last_move_uci'].substr(0, 2); + highlight_to = data['position']['last_move_uci'].substr(2, 4); } else { highlight_from = highlight_to = undefined; } update_highlight(); // Print the PV. - $("#pv").html(print_pv(data.position.fen, data.pv_uci, data.pv_pretty, data.position.move_num, data.position.toplay)); + $("#pv").html(print_pv(data['position']['fen'], data['pv_uci'], data['pv_pretty'], data['position']['move_num'], data['position']['toplay'])); // Update the PV arrow. clear_arrows(); - if (data.pv_uci.length >= 1) { + if (data['pv_uci'].length >= 1) { // draw a continuation arrow as long as it's the same piece - for (var i = 0; i < data.pv_uci.length; i += 2) { - var from = data.pv_uci[i].substr(0, 2); - var to = data.pv_uci[i].substr(2,4); - if ((i >= 2 && from != data.pv_uci[i - 2].substr(2, 4)) || + for (var i = 0; i < data['pv_uci'].length; i += 2) { + var from = data['pv_uci'][i].substr(0, 2); + var to = data['pv_uci'][i].substr(2,4); + if ((i >= 2 && from != data['pv_uci'][i - 2].substr(2, 4)) || interfering_arrow(from, to)) { break; } @@ -458,23 +571,23 @@ var update_board = function(board, data, num_viewers) { } // See if all semi-reasonable moves have only one possible response. - if (data.pv_uci.length >= 2) { + if (data['pv_uci'].length >= 2) { var nonstupid_moves = find_nonstupid_moves(data, 300); - var response = data.pv_uci[1]; + var response = data['pv_uci'][1]; for (var i = 0; i < nonstupid_moves.length; ++i) { - if (nonstupid_moves[i] == data.pv_uci[0]) { + if (nonstupid_moves[i] == data['pv_uci'][0]) { // ignore the PV move for refutation lines. continue; } - if (!data.refutation_lines || - !data.refutation_lines[nonstupid_moves[i]] || - !data.refutation_lines[nonstupid_moves[i]].pv_uci || - data.refutation_lines[nonstupid_moves[i]].pv_uci.length < 1) { + if (!data['refutation_lines'] || + !data['refutation_lines'][nonstupid_moves[i]] || + !data['refutation_lines'][nonstupid_moves[i]]['pv_uci'] || + data['refutation_lines'][nonstupid_moves[i]]['pv_uci'].length < 1) { // Incomplete PV, abort. response = undefined; break; } - var this_response = data.refutation_lines[nonstupid_moves[i]].pv_uci[1]; + var this_response = data['refutation_lines'][nonstupid_moves[i]]['pv_uci'][1]; if (response !== this_response) { // Different response depending on lines, abort. response = undefined; @@ -489,21 +602,29 @@ var update_board = function(board, data, num_viewers) { } // Update the refutation lines. - fen = data.position.fen; - move_num = data.position.move_num; - toplay = data.position.toplay; - refutation_lines = data.refutation_lines; - update_refutation_lines(board); + fen = data['position']['fen']; + move_num = data['position']['move_num']; + toplay = data['position']['toplay']; + refutation_lines = data['refutation_lines']; + update_refutation_lines(); // Next update. - setTimeout(function() { request_update(board); }, 100); + setTimeout(function() { request_update(); }, 100); } +/** + * @param {boolean} sort_by_score + */ var resort_refutation_lines = function(sort_by_score) { sort_refutation_lines_by_score = sort_by_score; - update_refutation_lines(board); + update_refutation_lines(); } +window['resort_refutation_lines'] = resort_refutation_lines; +/** + * @param {number} line_num + * @param {number} move_num + */ var show_line = function(line_num, move_num) { if (line_num == -1) { current_display_line = null; @@ -516,16 +637,19 @@ var show_line = function(line_num, move_num) { update_highlight(); redraw_arrows(); } +window['show_line'] = show_line; var prev_move = function() { --current_display_move; update_displayed_line(); } +window['prev_move'] = prev_move; var next_move = function() { ++current_display_move; update_displayed_line(); } +window['next_move'] = next_move; var update_displayed_line = function() { if (current_display_line === null) { @@ -560,10 +684,10 @@ var update_displayed_line = function() { var init = function() { // Create board. - board = new ChessBoard('board', 'start'); - hiddenboard = new ChessBoard('hiddenboard', 'start'); + board = new window.ChessBoard('board', 'start'); + hiddenboard = new window.ChessBoard('hiddenboard', 'start'); - request_update(board); + request_update(); $(window).resize(function() { board.resize(); update_highlight(); @@ -571,3 +695,5 @@ var init = function() { }); }; $(document).ready(init); + +})();