Bump version and update Changes

[gruntmaster-data.git] / lib / Gruntmaster / Data.pm

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 5754491737e846ac5d5f4177bea0b9bca9947edd..7afcbb9214c999a370ae0266fc8ec2456db936fb 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -15,10 +15,12 @@ __PACKAGE__->load_namespaces;
 # Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-03-05 13:11:39
 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dAEmtAexvUaNXLgYz2rNEg
 
-our $VERSION = '5999.000_007';
+our $VERSION = '5999.000_009';
 
 use Lingua::EN::Inflect qw/PL_N/;
 use JSON qw/decode_json/;
+use List::Util qw/sum/;
+use PerlX::Maybe qw/maybe/;
 use Sub::Name qw/subname/;
 
 use constant PROBLEM_PUBLIC_COLUMNS => [qw/id author writer level name owner private statement timeout olimit value/];
@@ -40,6 +42,60 @@ BEGIN {
        }
 }
 
+use constant LEVEL_VALUES => {
+       beginner => 100,
+       easy => 250,
+       medium => 500,
+       hard => 1000,
+};
+
+sub calc_score{
+       my ($mxscore, $time, $tries, $totaltime) = @_;
+       my $score = $mxscore;
+       $time = 0 if $time < 0;
+       $time = 300 if $time > $totaltime;
+       $score = ($totaltime - $time) / $totaltime * $score;
+       $score -= $tries / 10 * $mxscore;
+       $score = $mxscore * 3 / 10 if $score < $mxscore * 3 / 10;
+       int $score + 0.5
+}
+
+sub standings {
+       my ($self, $ct) = @_;
+       $ct &&= $self->contest($ct);
+
+       my @problems = map { $_->problem } $self->contest_problems->search({contest => $ct && $ct->id}, {qw/join problem order_by problem.level/});
+       my (%scores, %tries);
+       for my $job ($self->jobs->search({contest => $ct && $ct->id}, {order_by => 'id'})) {
+               if ($ct) {
+                       my $open = $self->opens->find($ct->id, $job->problem->id, $job->owner->id);
+                       my $time = $job->date - ($open ? $open->time : $ct->start);
+                       next if $time < 0;
+                       my $value = $job->problem->value // LEVEL_VALUES->{$job->problem->level};
+                       my $factor = $job->result ? 0 : 1;
+                       $factor = $1 / 100 if $job->result_text =~ /^(\d+ )/;
+                       $scores{$job->owner->id}{$job->problem->id} = int ($factor * calc_score ($value, $time, $tries{$job->owner->id}{$job->problem->id}++, $ct->stop - $ct->start));
+               } else {
+                       no warnings 'numeric';
+                       $scores{$job->owner->id}{$job->problem->id} = 0 + $job->result_text || ($job->result ? 0 : 100)
+               }
+       }
+
+       my @st = sort { $b->{score} <=> $a->{score} or $a->{user}->id cmp $b->{user}->id} map {
+               my $user = $_;
+               +{
+                       user => $self->user($user),
+                       score => sum (values %{$scores{$user}}),
+                       scores => [map { $scores{$user}{$_->id} // '-'} @problems],
+                       problems => $ct,
+               }
+       } keys %scores;
+
+       $st[0]->{rank} = 1;
+       $st[$_]->{rank} = $st[$_ - 1]->{rank} + ($st[$_]->{score} < $st[$_ - 1]->{score}) for 1 .. $#st;
+       @st
+}
+
 sub user_list {
        my $rs = $_[0]->users->search(undef, {order_by => 'name', columns => USER_PUBLIC_COLUMNS});
        [ map +{ $_->get_columns }, $rs->all ]
@@ -60,7 +116,7 @@ sub problem_list {
        $params{contest} = $args{contest} if $args{contest};
        for ($rs->all) {
                $params{$_->level} //= [];
-               push $params{$_->level}, {$_->get_columns, owner_name => $_->owner->name} ;
+               push @{$params{$_->level}}, {$_->get_columns, owner_name => $_->owner->name} ;
        }
        \%params
 }
@@ -88,7 +144,7 @@ sub contest_list {
        for ($rs->all) {
                my $state = $_->is_pending ? 'pending' : $_->is_running ? 'running' : 'finished';
                $params{$state} //= [];
-               push $params{$state}, { $_->get_columns, started => !$_->is_pending, owner_name => $_->owner->name };
+               push @{$params{$state}}, { $_->get_columns, started => !$_->is_pending, owner_name => $_->owner->name };
        }
        \%params
 }
@@ -102,19 +158,25 @@ sub contest_entry {
 sub job_list {
        my ($self, %args) = @_;
        $args{page} //= 1;
-       my $rs = $self->jobs->search(undef, {order_by => {-desc => 'me.id'}, prefetch => ['problem', 'owner'], rows => JOBS_PER_PAGE, offset => ($args{page} - 1) * JOBS_PER_PAGE});
+       my $rs = $self->jobs->search(undef, {order_by => {-desc => 'me.id'}, prefetch => ['problem', 'owner'], rows => JOBS_PER_PAGE, page => $args{page}});
        $rs = $rs->search({'me.owner' => $args{owner}})   if $args{owner};
        $rs = $rs->search({contest    => $args{contest}}) if $args{contest};
        $rs = $rs->search({problem    => $args{problem}}) if $args{problem};
-       [map {
-               my %params = $_->get_columns;
-               $params{owner_name}   = $_->owner->name;
-               $params{problem_name} = $_->problem->name;
-               $params{results} &&= decode_json $params{results};
-               $params{size}      = length $params{source};
-               delete $params{source};
-               \%params
-       } $rs->all]
+       return {
+               log => [map {
+                       my %params = $_->get_columns;
+                       $params{owner_name}   = $_->owner->name;
+                       $params{problem_name} = $_->problem->name;
+                       $params{results} &&= decode_json $params{results};
+                       $params{size}      = length $params{source};
+                       delete $params{source};
+                       \%params
+               } $rs->all],
+               current_page => $rs->pager->current_page,
+               maybe previous_page => $rs->pager->previous_page,
+               maybe next_page => $rs->pager->next_page,
+               maybe last_page => $rs->pager->last_page,
+       }
 }
 
 sub job_entry {