From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 12 Dec 2014 12:45:03 +0000 (+0200)
Subject: Move standings to Result/Contest.pm
X-Git-Tag: 5999.000_012~5
X-Git-Url: http://git.ieval.ro/?p=gruntmaster-data.git;a=commitdiff_plain;h=751c70b56c8cbd4850821a2ecce774a01a7bd165

Move standings to Result/Contest.pm
---

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 023966f..0b04b7b 100644
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -19,7 +19,6 @@ our $VERSION = '5999.000_011';
 
 use Lingua::EN::Inflect qw/PL_N/;
 use JSON::MaybeXS qw/decode_json/;
-use List::Util qw/sum/;
 use PerlX::Maybe qw/maybe/;
 use Sub::Name qw/subname/;
 
@@ -42,51 +41,6 @@ BEGIN {
 	}
 }
 
-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) = @_;
-	my $ctobj = $self->contest($ct);
-
-	my @problems = map { $_->rawproblem } $self->contest_problems->search({contest => $ct}, {qw/join problem order_by problem.level/});
-	my (%scores, %tries, %opens);
-	$opens{$_->rawproblem, $_->rawowner} = $_ for $self->opens->search({contest => $ct});
-	for my $job ($self->jobs->search({contest => $ct}, {qw/order_by me.id prefetch/ => [qw/problem/]})) {
-		my $open = $opens{$job->rawproblem, $job->rawowner};
-		my $time = $job->date - ($open ? $open->time : $ctobj->start);
-		next if $time < 0;
-		my $value = $job->problem->value;
-		my $factor = $job->result ? 0 : 1;
-		$factor = $1 / 100 if $job->result_text =~ /^(\d+ )/s;
-		$scores{$job->rawowner}{$job->rawproblem} = int ($factor * calc_score ($value, $time, $tries{$job->rawowner}{$job->rawproblem}++, $ctobj->stop - $ctobj->start));
-	}
-
-	my %user_to_name = map { $_ => $_->name } $self->users->all;
-
-	my @st = sort { $b->{score} <=> $a->{score} or $a->{user} cmp $b->{user} } map { ## no critic (ProhibitReverseSortBlock)
-		my $user = $_;
-		+{
-			user => $user,
-			user_name => $user_to_name{$user},
-			score => sum (values %{$scores{$user}}),
-			scores => [map { $scores{$user}{$_} // '-'} @problems],
-		}
-	} 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 ]
@@ -198,8 +152,7 @@ sub update_status {
 
 	my @contest_statuses = map {
 		my $contest = $_->id;
-		my @standings = $self->standings($contest);
-		map { [$contest, $_->{user}, $_->{score}, $_->{rank}] } @standings;
+		map { [$contest, $_->{user}, $_->{score}, $_->{rank}] } $_->standings
 	} $self->contests->all;
 
 	my $txn = sub {
diff --git a/lib/Gruntmaster/Data/Result/Contest.pm b/lib/Gruntmaster/Data/Result/Contest.pm
index 5933443..4b1c1f4 100644
--- a/lib/Gruntmaster/Data/Result/Contest.pm
+++ b/lib/Gruntmaster/Data/Result/Contest.pm
@@ -167,6 +167,8 @@ __PACKAGE__->many_to_many("problems", "contest_problems", "problem");
 # Created by DBIx::Class::Schema::Loader v0.07042 @ 2014-12-11 23:51:27
 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nu+Io9AhYkzYCky5UpCaKQ
 
+use List::Util qw/sum/;
+
 sub is_pending {
 	my ($self, $time) = @_;
 	$self->start > ($time // time)
@@ -182,6 +184,51 @@ sub is_running {
 	!$self->is_pending($time) && !$self->is_finished($time)
 }
 
+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) = @_;
+	my $ct = $self->id;
+
+	my @problems = map { $_->rawproblem } $self->contest_problems->search({contest => $ct}, {qw/join problem order_by problem.level/});
+	my (%scores, %tries, %opens);
+	$opens{$_->rawproblem, $_->rawowner} = $_ for $self->opens->search({contest => $ct});
+	for my $job ($self->jobs->search({contest => $ct}, {qw/order_by me.id prefetch/ => [qw/problem/]})) {
+		my $open = $opens{$job->rawproblem, $job->rawowner};
+		my $time = $job->date - ($open ? $open->time : $self->start);
+		next if $time < 0;
+		my $value = $job->problem->value;
+		my $factor = $job->result ? 0 : 1;
+		$factor = $1 / 100 if $job->result_text =~ /^(\d+ )/s;
+		$scores{$job->rawowner}{$job->rawproblem} = int ($factor * calc_score ($value, $time, $tries{$job->rawowner}{$job->rawproblem}++, $self->stop - $self->start));
+	}
+
+	my %user_to_name = map { $_ => $_->name } $self->result_source->schema->users->all;
+
+	my @st = sort { $b->{score} <=> $a->{score} or $a->{user} cmp $b->{user} } map { ## no critic (ProhibitReverseSortBlock)
+		my $user = $_;
+		+{
+			user => $user,
+			user_name => $user_to_name{$user},
+			score => sum (values %{$scores{$user}}),
+			scores => [map { $scores{$user}{$_} // '-'} @problems],
+		}
+	} keys %scores;
+
+	$st[0]->{rank} = 1;
+	$st[$_]->{rank} = $st[$_ - 1]->{rank} + ($st[$_]->{score} < $st[$_ - 1]->{score}) for 1 .. $#st;
+	@st
+}
+
 1;
 
 __END__