Fix an inconsistency between the UI and the actual behavior of transpositions when...

[remoteglot-book] / www / js / book.js

diff --git a/www/js/book.js b/www/js/book.js
index 5234eff7a426da8ee4250c629d358b5627e6143a..e4c3ce159dc238ff759e5711bfb989d07a7197ce 100644 (file)
--- a/www/js/book.js
+++ b/www/js/book.js
@@ -16,7 +16,7 @@ var practice_side = 'W';
 // TODO: Make this configurable.
 var practice_top_moves_limit = 5;
 var practice_minimum_move_fraction_start = 0.05;
-var practice_minimum_move_fraction_move10 = 0.30;
+var practice_minimum_move_fraction_move5 = 0.30;
 
 var entity_map = {
        "&": "&",
@@ -121,7 +121,7 @@ var find_last_move_score = function() {
                        ";includetransp=0"
        }).done(function(data, textstatus, xhr) {
                var moves = data['moves'];
-               var root_move = sort_moves_by_common(moves, data);
+               var root_move = sort_move_by_frequency(moves, data);
                var your_move, your_index;
 
                for (var i = 0; i < moves.length; ++i) {
@@ -131,7 +131,6 @@ var find_last_move_score = function() {
                                your_index = i;
                        }
                }
-               moves.sort(function(a, b) { return b['num'] - a['num'] });
 
                if (your_move) {
                        $("#yourfraction").text(format_fraction(your_move['fraction']));
@@ -167,14 +166,14 @@ var find_computer_move = function() {
                var candidate_moves = [];
 
                var moves = data['moves'];
-               var root_move = sort_moves_by_common(moves, data);
+               var root_move = sort_move_by_frequency(moves, data);
 
                var practice_minimum_move_fraction;
                if (move_override > 20) {
-                       practice_minimum_move_fraction = practice_minimum_move_fraction_move10;
+                       practice_minimum_move_fraction = practice_minimum_move_fraction_move5;
                } else {
                        practice_minimum_move_fraction = practice_minimum_move_fraction_start +
-                               ((move_override-1)/20.0) * (practice_minimum_move_fraction_move10 - practice_minimum_move_fraction_start);
+                               ((move_override-1)/10.0) * (practice_minimum_move_fraction_move5 - practice_minimum_move_fraction_start);
                }
                console.log(practice_minimum_move_fraction);
 
@@ -201,7 +200,7 @@ var find_computer_move = function() {
 
 // Add deried data and then sort moves to get the most common ones (in-place).
 // Remove the root mode and return it. Currently usable for practice mode only!
-var sort_moves_by_common = function(moves, data)
+var sort_move_by_frequency = function(moves, data)
 {
        var total_num = find_total_games(moves);
        var root_move;
@@ -473,6 +472,7 @@ var set_practice = function(value) {
                $("#stats").hide();
                $("#practiceoutput").show();
                document.getElementById("includetransp").checked = false;
+               set_includetransp(false);
        } else {
                $("#stats").show();
                $("#practiceoutput").hide();