Unbreak find_nonstupid_moves.

[remoteglot] / www / js / remoteglot.js

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index c8310fabcc3d613e2c94dc05a5f61faabcff6419..d259e272f9d9229a95e11a8bc2ac53a12835846e 100644 (file)
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -1,14 +1,33 @@
-var board = [];
+var board = null;
+var hiddenboard = null;

 var arrows = [];
 var arrow_targets = [];
 var occupied_by_arrows = [];
 var arrows = [];
 var arrow_targets = [];
 var occupied_by_arrows = [];

-
-var request_update = function(board, first) {
+var refutation_lines = [];
+var move_num = 1;
+var toplay = 'W';
+var ims = 0;
+var sort_refutation_lines_by_score = 0;
+var highlight_from = undefined;
+var highlight_to = undefined;
+var unique = Math.random();
+
+var fen = null;
+var display_lines = [];
+var current_display_line = null;
+var current_display_move = null;
+
+var request_update = function(board) {

        $.ajax({
        $.ajax({

-               //url: "http://analysis.sesse.net/analysis.pl?first=" + first
-               url: "http://analysis.sesse.net:5000/analysis.pl?first=" + first
-       }).done(function(data) {
-               update_board(board, data);
+               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);
+       }).fail(function() {
+               // Wait ten seconds, then try again.
+               setTimeout(function() { request_update(board); }, 10000);

        });
 }
 
        });
 }
 


@@ -92,18 +111,18 @@ var position_arrow = function(arrow) {
        var line_width = arrow.line_width * zoom_factor;
        var arrow_size = arrow.arrow_size * zoom_factor;
 
        var line_width = arrow.line_width * zoom_factor;
        var arrow_size = arrow.arrow_size * zoom_factor;
 

-       var square_width = Math.floor(($("#board").width() - 1) / 8);
-       var from_y = (7 - arrow.from_row + 0.5)*square_width + 1;
-       var to_y = (7 - arrow.to_row + 0.5)*square_width + 1;
-       var from_x = (arrow.from_col + 0.5)*square_width + 1;
-       var to_x = (arrow.to_col + 0.5)*square_width + 1;
+       var square_width = $(".square-a8").width();
+       var from_y = (7 - arrow.from_row + 0.5)*square_width;
+       var to_y = (7 - arrow.to_row + 0.5)*square_width;
+       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 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 = $("#board").position();
+       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.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 });


