deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

UI and determinations

Browse source
This commit is contained in:
clarkerubber 2015-02-03 23:59:24 +11:00
parent 0bef136f6f
commit d8139c21a4
3 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/views/user/mod.scala.html
View file

@ -89,7 +89,10 @@
<span class="@(if(aggregateAssessment.markSec) "mark" else "noMark")">Cheating</span>
</th>
<th>
<span class="@(if(aggregateAssessment.report) "report" else "noReport")">Report</span>
<span class="@(if(aggregateAssessment.reportPri) "report" else "noReport")">Report</span>
</th>
<th>
<span class="@(if(aggregateAssessment.reportSec) "report" else "noReport")">Report</span>
</th>
</tr>
</thead>
@ -100,12 +103,16 @@
</td>
<td>
<span class="sig_5">@aggregateAssessment.cheatingSum</span> +
<span class="sig_4">@aggregateAssessment.likelyCheatingSum</span> / 5
<span class="sig_4">@aggregateAssessment.likelyCheatingSum</span> / 4
</td>
<td>
<span class="sig_5">@aggregateAssessment.cheatingSum</span> +
<span class="sig_4">@aggregateAssessment.likelyCheatingSum</span> / 2
</td>
<td>
<span class="sig_5">@aggregateAssessment.cheatingSum</span> +
<span class="sig_4">@aggregateAssessment.likelyCheatingSum</span> +
<span class="sig_3">@aggregateAssessment.unclearSum</span> / 5
<span class="sig_3">@aggregateAssessment.unclearSum</span> / 4
</td>
</tr>
</tbody>
@ -129,7 +136,7 @@
</th>
<th>Blurs</th>
<th>Bot</th>
<th><span class="aggregate hint--top-left" data-hint="Aggregate match">&Sigma;</span></th>
<th><span class="hint--top-left" data-hint="Aggregate match">&Sigma;</span></th>
<th><span class="hint--top-left" data-hint="Primary match">1</span></th>
<th><span class="hint--top-left" data-hint="Secondary match">2</span></th>
<th><span class="hint--top-left" data-hint="Tertiary match">3</span></th>
@ -146,9 +153,8 @@
<td>@(result.blur)%</td>
<td>@if(result.hold){Yes} else {No}</td>
<td>
<span class="hint--top-left" data-hint="@result.aggregate.explanation">
<span class="aggregate hint--top-left" data-hint="@result.aggregate.explanation">
<span class="sig_@(result.aggregate.assessment)" data-icon="@Display.dataIcon(result.aggregate)"></span>
<br />@(result.aggregate.confidence)%
</span>
</td>
<td>

15
modules/evaluation/src/main/Group.scala
View file

@ -53,8 +53,9 @@ case class PlayerAggregateAssessment(
val unclearSum: Int = sumAssessment(3)
val markPri: Boolean = cheatingSum >= 2
val markSec: Boolean = cheatingSum + likelyCheatingSum >= 5
val report: Boolean = cheatingSum + likelyCheatingSum + unclearSum >= 5
val markSec: Boolean = cheatingSum + likelyCheatingSum >= 4
val reportPri: Boolean = cheatingSum + likelyCheatingSum >= 2
val reportSec: Boolean = cheatingSum + likelyCheatingSum + unclearSum >= 4
}
case class AggregateAssessment(
@ -93,11 +94,6 @@ case class GameGroupResult(
import Statistics.{listSum, listAverage}
val color = Color(white)
val aggregate: AggregateAssessment = {
def maxConfidence(xs: List[PeerGame]): Int = xs match {
case Nil => 0
case List(x: PeerGame) => x.matchPercentage
case x :: y :: rest => maxConfidence( (if (x.matchPercentage > y.matchPercentage) x else y) :: rest )
}
val peers = bestMatch :: secondaryMatches
AggregateAssessment(
round(listSum(peers.map {
@ -107,10 +103,7 @@ case class GameGroupResult(
case a if (a.positiveMatch) => 4 * a.matchPercentage
case a => a.matchPercentage
})).toInt,
listAverage(peers.map{ _ match {
case i if (i.positiveMatch) => List.fill(4)(i.matchPercentage)
case i => List(i.matchPercentage)
}}.flatten).toInt,
bestMatch.matchPercentage,
peers.exists(_.positiveMatch)
)
}

4
public/stylesheets/user-show.css
View file

@ -293,6 +293,10 @@ div.user_show .reportCard td {
font-weight: bold;
font-size: 1.2em;
}
div.user_show .results .aggregate {
font-size: 2.2em;
margin-top: -5px;
}
div.user_show .reportCard .mark {
color: #dc322f; /* red */
}