deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

study server eval must go over some nodes twice - closes #5884

pull/5894/head
Thibault Duplessis 2020-01-08 14:47:13 -06:00
parent 3811b2d7ae
commit 847024f6d8
3 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/analyse/src/main/Info.scala
View File

@ -48,7 +48,7 @@ case class Info(
}
override def toString =
s"Info $color [$ply] ${cp.fold("?")(_.showPawns)} ${mate.??(_.value)} ${variation.mkString(" ")}"
s"Info $color [$ply] ${cp.fold("?")(_.showPawns)} ${mate.??(_.value)} $best"
}
object Info {

4
modules/study/src/main/Node.scala
View File

@ -100,7 +100,7 @@ case class Node(
def moveOption = move.some
override def toString = s"$ply.${move.san} [${children}]"
override def toString = s"$ply.${move.san}"
}
object Node {
@ -312,7 +312,7 @@ object Node {
def moveOption = none
override def toString = s"ROOT [$children]"
override def toString = "ROOT"
}
object Root {

45
modules/study/src/main/ServerEval.scala
View File

@ -53,27 +53,32 @@ object ServerEval {
lila.common.Future
.fold(chapter.root.mainline zip analysis.infoAdvices)(Path.root) {
case (path, (node, (info, advOpt))) =>
info.eval.score.ifTrue(node.score.isEmpty).?? { score =>
chapterRepo.setScore(score.some)(chapter, path + node) >>
advOpt.?? { adv =>
chapterRepo.setComments(
node.comments + Comment(
Comment.Id.make,
Comment.Text(adv.makeComment(false, true)),
Comment.Author.Lichess
)
)(chapter, path + node) >>
chapterRepo.setGlyphs(
node.glyphs merge Glyphs.fromList(List(adv.judgment.glyph))
)(chapter, path + node) >> {
chapter.root.nodeAt(path).flatMap { parent =>
analysisLine(parent, chapter.setup.variant, info) flatMap { child =>
parent.addChild(child).children.get(child.id)
}
} ?? { chapterRepo.setChild(chapter, path, _) }
}
info.eval.score
.ifTrue {
node.score.isEmpty ||
advOpt.isDefined && node.comments.findBy(Comment.Author.Lichess).isEmpty
}
} inject path + node
.?? { score =>
chapterRepo.setScore(score.some)(chapter, path + node) >>
advOpt.?? { adv =>
chapterRepo.setComments(
node.comments + Comment(
Comment.Id.make,
Comment.Text(adv.makeComment(false, true)),
Comment.Author.Lichess
)
)(chapter, path + node) >>
chapterRepo.setGlyphs(
node.glyphs merge Glyphs.fromList(List(adv.judgment.glyph))
)(chapter, path + node) >> {
chapter.root.nodeAt(path).flatMap { parent =>
analysisLine(parent, chapter.setup.variant, info) flatMap { child =>
parent.addChild(child).children.get(child.id)
}
} ?? { chapterRepo.setChild(chapter, path, _) }
}
}
} inject path + node
} void
} >>- {
chapterRepo.byId(Chapter.Id(analysis.id)).foreach {