Merge branch 'master' of github.com:ornicar/lila

* 'master' of github.com:ornicar/lila: wiki: Fix length limit check Don't abort unlimited AI games after 6 hours AI play book: only decent moves
terredeciels · Nov 24, 2021 · f32c366 · f32c366
2 parents d22d1fd + cc79e29
commit f32c366
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/modules/fishnet/src/main/FishnetOpeningBook.scala b/modules/fishnet/src/main/FishnetOpeningBook.scala
@@ -2,7 +2,7 @@ package lila.fishnet
 
 import chess.format.Forsyth
 import chess.format.Uci
-import chess.Speed
+import chess.{ Color, Speed }
 import com.softwaremill.tagging._
 import play.api.libs.json._
 import play.api.libs.ws.JsonBodyReadables._
@@ -45,7 +45,7 @@ final private class FishnetOpeningBook(
             for {
               data <- res.body[JsValue].validate[Response](responseReader).asOpt
               _ = if (data.moves.isEmpty) outOfBook.put(game.id)
-              move <- data.randomPonderedMove
+              move <- data randomPonderedMove game.turnColor
             } yield move.uci
         }
         .monTry { res =>
@@ -66,11 +66,13 @@ object FishnetOpeningBook {
   trait Depth
 
   case class Response(moves: List[Move]) {
-    def randomPonderedMove: Option[Move] = {
-      val sum     = moves.map(_.nb).sum
-      val novelty = 1
-      val rng     = ThreadLocalRandom.nextInt(sum + novelty)
-      moves
+
+    def randomPonderedMove(turn: Color): Option[Move] = {
+      val decentMoves = moves.filter(_.lossRatioFor(turn) < 0.66)
+      val sum         = decentMoves.map(_.nb).sum
+      val novelty     = 1
+      val rng         = ThreadLocalRandom.nextInt(sum + novelty)
+      decentMoves
         .foldLeft((none[Move], 0)) { case ((found, it), next) =>
           val nextIt = it + next.nb
           (found orElse (nextIt > rng).option(next), nextIt)
@@ -80,7 +82,8 @@ object FishnetOpeningBook {
   }
 
   case class Move(uci: Uci, white: Int, draws: Int, black: Int) {
-    def nb = white + draws + black
+    def nb                                = white + draws + black
+    def lossRatioFor(color: Color): Float = (nb > 0) ?? color.fold(black, white).toFloat / nb
   }
 
   implicit val moveReader     = Json.reads[Move]

diff --git a/modules/game/src/main/Game.scala b/modules/game/src/main/Game.scala
@@ -555,7 +555,7 @@ case class Game(
   def abandoned =
     (status <= Status.Started) && {
       movedAt isBefore {
-        if (hasAi && !hasCorrespondenceClock) Game.aiAbandonedDate
+        if (hasAi && hasClock) Game.aiAbandonedDate
         else Game.abandonedDate
       }
     }

diff --git a/ui/analyse/src/wiki.ts b/ui/analyse/src/wiki.ts
@@ -32,7 +32,7 @@ export default function wikiTheory(): WikiTheory {
     async (nodes: Tree.Node[]) => {
       const pathParts = nodes.slice(1).map(n => `${plyPrefix(n)}${n.san}`);
       const path = pathParts.join('/').replace(/[+!#?]/g, '') ?? '';
-      if (pathParts.length > 30 || !path || path.length > 255) show('');
+      if (pathParts.length > 30 || !path || path.length > 255 - 21) show('');
       else if (cache.has(path)) show(cache.get(path)!);
       else if (
         Array.from({ length: pathParts.length }, (_, i) => -i - 1)