]> git.sesse.net Git - remoteglot-book/blobdiff - www/js/book.js
Add the derived move data in-place; easier this way.
[remoteglot-book] / www / js / book.js
index dce293b2a8e70392d083b271b68fac7b5fa63059..95f423abf944dd34aa1226a2046c87f3740d22e0 100644 (file)
@@ -136,15 +136,7 @@ var show_lines = function(data, game) {
                $('#gamesummary').html(text);
        }
 
-       var total_num = 0;
-       for (var i = 0; i < moves.length; ++i) {
-               var move = moves[i];
-               if (move['move']) {
-                       total_num += parseInt(move['white']);
-                       total_num += parseInt(move['draw']);
-                       total_num += parseInt(move['black']);
-               }
-       }
+       var total_num = find_total_games(moves);
 
        var headings_tr = $("#headings");
        headings_tr.empty();
@@ -171,52 +163,40 @@ var show_lines = function(data, game) {
                var move = moves[i];
                var line = [];
 
-               var white = parseInt(move['white']);
-               var draw = parseInt(move['draw']);
-               var black = parseInt(move['black']);
-               var computer = parseInt(move['computer']);
+               calc_move_derived_data(move, total_num, data, (move_override % 2 == 0));
+
+               var white = move['white'];
+               var draw = move['draw'];
+               var black = move['black'];
+               var computer = move['computer'];
 
                line.push(move['move']);  // Move.
                transpose_only.push(move['transpose_only']);
-               var num = white + draw + black;
-               line.push(num);  // N.
-               line.push(num / total_num);  // %.
+               line.push(move['num']);  // N.
+               line.push(move['fraction']);  // %.
                line.push(computer);  // CGames.
+               line.push(move['human_index']);  // Hum.
+               line.push(move['win_ratio']);  // Win%.
 
-               // Adjust so that the human index is 50% overall.
-               var exp = Math.log(0.5) / Math.log(data['computer_games'] / data['total_games']);
-               line.push(1.0 - Math.pow(computer / num, exp));  // Hum.
-
-               // Win%.
-               var white_win_ratio = (white + 0.5 * draw) / num;
-               var win_ratio = (move_override % 2 == 0) ? white_win_ratio : 1.0 - white_win_ratio;
-               line.push(win_ratio);
-
-               line.push(white);        // WWin.
-               line.push(white / num);  // %WW.
-               line.push(black);        // BWin.
-               line.push(black / num);  // %BW.
-               line.push(draw);         // Draw.
-               line.push(draw / num);   // %Draw.
+               line.push(white);                // WWin.
+               line.push(white / move['num']);  // %WW.
+               line.push(black);                // BWin.
+               line.push(black / move['num']);  // %BW.
+               line.push(draw);                 // Draw.
+               line.push(draw / move['num']);   // %Draw.
 
                if (move['num_elo'] >= 10) {
                        // Elo.
                        line.push(move['white_avg_elo']);
                        line.push(move['black_avg_elo']);
                        line.push(move['white_avg_elo'] - move['black_avg_elo']);
-
-                       // Win% corrected for Elo.
-                       var win_elo = -400.0 * Math.log(1.0 / white_win_ratio - 1.0) / Math.LN10;
-                       win_elo -= (move['white_avg_elo'] - move['black_avg_elo']);
-                       white_win_ratio = 1.0 / (1.0 + Math.pow(10, win_elo / -400.0));
-                       win_ratio = (move_override % 2 == 0) ? white_win_ratio : 1.0 - white_win_ratio;
-                       line.push(win_ratio);
                } else {
                        line.push(null);
                        line.push(null);
                        line.push(null);
-                       line.push(null);
                }
+
+               line.push(move['corrected_win_ratio'] || null);
                lines.push(line);
        }
 
@@ -250,10 +230,14 @@ var show_lines = function(data, game) {
                                        }
                                }
 
-                               var move_a = document.createElement("a");
-                               move_a.href = "javascript:make_move('" + line[j] + "')";
-                               td.appendChild(move_a);
-                               $(move_a).text(line[j]);
+                               if (line[j] === '1-0' || line[j] === '1/2-1/2' || line[j] === '0-1') {
+                                       $(td).text($(td).text() + line[j]);
+                               } else {
+                                       var move_a = document.createElement("a");
+                                       move_a.href = "javascript:make_move('" + line[j] + "')";
+                                       td.appendChild(move_a);
+                                       $(move_a).text(line[j]);
+                               }
                        } else if (headings[j][1] == TYPE_INTEGER) {
                                add_td(tr, line[j] || 0);
                        } else if (headings[j][1] == TYPE_FLOAT) {
@@ -275,12 +259,59 @@ var show_lines = function(data, game) {
        }
 }
 
+var find_total_games = function(moves) {
+       var total_num = 0;
+       for (var i = 0; i < moves.length; ++i) {
+               var move = moves[i];
+               if (move['move']) {
+                       total_num += move['white'];
+                       total_num += move['draw'];
+                       total_num += move['black'];
+               }
+       }
+       return total_num;
+}
+
+var calc_move_derived_data = function(move, total_num, data, is_white) {
+       var white = move['white'];
+       var draw = move['draw'];
+       var black = move['black'];
+       var computer = move['computer'];
+
+       var num = white + draw + black;
+       move['num'] = num;
+       move['fraction'] = num / total_num;
+
+       // Adjust so that the human index is 50% overall.
+       var exp = Math.log(0.5) / Math.log(data['computer_games'] / data['total_games']);
+       move['human_index'] = 1.0 - Math.pow(computer / num, exp);
+
+       // Win%.
+       var white_win_ratio = (white + 0.5 * draw) / num;
+       var win_ratio = is_white ? white_win_ratio : 1.0 - white_win_ratio;
+       move['win_ratio'] = win_ratio;
+
+       if (move['num_elo'] >= 10) {
+               // Win% corrected for Elo.
+               var win_elo = -400.0 * Math.log(1.0 / white_win_ratio - 1.0) / Math.LN10;
+               win_elo -= (move['white_avg_elo'] - move['black_avg_elo']);
+               white_win_ratio = 1.0 / (1.0 + Math.pow(10, win_elo / -400.0));
+               win_ratio = is_white ? white_win_ratio : 1.0 - white_win_ratio;
+               move['corrected_win_ratio'] = win_ratio;
+       }
+};
+
 var set_includetransp = function(value) {
        includetransp = value;
        update();
 }
 window['set_includetransp'] = set_includetransp;
 
+var set_flipboard = function(value) {
+       board.orientation(value ? 'black' : 'white');
+}
+window['set_flipboard'] = set_flipboard;
+
 var make_move = function(move, do_update) {
        var history = game.history({ verbose: true });
        if (move_override < history.length && history[move_override].san == move) {
@@ -534,8 +565,10 @@ var init = function() {
                        prev_move();
                }
        });
-}
 
+       // Seemingly the web worker is not started before we send it a message.
+       stockfish.postMessage("uci");
+}
 
 $(document).ready(init);