From 74550f89071d2e77fcb3bc455a895ecb34c71f10 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Thu, 6 Dec 2018 21:28:06 +0100
Subject: [PATCH] rank: fix long running scoring error

---
 frontend/static/views/rules.html | 16 ++++++++--------
 libfic/stats.go                  |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/static/views/rules.html b/frontend/static/views/rules.html
index 627e16a5..2f6aa18e 100644
--- a/frontend/static/views/rules.html
+++ b/frontend/static/views/rules.html
@@ -28,7 +28,7 @@
 
   <h3>Coût des tentatives</h3>
   <p>
-    Vous disposez de 9&nbsp;tentatives pour trouver la/les solutions d'un
+    Vous disposez de 10&nbsp;tentatives pour trouver la/les solutions d'un
     challenge. Au delà, chaque tentative vous fait perdre une petite quantité
     de points comme suit&nbsp;:
   </p>
@@ -41,23 +41,23 @@
     </thead>
     <tbody>
       <tr>
-	<td>0 à 9</td>
+	<td>0 à 10</td>
 	<td>0&nbsp;point</td>
       </tr>
       <tr>
-	<td>10 à 19</td>
+	<td>11 à 20</td>
 	<td><ng-pluralize count="settings.submissionCostBase" when="{'one': '{}&nbsp;point', 'other': '{}&nbsp;points'}"></ng-pluralize></td>
       </tr>
       <tr>
-	<td>20 à 29</td>
+	<td>21 à 30</td>
 	<td><ng-pluralize count="settings.submissionCostBase * 2" when="{'one': '{}&nbsp;point', 'other': '{}&nbsp;points'}"></ng-pluralize></td>
       </tr>
       <tr>
-	<td>30 à 39</td>
+	<td>31 à 40</td>
 	<td><ng-pluralize count="settings.submissionCostBase * 3" when="{'one': '{}&nbsp;point', 'other': '{}&nbsp;points'}"></ng-pluralize></td>
       </tr>
       <tr>
-	<td>40 à 49</td>
+	<td>41 à 50</td>
 	<td><ng-pluralize count="settings.submissionCostBase * 4" when="{'one': '{}&nbsp;point', 'other': '{}&nbsp;points'}"></ng-pluralize></td>
       </tr>
       <tr>
@@ -74,10 +74,10 @@
     Par exemple&nbsp;:
   </p>
   <ul>
-    <li>À&nbsp;10 tentatives, vous aurez perdu <ng-pluralize count="settings.submissionCostBase" when="{'one': '{}&nbsp;point', 'other': '{}&nbsp;points'}"></ng-pluralize>.</li>
+    <li>À&nbsp;10 tentatives, vous aurez perdu <ng-pluralize count="settings.submissionCostBase * 0" when="{'one': '{}&nbsp;point', 'other': '{}&nbsp;points'}"></ng-pluralize>.</li>
     <li>À&nbsp;15 tentatives, vous aurez perdu en tout <ng-pluralize count="settings.submissionCostBase * 5" when="{'one': '{}&nbsp;point', 'other': '{}&nbsp;points'}"></ng-pluralize>&nbsp;: <samp>{{ settings.submissionCostBase }} * 5</samp>.</li>
     <li>25 tentatives vous coûteront en tout <ng-pluralize count="settings.submissionCostBase * 20" when="{'one': '{}&nbsp;point', 'other': '{}&nbsp;points'}"></ng-pluralize>&nbsp;: <samp>{{ settings.submissionCostBase }} * 10 + {{ settings.submissionCostBase * 2}} * 5</samp>.</li>
-    <li>50 tentatives vous coûteront en tout <ng-pluralize count="settings.submissionCostBase * 105" when="{'one': '{}&nbsp;point', 'other': '{}&nbsp;points'}"></ng-pluralize>&nbsp;: <samp>{{ settings.submissionCostBase }} * 10 + {{ settings.submissionCostBase * 2 }} * 10 + {{ settings.submissionCostBase * 3 }} * 10 + {{ settings.submissionCostBase * 4 }} * 10 + {{ settings.submissionCostBase * 5 }}</samp>.</li>
+    <li>50 tentatives vous coûteront en tout <ng-pluralize count="settings.submissionCostBase * 100" when="{'one': '{}&nbsp;point', 'other': '{}&nbsp;points'}"></ng-pluralize>&nbsp;: <samp>{{ settings.submissionCostBase }} * 10 + {{ settings.submissionCostBase * 2 }} * 10 + {{ settings.submissionCostBase * 3 }} * 10 + {{ settings.submissionCostBase * 4 }} * 10</samp>.</li>
   </ul>
   <p>
     La dernière tentative (lorsque tous les flags sont bons) est comptabilisée
diff --git a/libfic/stats.go b/libfic/stats.go
index 30c9ec43..194834c9 100644
--- a/libfic/stats.go
+++ b/libfic/stats.go
@@ -13,7 +13,7 @@ var FirstBlood = 0.12
 var SubmissionCostBase = 0.5
 
 func exoptsQuery(whereExo string) string {
-	return "SELECT S.id_team, S.time, E.gain AS points, coeff FROM (SELECT id_team, id_exercice, MIN(time) AS time, " + fmt.Sprintf("%f", FirstBlood) + " AS coeff FROM exercice_solved GROUP BY id_exercice UNION SELECT id_team, id_exercice, time, coefficient AS coeff FROM exercice_solved) S INNER JOIN exercices E ON S.id_exercice = E.id_exercice "  + whereExo + " UNION ALL SELECT id_team, MAX(time) AS time, (FLOOR(COUNT(*)/10 - 1) * (FLOOR(COUNT(*)/10)))/0.2 + (FLOOR(COUNT(*)/10) * (COUNT(*)%10)) AS points, " + fmt.Sprintf("%f", SubmissionCostBase * -1) + " AS coeff FROM exercice_tries S "  + whereExo + " GROUP BY id_exercice"
+	return "SELECT S.id_team, S.time, E.gain AS points, coeff FROM (SELECT id_team, id_exercice, MIN(time) AS time, " + fmt.Sprintf("%f", FirstBlood) + " AS coeff FROM exercice_solved GROUP BY id_exercice UNION SELECT id_team, id_exercice, time, coefficient AS coeff FROM exercice_solved) S INNER JOIN exercices E ON S.id_exercice = E.id_exercice "  + whereExo + " UNION ALL SELECT id_team, MAX(time) AS time, (FLOOR(COUNT(*)/10 - 1) * (FLOOR(COUNT(*)/10)))/0.2 + (FLOOR(COUNT(*)/10) * (COUNT(*)%10)) AS points, " + fmt.Sprintf("%f", SubmissionCostBase * -1) + " AS coeff FROM exercice_tries S "  + whereExo + " GROUP BY id_exercice, id_team"
 }
 
 func rankQuery(whereTeam string) string {