fix game from position analysis charts and evals

utyman · Jun 8, 2015 · 8aeccab · 8aeccab
1 parent dbd8c9b
commit 8aeccab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/modules/ai/src/main/Queue.scala b/modules/ai/src/main/Queue.scala
@@ -61,6 +61,7 @@ private[ai] final class Queue(config: Config) extends Actor {
     case FullAnalReq(moves, fen, requestedByHuman, variant) if (requestedByHuman || tasks.size < maxTasks) =>
       val mrSender = sender
       val size = moves.size
+      val startedAtPly = fen.flatMap(chess.format.Forsyth.getPly)
       implicit val timeout = makeTimeout {
         if (requestedByHuman) 1.hour else 24.hours
       }
@@ -70,7 +71,7 @@ private[ai] final class Queue(config: Config) extends Actor {
       Future.fold(futures)(Vector[Option[Evaluation]]())(_ :+ _) addFailureEffect {
         case e => mrSender ! Status.Failure(e)
       } foreach { results =>
-        mrSender ! Evaluation.toInfos(results.toList.map(_ | Evaluation.empty), moves)
+        mrSender ! Evaluation.toInfos(results.toList.map(_ | Evaluation.empty), moves, ~startedAtPly)
       }
 
     case r: FullAnalReq =>

diff --git a/modules/analyse/src/main/Evaluation.scala b/modules/analyse/src/main/Evaluation.scala
@@ -19,7 +19,7 @@ object Evaluation {
   val start = Evaluation(Score(30).some, none, Nil)
   val empty = Evaluation(none, none, Nil)
 
-  def toInfos(evals: List[Evaluation], moves: List[String]): List[Info] =
+  def toInfos(evals: List[Evaluation], moves: List[String], startedAtPly: Int): List[Info] =
     (evals filterNot (_.checkMate) sliding 2).toList.zip(moves).zipWithIndex map {
       case ((List(before, after), move), index) => {
         val variation = before.line match {
@@ -28,7 +28,7 @@ object Evaluation {
         }
         val best = variation.headOption flatMap UciMove.apply
         Info(
-          ply = index + 1,
+          ply = index + 1 + startedAtPly,
           score = after.score,
           mate = after.mate,
           variation = variation,

diff --git a/modules/chess b/modules/chess
diff --git a/public/javascripts/big.js b/public/javascripts/big.js
@@ -2072,7 +2072,7 @@ lichess.storage = {
         if (chart) {
           if (path.length > 1) unselect(chart);
           else {
-            point = chart.series[0].data[path[0].ply - 1];
+            point = chart.series[0].data[path[0].ply - 1 - cfg.data.game.startedAtTurn];
             if (typeof point != "undefined") point.select();
             else unselect(chart);
           }
@@ -2085,7 +2085,7 @@ lichess.storage = {
           else {
             var white = path[0].ply % 2 !== 0;
             var serie = white ? 0 : 1;
-            var turn = Math.floor((path[0].ply - 1) / 2);
+            var turn = Math.floor((path[0].ply - 1 - cfg.data.game.startedAtTurn) / 2);
             point = chart.series[serie].data[turn];
             if (typeof point != "undefined") point.select();
             else unselect(chart);