ceval data refactoring

ceval.pvs[].pv   -> ceval.pvs[].moves - now an Array, not a String
ceval.pvs[].best -> ceval.pvs[].moves[0]

Also makes the assumption that ceval.pvs[].moves[0] exists.

Author: ornicar

ui/analyse/src/autoShape.js

@@ -59,36 +59,35 @@ module.exports = {
     }
     if (hovering && hovering.fen === n.fen) shapes = shapes.concat(makeAutoShapesFromUci(color, hovering.uci, 'paleBlue'));
     if (ctrl.vm.showAutoShapes() && ctrl.vm.showComputer()) {
-      if (n.eval && n.eval.best)
-        shapes = shapes.concat(makeAutoShapesFromUci(rcolor, n.eval.best, 'paleGreen'));
+      if (n.eval) shapes = shapes.concat(makeAutoShapesFromUci(rcolor, n.eval.moves[0], 'paleGreen'));
       if (!hovering) {
         var nextBest = ctrl.nextNodeBest();
-        if (!nextBest && instance.enabled() && n.ceval && n.ceval.best) nextBest = n.ceval.best;
+        if (!nextBest && instance.enabled() && n.ceval) nextBest = n.ceval.moves[0];
         if (nextBest) shapes = shapes.concat(makeAutoShapesFromUci(color, nextBest, 'paleBlue'));
         if (instance.enabled() && n.ceval && n.ceval.pvs && n.ceval.pvs[1] && !(ctrl.vm.threatMode && n.threat && n.threat.pvs && n.threat.pvs[2])) {
           n.ceval.pvs.forEach(function(pv) {
-            if (pv.best === nextBest) return;
+            if (pv.moves[0] === nextBest) return;
             var shift = winningChances.povDiff(color, n.ceval.pvs[0], pv);
             if (shift > 0.2 || isNaN(shift) || shift < 0) return;
-            shapes = shapes.concat(makeAutoShapesFromUci(color, pv.best, 'paleGrey', {
+            shapes = shapes.concat(makeAutoShapesFromUci(color, pv.moves[0], 'paleGrey', {
               lineWidth: Math.round(12 - shift * 50) // 12 to 2
             }));
           });
         }
       }
     }
-    if (instance.enabled() && ctrl.vm.threatMode && n.threat && n.threat.best) {
+    if (instance.enabled() && ctrl.vm.threatMode && n.threat && n.threat.moves[0]) {
       if (n.threat.pvs[1]) {
-        shapes = shapes.concat(makeAutoShapesFromUci(rcolor, n.threat.best, 'paleRed'));
+        shapes = shapes.concat(makeAutoShapesFromUci(rcolor, n.threat.moves[0], 'paleRed'));
         n.threat.pvs.slice(1).forEach(function(pv) {
           var shift = winningChances.povDiff(rcolor, pv, n.threat.pvs[0]);
           if (shift > 0.2 || isNaN(shift) || shift < 0) return;
-          shapes = shapes.concat(makeAutoShapesFromUci(rcolor, pv.best, 'paleRed', {
+          shapes = shapes.concat(makeAutoShapesFromUci(rcolor, pv.moves[0], 'paleRed', {
             lineWidth: Math.round(11 - shift * 45) // 11 to 2
           }));
         });
       } else
-        shapes = shapes.concat(makeAutoShapesFromUci(rcolor, n.threat.best, 'red'));
+        shapes = shapes.concat(makeAutoShapesFromUci(rcolor, n.threat.moves[0], 'red'));
     }
     return shapes;
   }

ui/analyse/src/ctrl.js

@@ -432,7 +432,7 @@ module.exports = function(opts) {
 
   this.nextNodeBest = function() {
     return tree.ops.withMainlineChild(this.vm.node, function(n) {
-      return n.eval ? n.eval.best : null;
+      return n.eval ? n.eval.moves[0] : null;
     });
   }.bind(this);
 
@@ -643,7 +643,7 @@ module.exports = function(opts) {
   }.bind(this);
 
   this.playBestMove = function() {
-    var uci = this.nextNodeBest() || (this.vm.node.ceval && this.vm.node.ceval.best);
+    var uci = this.nextNodeBest() || this.vm.node.ceval;
     if (uci) this.playUci(uci);
   }.bind(this);
 

ui/analyse/src/evalCache.js

@@ -21,7 +21,7 @@ function toPutData(eval) {
       return {
         cp: pv.cp,
         mate: pv.mate,
-        moves: pv.pv.split(' ', evalPutMaxMoves).join(' ')
+        moves: pv.moves.slice(0, evalPutMaxMoves).join(' ')
       };
     })
   };
@@ -35,8 +35,7 @@ function toCeval(e) {
     depth: e.depth,
     pvs: e.pvs.map(function(from) {
       var to = {
-        pv: from.moves,
-        best: from.moves.split(' ', 1)[0]
+        pv: from.moves.split(' ')
       };
       if (defined(from.cp)) to.cp = from.cp;
       else to.mate = from.mate;
@@ -46,7 +45,6 @@ function toCeval(e) {
   };
   if (defined(res.pvs[0].cp)) res.cp = res.pvs[0].cp;
   else res.mate = res.pvs[0].mate;
-  res.best = res.pvs[0].best;
   res.cloud = true;
   return res;
 }

ui/analyse/src/practice/practiceCtrl.js

@@ -47,7 +47,7 @@ module.exports = function(root, playableDepth) {
       } : node.ceval;
       var shift = -winningChances.povDiff(root.bottomColor(), nodeEval, prev.ceval);
 
-      best = prev.ceval.best;
+      best = prev.ceval.moves[0];
       if (best === node.uci || best === altCastles[node.uci]) best = null;
 
       if (!best) verdict = 'good';
@@ -64,7 +64,7 @@ module.exports = function(root, playableDepth) {
       verdict: verdict,
       best: best ? {
         uci: best,
-        san: pv2san(root.data.game.variant.key, prev.fen, false, best)
+        san: pv2san(root.data.game.variant.key, prev.fen, false, [best])
       } : null
     };
   }
@@ -84,7 +84,7 @@ module.exports = function(root, playableDepth) {
     if (isMyTurn()) {
       var h = hinting();
       if (h) {
-        h.uci = node.ceval.best;
+        h.uci = node.ceval.moves[0];
         root.setAutoShapes();
       }
     } else {
@@ -95,7 +95,7 @@ module.exports = function(root, playableDepth) {
           comment(makeComment(parentNode, node, root.vm.path));
       }
       if (!played() && playable(node)) {
-        root.playUci(node.ceval.best);
+        root.playUci(node.ceval.moves[0]);
         played(true);
       }
     }
@@ -169,7 +169,7 @@ module.exports = function(root, playableDepth) {
       root.setAutoShapes();
     },
     hint: function() {
-      var best = root.vm.node.ceval ? root.vm.node.ceval.best : null;
+      var best = root.vm.node.ceval ? root.vm.node.ceval.moves[0] : null;
       var prev = hinting();
       if (!best || (prev && prev.mode === 'move')) hinting(null);
       else hinting({

ui/analyse/test/pv2san.js

@@ -3,11 +3,11 @@ var initialFen = require('chess').initialFen;
 
 exports.testCrazyhouse = function(test) {
   var fen = 'r4b1N~/1ppk1P2/p1b5/6p1/8/1PBPPq2/P1PR1P2/1K4N1/PNBRPPPrqnn b - - 71 36';
-  test.equal(pv2san('crazyhouse', fen, false, 'N@a3 b1b2 R@b1', -2), '36... N@a3+ 37. Kb2 R@b1#');
+  test.equal(pv2san('crazyhouse', fen, false, 'N@a3 b1b2 R@b1'.split(' '), -2), '36... N@a3+ 37. Kb2 R@b1#');
   test.done();
 };
 
 exports.testKingmove = function(test) {
-  test.equal(pv2san('standard', initialFen, false, 'e2e4 e7e5 e1e2'), '1. e4 e5 2. Ke2');
+  test.equal(pv2san('standard', initialFen, false, 'e2e4 e7e5 e1e2'.split(' ')), '1. e4 e5 2. Ke2');
   test.done();
 };

ui/ceval/src/pv2san.js

@@ -214,11 +214,10 @@ function san(board, uci) {
   return san;
 }
 
-module.exports = function(variant, fen, threat, pv, mate) {
+module.exports = function(variant, fen, threat, moves, mate) {
   var board = readFen(fen);
   if (threat) board.turn = !board.turn;
   var turn = board.turn;
-  var moves = pv.split(' ').slice(0, 10);
 
   var first = true;
   var line = moves.map(function(uci) {

ui/ceval/src/stockfishProtocol.js

@@ -42,7 +42,7 @@ module.exports = function(worker, opts) {
         evalType = matches[5],
         nodes = parseInt(matches[6]),
         elapsedMs = parseInt(matches[7]),
-        pv = matches[8];
+        moves = matches[8].split(' ', 10);
 
     // time is negative on safari
     if (!elapsedMs || elapsedMs < 0) elapsedMs = (new Date() - work.startedAt)
@@ -59,8 +59,7 @@ module.exports = function(worker, opts) {
     if (evalType && multiPv === 1) return;
 
     var pvData = {
-      best: pv.split(' ', 2)[0],
-      pv: pv,
+      moves: moves,
       cp: isMate ? undefined : eval,
       mate: isMate ? eval : undefined,
       depth: depth,
@@ -73,7 +72,6 @@ module.exports = function(worker, opts) {
         depth: depth,
         knps: nodes / elapsedMs,
         nodes: nodes,
-        best: pvData.best,
         cp: pvData.cp,
         mate: pvData.mate,
         pvs: [pvData],

ui/ceval/src/view.js

@@ -230,10 +230,10 @@ module.exports = {
     }, range(multiPv).map(function(i) {
       if (!pvs[i]) return m('div.pv');
       else return m('div.pv', threat ? {} : {
-        'data-uci': pvs[i].best
+        'data-uci': pvs[i].moves[0]
       }, [
         multiPv > 1 ? m('strong', defined(pvs[i].mate) ? ('#' + pvs[i].mate) : renderEval(pvs[i].cp)) : null,
-        m('span', pv2san(instance.variant.key, ctrl.vm.node.fen, threat, pvs[i].pv, pvs[i].mate))
+        m('span', pv2san(instance.variant.key, ctrl.vm.node.fen, threat, pvs[i].moves, pvs[i].mate))
       ]);
     }));
   }

ui/puzzle/src/autoShape.js

@@ -19,36 +19,35 @@ module.exports = function(opts) {
   var rcolor = color === 'white' ? 'black' : 'white';
   if (hovering && hovering.fen === n.fen) shapes = shapes.concat(makeAutoShapesFromUci(color, hovering.uci, 'paleBlue'));
   if (opts.vm.showAutoShapes() && opts.vm.showComputer()) {
-    if (n.eval && n.eval.best)
-      shapes = shapes.concat(makeAutoShapesFromUci(rcolor, n.eval.best, 'paleGreen'));
+    if (n.eval) shapes = shapes.concat(makeAutoShapesFromUci(rcolor, n.eval.best, 'paleGreen'));
     if (!hovering) {
       var nextBest = opts.nextNodeBest();
-      if (!nextBest && opts.ceval.enabled() && n.ceval && n.ceval.best) nextBest = n.ceval.best;
+      if (!nextBest && opts.ceval.enabled() && n.ceval) nextBest = n.ceval.moves[0];
       if (nextBest) shapes = shapes.concat(makeAutoShapesFromUci(color, nextBest, 'paleBlue'));
       if (opts.ceval.enabled() && n.ceval && n.ceval.pvs && n.ceval.pvs[1] && !(opts.vm.threatMode && n.threat && n.threat.pvs && n.threat.pvs[2])) {
         n.ceval.pvs.forEach(function(pv) {
-          if (pv.best === nextBest) return;
+          if (pv.moves[0] === nextBest) return;
           var shift = winningChances.povDiff(color, n.ceval.pvs[0], pv);
           if (shift > 0.2 || isNaN(shift) || shift < 0) return;
-          shapes = shapes.concat(makeAutoShapesFromUci(color, pv.best, 'paleGrey', {
+          shapes = shapes.concat(makeAutoShapesFromUci(color, pv.moves[0], 'paleGrey', {
             lineWidth: Math.round(12 - shift * 50) // 12 to 2
           }));
         });
       }
     }
   }
-  if (opts.ceval.enabled() && opts.vm.threatMode && n.threat && n.threat.best) {
+  if (opts.ceval.enabled() && opts.vm.threatMode && n.threat && n.threat.moves[0]) {
     if (n.threat.pvs[1]) {
-      shapes = shapes.concat(makeAutoShapesFromUci(rcolor, n.threat.best, 'paleRed'));
+      shapes = shapes.concat(makeAutoShapesFromUci(rcolor, n.threat.moves[0], 'paleRed'));
       n.threat.pvs.slice(1).forEach(function(pv) {
         var shift = winningChances.povDiff(rcolor, pv, n.threat.pvs[0]);
         if (shift > 0.2 || isNaN(shift) || shift < 0) return;
-        shapes = shapes.concat(makeAutoShapesFromUci(rcolor, pv.best, 'paleRed', {
+        shapes = shapes.concat(makeAutoShapesFromUci(rcolor, pv.moves[0], 'paleRed', {
           lineWidth: Math.round(11 - shift * 45) // 11 to 2
         }));
       });
     } else
-      shapes = shapes.concat(makeAutoShapesFromUci(rcolor, n.threat.best, 'red'));
+      shapes = shapes.concat(makeAutoShapesFromUci(rcolor, n.threat.moves[0], 'red'));
   }
   return shapes;
 };

ui/puzzle/src/ctrl.js

@@ -298,7 +298,7 @@ module.exports = function(opts, i18n) {
 
   var nextNodeBest = function() {
     return treeOps.withMainlineChild(vm.node, function(n) {
-      return n.eval ? n.eval.best : null;
+      return n.eval ? n.eval.moves[0] : null;
     });
   };
 
@@ -429,7 +429,7 @@ module.exports = function(opts, i18n) {
     toggleCeval: toggleCeval,
     toggleThreatMode: toggleThreatMode,
     playBestMove: function() {
-      var uci = nextNodeBest() || (vm.node.ceval && vm.node.ceval.best);
+      var uci = nextNodeBest() || vm.node.ceval;
       if (uci) playUci(uci);
     }
   });