X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;ds=inline;f=lib%2FGruntmaster%2FPage%2FSt.pm;h=3857c1ad22f991a6c5e5745b1ee5e6b9ef1a67d8;hb=81cce380bd7f2ab58bb497ef748b7568968ea05d;hp=a812cfa0124b89bee6481e8a6b94cafed6cfd4e3;hpb=8e1eb2c1fbf99436083b0854235142f766c5167f;p=plack-app-gruntmaster.git
diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index a812cfa..3857c1a 100644
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -1,28 +1,6 @@
package Gruntmaster::Page::St;
-use 5.014000;
-use strict;
-use warnings;
use Gruntmaster::Page::Base st => 'Standings';
-our @ISA = qw/Gruntmaster::Page::Base/;
-our $VERSION = '0.001';
-
-use constant TEMPLATES => {
- en => <<'HTML',
-
-
-UsernameTotal
-Username | Score
-
-
- |
-
-
-
-
- | | | | | |
---|
-HTML
-};
use constant LEVEL_VALUES => {
beginner => 100,
@@ -41,7 +19,7 @@ sub calc_score{
$score = ($totaltime - $timetaken) / $totaltime * $score;
$score -= $tries / 10 * $mxscore;
$score = $mxscore * 3 / 10 if $score < $mxscore * 3 / 10;
- int $score
+ int $score + 0.5
}
sub _generate{
@@ -60,19 +38,19 @@ sub _generate{
@problems = sort @problems;
my (%scores, %tries);
for (1 .. jobcard) {
+ next unless defined job_user && defined job_problem && defined job_result;
+ next if $Gruntmaster::Data::contest && job_date() < $start;
+
if ($Gruntmaster::Data::contest) {
+ $scores{job_user()}{job_problem()} = job_result() ? 0 : calc_score (job_user(), job_problem(), job_date(), $tries{job_user()}{job_problem()}, $totaltime);
$tries{job_user()}{job_problem()}++;
- $scores{job_user()}{job_problem()} = job_result() ? 0 : calc_score (job_user(), job_problem(), job_date(), $tries{job_user()}{job_problem()}, $totaltime) if job_date() > $start;
} else {
- if (job_result_text =~ m/^(\scores+)/) {
- $scores{job_user()}{job_problem()} = $ct;
- } else {
- $scores{job_user()}{job_problem()} = job_result() ? 0 : 100;
- }
+ no warnings 'numeric';
+ $scores{job_user()}{job_problem()} = 0 + job_result_text() || (job_result() ? 0 : 100)
}
}
- my @st = sort { $b->{score} <=> $a->{score} } map {
+ my @st = sort { $b->{score} <=> $a->{score} or $a->{user} cmp $b->{user}} map {
my $user = $_;
+{
user => $user,
@@ -81,6 +59,9 @@ sub _generate{
problems => $Gruntmaster::Data::contest,
}
} keys %scores;
+
+ $st[0]->{rank} = 1;
+ $st[$_]->{rank} = $st[$_ - 1]->{rank} + ($st[$_]->{score} < $st[$_ - 1]->{score}) for 1 .. $#st;
$htc->param(problems => [map { problem_name } @problems ]) if $Gruntmaster::Data::contest;
$htc->param(st => \@st);
}