Update standings

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index b50490c00f3e31d6d22382c45b5003148373d6cc..27f3a9c598cee110a4e3d9b1247ecd71b7c68bde 100644 (file)
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -24,20 +24,45 @@ use constant TEMPLATES => {
 HTML
 };
 
+use constant LEVEL_VALUES => {
+       beginner => 100,
+       easy => 250,
+       medium => 500,
+       hard => 1000,
+};
+
+sub calc_score{
+       my ($user, $problem, $date, $tries) = @_;
+       my $mxscore = LEVEL_VALUES->{problem_level($problem)};
+       my $score = $mxscore;
+       my $timetaken = $date - get_open($problem, $user);
+       $timetaken = 1 if $timetaken < 1;
+       $timetaken = 150 + int rand 150 if $timetaken > 3600;
+       $score = (3600 - $timetaken) / 3600 * $score;
+       $score -= $tries / 10 * $mxscore;
+       $score = $mxscore * 3 / 10 if $score < $mxscore * 3 / 10;
+       int $score
+}
+
 sub _generate{
        my ($self, $htc, $path, $lang) = @_;
 
        $path =~ m,^(?:ct/([^/]+)/)?,;
-       local $Gruntmaster::Data::contest = $1;
+       local $Gruntmaster::Data::contest = $1 if $1;
 
        my @problems = problems;
        @problems = sort @problems;
-       my %scores;
+       my (%scores, %tries);
        for (1 .. jobcard) {
-               if (job_result_text =~ m/^(\d+)/) {
-                       $scores{job_user()}{job_problem()} = $1;
+               if ($Gruntmaster::Data::contest) {
+                       $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()});
                } else {
-                       $scores{job_user()}{job_problem()} = job_result() ? 0 : 100;
+                       if (job_result_text =~ m/^(\d+)/) {
+                               $scores{job_user()}{job_problem()} = $1;
+                       } else {
+                               $scores{job_user()}{job_problem()} = job_result() ? 0 : 100;
+                       }
                }
        }