X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fjs%2Fbook.js;h=95f423abf944dd34aa1226a2046c87f3740d22e0;hb=f959fb01dd352412a484a0e473e048fa8e01624d;hp=bc6adfceccca4174daf9ee78d0f274028abc050e;hpb=12fb90fa6c78a3753fb34f2fcb86b1856be718a5;p=remoteglot-book diff --git a/www/js/book.js b/www/js/book.js index bc6adfc..95f423a 100644 --- a/www/js/book.js +++ b/www/js/book.js @@ -8,7 +8,8 @@ var includetransp = true; var stockfish = new Worker('/js/stockfish.js'); var engine_running = false; var engine_replacement_callback = null; -var recommended_dest = null; +var recommended_move = null; +var reverse_dragging_from = null; var entity_map = { "&": "&", @@ -135,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(); @@ -170,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); } @@ -249,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) { @@ -274,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) { @@ -343,25 +375,74 @@ var onDragStart = function(source, piece, position, orientation) { return false; } - recommended_dest = null; - get_best_dest(pseudogame, source, function(dest) { + recommended_move = null; + get_best_dest(pseudogame, source, null, function(src, dest) { $("#board").find('.square-55d63').removeClass('nonuglyhighlight'); if (dest !== null) { var squareEl = $('#board .square-' + dest); squareEl.addClass('highlight1-32417'); + recommended_move = [src, dest]; } - recommended_dest = dest; }); } -var get_best_dest = function(game, source, cb) { - var moves = game.moves({ square: source, verbose: true }); +var mousedownSquare = function(e) { + reverse_dragging_from = null; + var square = $(this).attr('data-square'); + + var pseudogame = new Chess(current_display_fen()); + if (pseudogame.game_over() === true) { + return; + } + + // If the square is empty, or has a piece of the side not to move, + // we handle it. If not, normal piece dragging will take it. + var position = board.position(); + if (!position.hasOwnProperty(square) || + (pseudogame.turn() === 'w' && position[square].search(/^b/) !== -1) || + (pseudogame.turn() === 'b' && position[square].search(/^w/) !== -1)) { + reverse_dragging_from = square; + get_best_dest(pseudogame, null, square, function(src, dest) { + if (src !== null) { + var squareEl = $('#board .square-' + src); + squareEl.addClass('highlight1-32417'); + squareEl = $('#board .square-' + dest); + squareEl.addClass('highlight1-32417'); + recommended_move = [src, dest]; + } + }); + } else { + recommended_src = null; + } +} + +var mouseupSquare = function(e) { + if (reverse_dragging_from === null) { + return; + } + var source = $(this).attr('data-square'); + var target = reverse_dragging_from; + reverse_dragging_from = null; + if (onDrop(source, target) !== 'snapback') { + onSnapEnd(source, target); + } + $("#board").find('.square-55d63').removeClass('highlight1-32417'); +} + +var get_best_dest = function(game, source, target, cb) { + var moves = game.moves({ verbose: true }); + if (source !== null) { + moves = moves.filter(function(move) { return move.from == source; }); + } + if (target !== null) { + moves = moves.filter(function(move) { return move.to == target; }); + } if (moves.length == 0) { - cb(null); + cb(null, null); return; } if (moves.length == 1) { - cb(moves[0].to); + cb(moves[0].from, moves[0].to); return; } @@ -370,7 +451,7 @@ var get_best_dest = function(game, source, cb) { var when_engine_is_ready = function() { engine_running = true; stockfish.onmessage = function(event) { - var res = event.data.match(/^bestmove \S\S(\S\S)/); + var res = event.data.match(/^bestmove (\S\S)(\S\S)/); if (res !== null) { engine_running = false; if (engine_replacement_callback !== null) { @@ -379,7 +460,7 @@ var get_best_dest = function(game, source, cb) { engine_replacement_callback(); engine_replacement_callback = null; } else { - cb(res[1]); + cb(res[1], res[2]); } } }; @@ -400,7 +481,7 @@ var onDrop = function(source, target) { engine_replacement_callback = function() {}; } if (source == target) { - if (recommended_dest === null) { + if (recommended_move === null) { return 'snapback'; } else { // Accept the move. It will be changed in onSnapEnd. @@ -408,7 +489,7 @@ var onDrop = function(source, target) { } } else { // Suggestion not asked for. - recommended_dest = null; + recommended_move = null; } // see if the move is legal @@ -424,10 +505,11 @@ var onDrop = function(source, target) { } var onSnapEnd = function(source, target) { - if (source == target && recommended_dest !== null) { - target = recommended_dest; + if (source == target && recommended_move !== null) { + source = recommended_move[0]; + target = recommended_move[1]; } - recommended_dest = null; + recommended_move = null; var pseudogame = new Chess(current_display_fen()); var move = pseudogame.move({ from: source, @@ -470,6 +552,8 @@ var init = function() { onDrop: onDrop, onSnapEnd: onSnapEnd }); + $("#board").on('mousedown', '.square-55d63', mousedownSquare); + $("#board").on('mouseup', '.square-55d63', mouseupSquare); window.onpopstate = onpopstate; onpopstate(); @@ -481,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);