X-Git-Url: http://git.ieval.ro/?p=gruntmaster-data.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FData.pm;h=c46a358964777ec70df4fbfdb0a2b129b104de7d;hp=3258c85c32b769b460c769188c4300e0e79d4135;hb=625a7bd077ef2781d055a77bffa19dd9d6c0d1f2;hpb=a2aa46e6fb478ba94f05d5ce36b7848e7a8bf807

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 3258c85..c46a358 100644
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -15,11 +15,10 @@ __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_011';
+our $VERSION = '5999.000_012';
 
 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,67 +41,21 @@ 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) = @_;
-	$ct &&= $self->contest($ct);
-
-	my @problems = map { $_->rawproblem } $self->contest_problems->search({contest => $ct && $ct->id}, {qw/join problem order_by problem.level/});
-	my (%scores, %tries, %opens);
-	$opens{$_->rawproblem, $_->rawowner} = $_ for $self->opens->search({contest => $ct && $ct->id});
-	for my $job ($self->jobs->search({contest => $ct && $ct->id}, {qw/order_by me.id prefetch/ => [qw/problem/]})) {
-		if ($ct) {
-			my $open = $opens{$job->rawproblem, $job->rawowner};
-			my $time = $job->date - ($open ? $open->time : $ct->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}++, $ct->stop - $ct->start));
-		} else {
-			no warnings 'numeric'; ## no critic (ProhibitNoWarnings)
-			$scores{$job->rawowner}{$job->rawproblem} = 0 + $job->result_text || ($job->result ? 0 : 100)
-		}
-	}
-
-	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],
-			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 ]
+	my $rs = $_[0]->users->search(undef, {columns => USER_PUBLIC_COLUMNS, prefetch => [qw/problem_statuses contest_statuses/]} );
+	[ sort { $b->{solved} <=> $a->{solved} or $b->{attempted} <=> $a->{attempted} } map { ## no critic (ProhibitReverseSort)
+		my $solved    = $_->problem_statuses->count(solved => 1);
+		my $attempted = $_->problem_statuses->count(solved => 0);
+		my $contests  = $_->contest_statuses->count;
+		+{ $_->get_columns, solved => $solved, attempted => $attempted, contests => $contests }
+	} $rs->all ]
 }
 
 sub user_entry {
 	my ($self, $id) = @_;
 	my $user = $self->users->find($id, {columns => USER_PUBLIC_COLUMNS, prefetch => [qw/problem_statuses contest_statuses/]});
 	my @problems = map { {problem => $_->get_column('problem'), solved => $_->solved} } $user->problem_statuses;
-	my @contests = map { {contest => $_->get_column('contest'), rank => $_->rank, score => $_->score} } $user->contest_statuses;
+	my @contests = map { {contest => $_->contest->id, contest_name => $_->contest->name, rank => $_->rank, score => $_->score} } $user->contest_statuses->search(undef, {prefetch => 'contest'});
 	+{ $user->get_columns, problems => \@problems, contests => \@contests }
 }
 
@@ -199,13 +152,12 @@ sub update_status {
 	my @jobs = $self->jobs->search(undef, {cache => 1})->all;
 
 	my %hash;
-	$hash{$_->get_column('problem'), $_->get_column('owner')} = [$_->id, $_->result ? 1 : 0] for @jobs;
+	$hash{$_->get_column('problem'), $_->get_column('owner')} = [$_->id, $_->result ? 0 : 1] for @jobs;
 	my @problem_statuses = map { [split ($;), @{$hash{$_}} ] } keys %hash;
 
 	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 {