deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

simplify PerfStat streaks, remove extra arg, rename functions 

after #9872
pull/9903/head
Thibault Duplessis 2021-09-29 09:46:56 +02:00
parent 1dc508f975
commit 607e47252d
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
modules/perfStat/src/main/PerfStat.scala
View File

@ -63,8 +63,8 @@ object PerfStat {
case class ResultStreak(win: Streaks, loss: Streaks) {
def agg(pov: Pov) =
copy(
win = win(~pov.win, pov)(1),
loss = loss(~pov.loss, pov)(1)
win = win.continueOrReset(~pov.win, pov)(1),
loss = loss.continueOrReset(~pov.loss, pov)(1)
)
}
@ -73,8 +73,8 @@ case class PlayStreak(nb: Streaks, time: Streaks, lastDate: Option[DateTime]) {
pov.game.durationSeconds.fold(this) { seconds =>
val cont = seconds < 3 * 60 * 60 && isContinued(pov.game.createdAt)
copy(
nb = nb(cont, pov, 1)(1),
time = time(cont, pov, seconds)(seconds),
nb = nb.continueOrStart(cont, pov)(1),
time = time.continueOrStart(cont, pov)(seconds),
lastDate = pov.game.movedAt.some
)
}
@ -91,14 +91,10 @@ object PlayStreak {
}
case class Streaks(cur: Streak, max: Streak) {
def apply(cont: Boolean, pov: Pov)(v: Int) =
copy(
cur = cur(cont, pov)(v)
).setMax
def apply(cont: Boolean, pov: Pov, r: Int)(v: Int) =
copy(
cur = cur(cont, pov, r)(v)
).setMax
def continueOrReset(cont: Boolean, pov: Pov)(v: Int) =
copy(cur = cur.continueOrReset(cont, pov)(v)).setMax
def continueOrStart(cont: Boolean, pov: Pov)(v: Int) =
copy(cur = cur.continueOrStart(cont, pov)(v)).setMax
def reset = copy(cur = Streak.init)
private def setMax = copy(max = if (cur.v >= max.v) cur else max)
}
@ -106,20 +102,18 @@ object Streaks {
val init = Streaks(Streak.init, Streak.init)
}
case class Streak(v: Int, from: Option[GameAt], to: Option[GameAt]) {
def apply(cont: Boolean, pov: Pov)(v: Int) = if (cont) inc(pov, v) else Streak.init
def apply(cont: Boolean, pov: Pov, r: Int)(v: Int) = if (cont) inc(pov, v) else res(pov, r)
private def inc(pov: Pov, by: Int) =
copy(
v = v + by,
from = from orElse GameAt(pov.game.createdAt, pov.gameId).some,
to = GameAt(pov.game.movedAt, pov.gameId).some
)
private def res(pov: Pov, by: Int) =
copy(
v = by,
from = GameAt(pov.game.createdAt, pov.gameId).some,
to = GameAt(pov.game.movedAt, pov.gameId).some
)
def continueOrReset(cont: Boolean, pov: Pov)(v: Int) =
if (cont) inc(pov, v) else Streak.init
def continueOrStart(cont: Boolean, pov: Pov)(v: Int) =
if (cont) inc(pov, v)
else {
val at = GameAt(pov.game.createdAt, pov.gameId).some
Streak(v, at, at)
}
private def inc(pov: Pov, by: Int) = {
val at = GameAt(pov.game.createdAt, pov.gameId).some
Streak(v + by, from orElse at, at)
}
def period = new Period(v * 1000L)
}
object Streak {