@@ -115,6 +134,11 @@ var position_arrow = function(arrow) {
        if (arrow.connection2) {
                jsPlumb.detach(arrow.connection2);
        }
        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,
        arrow.connection1 = jsPlumb.connect({
                source: arrow.s1,
                target: arrow.d1,


@@ -185,6 +209,24 @@ var create_arrow = function(from_square, to_square, fg_color, line_width, arrow_
        arrows.push(arrow);
 }
 
        arrows.push(arrow);
 }
 

+var compare_by_sort_key = function(refutation_lines, toplay, a, b) {
+       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, toplay, a, b) {
+       var sa = parseInt(refutation_lines[b].score_sort_key);
+       var sb = parseInt(refutation_lines[a].score_sort_key);
+       if (toplay == 'B') {
+               return sb - sa;
+       } else {
+               return sa - sb;
+       }
+}
+

 // Fake multi-PV using the refutation lines. Find all “relevant” moves,
 // sorted by quality, descending.
 var find_nonstupid_moves = function(data, margin) {
 // Fake multi-PV using the refutation lines. Find all “relevant” moves,
 // sorted by quality, descending.
 var find_nonstupid_moves = function(data, margin) {


@@ -194,7 +236,7 @@ var find_nonstupid_moves = function(data, margin) {
        var best_score = undefined;
        var pv_score = undefined;
        for (var move in data.refutation_lines) {
        var best_score = undefined;
        var pv_score = undefined;
        for (var move in data.refutation_lines) {

-               var score = data.refutation_lines[move].score_sort_key;
+               var score = parseInt(data.refutation_lines[move].score_sort_key);

                if (move == data.pv_uci[0]) {
                        pv_score = score;
                }
                if (move == data.pv_uci[0]) {
                        pv_score = score;
                }


@@ -214,12 +256,12 @@ var find_nonstupid_moves = function(data, margin) {
        // The PV move will always be first.
        var moves = [];
        for (var move in data.refutation_lines) {
        // The PV move will always be first.
        var moves = [];
        for (var move in data.refutation_lines) {

-               var score = data.refutation_lines[move].score_sort_key;
+               var score = parseInt(data.refutation_lines[move].score_sort_key);

                if (move != data.pv_uci[0] && best_score - score <= margin) {
                        moves.push(move);
                }
        }
                if (move != data.pv_uci[0] && best_score - score <= margin) {
                        moves.push(move);
                }
        }

-       moves = moves.sort(function(a, b) { return data.refutation_lines[b].score_sort_key - data.refutation_lines[a].score_sort_key; });
+       moves = moves.sort(function(a, b) { return compare_by_score(data.refutation_lines, data.position.toplay, a, b) });

        moves.unshift(data.pv_uci[0]);
 
        return moves;
        moves.unshift(data.pv_uci[0]);
 
        return moves;


@@ -229,16 +271,25 @@ var thousands = function(x) {
        return String(x).split('').reverse().join('').replace(/(\d{3}\B)/g, '$1,').split('').reverse().join('');
 }
 
        return String(x).split('').reverse().join('').replace(/(\d{3}\B)/g, '$1,').split('').reverse().join('');
 }
 

-var print_pv = function(pretty_pv, move_num, toplay, limit) {
+var print_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, limit) {
+       display_lines.push({
+               start_fen: fen,
+               uci_pv: uci_pv,
+               pretty_pv: pretty_pv 
+       });
+

        var pv = '';
        var i = 0;
        if (toplay == 'B') {
        var pv = '';
        var i = 0;
        if (toplay == 'B') {

-               pv = move_num + '. … ' + pretty_pv[0];
+               var move = "<a class=\"move\" href=\"javascript:show_line(" + (display_lines.length - 1) + ", " + 0 + ");\">" + pretty_pv[0] + "</a>";
+               pv = move_num + '. … ' + move;

                toplay = 'W';
                ++i;    
        }
        ++move_num;
        for ( ; i < pretty_pv.length; ++i) {
                toplay = 'W';
                ++i;    
        }
        ++move_num;
        for ( ; i < pretty_pv.length; ++i) {

+               var move = "<a class=\"move\" href=\"javascript:show_line(" + (display_lines.length - 1) + ", " + i + ");\">" + pretty_pv[i] + "</a>";
+

                if (toplay == 'W') {
                        if (i > limit) {
                                return pv + ' (…)';
                if (toplay == 'W') {
                        if (i > limit) {
                                return pv + ' (…)';


@@ -246,26 +297,85 @@ var print_pv = function(pretty_pv, move_num, toplay, limit) {
                        if (pv != '') {
                                pv += ' ';
                        }
                        if (pv != '') {
                                pv += ' ';
                        }

-                       pv += move_num + '. ' + pretty_pv[i];
+                       pv += move_num + '. ' + move;

                        ++move_num;
                        toplay = 'B';
                } else {
                        ++move_num;
                        toplay = 'B';
                } else {

-                       pv += ' ' + pretty_pv[i];
+                       pv += ' ' + move;

                        toplay = 'W';
                }
        }
        return pv;
 }
 
                        toplay = 'W';
                }
        }
        return pv;
 }
 

-var compare_by_sort_key = function(data, a, b) {
-       var ska = data.refutation_lines[a].sort_key;
-       var skb = data.refutation_lines[b].sort_key;
-       if (ska < skb) return -1;
-       if (ska > skb) return 1;
-       return 0;
-};
+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');
+               $("#board").find('.square-' + highlight_to).addClass('nonuglyhighlight');
+       }
+}
+
+var update_refutation_lines = function(board) {
+       if (display_lines.length > 1) {
+               display_lines = [ display_lines[0] ];
+       }
+
+       var tbl = $("#refutationlines");
+       tbl.empty();
+
+       moves = [];
+       for (var move in refutation_lines) {
+               moves.push(move);
+       }
+       var compare = sort_refutation_lines_by_score ? compare_by_score : compare_by_sort_key;
+       moves = moves.sort(function(a, b) { return compare(refutation_lines, toplay, a, b) });
+       for (var i = 0; i < moves.length; ++i) {
+               var line = refutation_lines[moves[i]];
+
+               var tr = document.createElement("tr");
+
+               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);
+               } else {
+                       var move = "<a class=\"move\" href=\"javascript:show_line(" + display_lines.length + ", " + 0 + ");\">" + line.pretty_move + "</a>";
+                       $(move_td).html(move);
+               }
+
+               var score_td = document.createElement("td");
+               tr.appendChild(score_td);
+               $(score_td).addClass("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);
+
+               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));
+
+               tbl.append(tr);
+       }
+
+       // Make one of the links clickable and the other nonclickable.
+       if (sort_refutation_lines_by_score) {
+               $("#sortbyscore0").html("<a href=\"javascript:resort_refutation_lines(0)\">Move</a>");
+               $("#sortbyscore1").html("<strong>Score</strong>");
+       } else {
+               $("#sortbyscore0").html("<strong>Move</strong>");
+               $("#sortbyscore1").html("<a href=\"javascript:resort_refutation_lines(1)\">Score</a>");
+       }
+}
+
+var update_board = function(board, data, num_viewers) {
+       display_lines = [];

 
 

-var update_board = function(board, data) {

        // The headline.
        var headline = 'Analysis';
        if (data.position.last_move !== 'none') {
        // The headline.
        var headline = 'Analysis';
        if (data.position.last_move !== 'none') {


@@ -278,6 +388,14 @@ var update_board = function(board, data) {
 
        $("#headline").text(headline);
 
 
        $("#headline").text(headline);
 

+       if (num_viewers === null) {
+               $("#numviewers").text("");
+       } else if (num_viewers == 1) {
+               $("#numviewers").text("You are the only current viewer");
+       } else {
+               $("#numviewers").text(num_viewers + " current viewers");
+       }
+

        // The score.
        if (data.score !== null) {
                $("#score").text(data.score);
        // The score.
        if (data.score !== null) {
                $("#score").text(data.score);


@@ -302,19 +420,19 @@ var update_board = function(board, data) {
        }
 
        // Update the board itself.
        }
 
        // Update the board itself.

-       board.position(data.position.fen);
+       fen = data.position.fen;
+       update_displayed_line();

 
 

-       $("#board").find('.square-55d63').removeClass('nonuglyhighlight');

        if (data.position.last_move_uci) {
        if (data.position.last_move_uci) {

-               var from = data.position.last_move_uci.substr(0, 2);
-               var to = data.position.last_move_uci.substr(2, 4);
-               $("#board").find('.square-' + from).addClass('nonuglyhighlight');
-               $("#board").find('.square-' + to).addClass('nonuglyhighlight');
+               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.
 
        // Print the PV.

-       var pv = print_pv(data.pv_pretty, data.position.move_num, data.position.toplay);
-       $("#pv").text(pv);
+       $("#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();
 
        // Update the PV arrow.
        clear_arrows();


@@ -368,54 +486,85 @@ var update_board = function(board, data) {
                }
        }
 
                }
        }
 

-       // Show the refutation lines.
-       var tbl = $("#refutationlines");
-       tbl.empty();
+       // 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);

 
 

-       moves = [];
-       for (var move in data.refutation_lines) {
-               moves.push(move);
-       }
-       moves = moves.sort(function(a, b) { return compare_by_sort_key(data, a, b) });
-       for (var i = 0; i < moves.length; ++i) {
-               var line = data.refutation_lines[moves[i]];
+       // Next update.
+       setTimeout(function() { request_update(board); }, 100);
+}

 
 

-               var tr = document.createElement("tr");
+var resort_refutation_lines = function(sort_by_score) {
+       sort_refutation_lines_by_score = sort_by_score;
+       update_refutation_lines(board);
+}

 
 

-               var move_td = document.createElement("td");
-               tr.appendChild(move_td);
-               $(move_td).addClass("move");
-               $(move_td).text(line.pretty_move);
+var show_line = function(line_num, move_num) {
+       if (line_num == -1) {
+               current_display_line = null;
+               current_display_move = null;
+       } else {
+               current_display_line = display_lines[line_num];
+               current_display_move = move_num;
+       }
+       update_displayed_line();
+       update_highlight();
+       redraw_arrows();
+}

 
 

-               var score_td = document.createElement("td");
-               tr.appendChild(score_td);
-               $(score_td).addClass("score");
-               $(score_td).text(line.pretty_score);
+var prev_move = function() {
+       --current_display_move;
+       update_displayed_line();
+}

 
 

-               var depth_td = document.createElement("td");
-               tr.appendChild(depth_td);
-               $(depth_td).addClass("depth");
-               $(depth_td).text("d" + line.depth);
+var next_move = function() {
+       ++current_display_move;
+       update_displayed_line();
+}

 
 

-               var pv_td = document.createElement("td");
-               tr.appendChild(pv_td);
-               $(pv_td).addClass("pv");
-               $(pv_td).text(print_pv(line.pv_pretty, data.position.move_num, data.position.toplay, 10));
+var update_displayed_line = function() {
+       if (current_display_line === null) {
+               $("#linenav").hide();
+               $("#linemsg").show();
+               board.position(fen);
+               return;
+       }

 
 

-               tbl.append(tr);
+       $("#linenav").show();
+       $("#linemsg").hide();
+
+       if (current_display_move == 0) {
+               $("#prevmove").html("Previous");
+       } else {
+               $("#prevmove").html("<a href=\"javascript:prev_move();\">Previous</a></span>");
+       }
+       if (current_display_move == current_display_line.uci_pv.length - 1) {
+               $("#nextmove").html("Next");
+       } else {
+               $("#nextmove").html("<a href=\"javascript:next_move();\">Next</a></span>");

        }
 
        }
 

-       // Next update.
-       setTimeout(function() { request_update(board, 0); }, 100);
+       hiddenboard.position(current_display_line.start_fen, false);
+       for (var i = 0; i <= current_display_move; ++i) {
+               var move = current_display_line.uci_pv[i];
+               move = move.substr(0, 2) + "-" + move.substr(2, 4);
+               hiddenboard.move(move, false);
+       }
+       board.position(hiddenboard.position());

 }
 
 var init = function() {
        // Create board.
        board = new ChessBoard('board', 'start');
 }
 
 var init = function() {
        // Create board.
        board = new ChessBoard('board', 'start');

+       hiddenboard = new ChessBoard('hiddenboard', 'start');

 
 

-       request_update(board, 1);
+       request_update(board);

        $(window).resize(function() {
                board.resize();
        $(window).resize(function() {
                board.resize();

+               update_highlight();

                redraw_arrows();
        });
 };
                redraw_arrows();
        });
 };