From raeburn at source.lon-capa.org Wed Mar 7 07:24:27 2018 From: raeburn at source.lon-capa.org (raeburn) Date: Wed, 07 Mar 2018 12:24:27 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /interface/statistics lonproblemstatistics.pm Message-ID: raeburn Wed Mar 7 12:24:27 2018 EDT Modified files: /loncom/interface/statistics lonproblemstatistics.pm Log: - Fix ranges used in array slices to generate @BottomSet and @TopSet used to compute degree of discrimination. Index: loncom/interface/statistics/lonproblemstatistics.pm diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.127 loncom/interface/statistics/lonproblemstatistics.pm:1.128 --- loncom/interface/statistics/lonproblemstatistics.pm:1.127 Mon Dec 18 23:51:19 2017 +++ loncom/interface/statistics/lonproblemstatistics.pm Wed Mar 7 12:24:27 2018 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemstatistics.pm,v 1.127 2017/12/18 23:51:19 raeburn Exp $ +# $Id: lonproblemstatistics.pm,v 1.128 2018/03/07 12:24:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1672,11 +1672,11 @@ my $number_to_grab = int(scalar(@{$ranking})/4); my $num_students = scalar(@{$ranking}); my @BottomSet = map { $_->[&Apache::loncoursedata::RNK_student()]; - } @{$ranking}[0..$number_to_grab]; + } @{$ranking}[0..$number_to_grab-1]; my @TopSet = map { $_->[&Apache::loncoursedata::RNK_student()]; - } @{$ranking}[-$number_to_grab..0]; + } @{$ranking}[-$number_to_grab..-1]; if (! @BottomSet || (@BottomSet == 1 && $BottomSet[0] eq '') || ! @TopSet || (@TopSet == 1 && $TopSet[0] eq '')) { return 'nan'; From raeburn at source.lon-capa.org Wed Mar 7 08:32:56 2018 From: raeburn at source.lon-capa.org (raeburn) Date: Wed, 07 Mar 2018 13:32:56 -0000 Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface/statistics lonproblemstatistics.pm Message-ID: raeburn Wed Mar 7 13:32:56 2018 EDT Modified files: (Branch: version_2_11_X) /loncom/interface/statistics lonproblemstatistics.pm Log: - For 2.11 - Backport 1.128. Index: loncom/interface/statistics/lonproblemstatistics.pm diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.122.2.3 loncom/interface/statistics/lonproblemstatistics.pm:1.122.2.4 --- loncom/interface/statistics/lonproblemstatistics.pm:1.122.2.3 Mon Mar 3 20:45:05 2014 +++ loncom/interface/statistics/lonproblemstatistics.pm Wed Mar 7 13:32:56 2018 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemstatistics.pm,v 1.122.2.3 2014/03/03 20:45:05 raeburn Exp $ +# $Id: lonproblemstatistics.pm,v 1.122.2.4 2018/03/07 13:32:56 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1667,11 +1667,11 @@ my $number_to_grab = int(scalar(@{$ranking})/4); my $num_students = scalar(@{$ranking}); my @BottomSet = map { $_->[&Apache::loncoursedata::RNK_student()]; - } @{$ranking}[0..$number_to_grab]; + } @{$ranking}[0..$number_to_grab-1]; my @TopSet = map { $_->[&Apache::loncoursedata::RNK_student()]; - } @{$ranking}[-$number_to_grab..0]; + } @{$ranking}[-$number_to_grab..-1]; if (! @BottomSet || (@BottomSet == 1 && $BottomSet[0] eq '') || ! @TopSet || (@TopSet == 1 && $TopSet[0] eq '')) { return 'nan'; From raeburn at source.lon-capa.org Sun Mar 11 08:44:23 2018 From: raeburn at source.lon-capa.org (raeburn) Date: Sun, 11 Mar 2018 12:44:23 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /interface loncoursedata.pm Message-ID: raeburn Sun Mar 11 12:44:23 2018 EDT Modified files: /loncom/interface loncoursedata.pm Log: - For &rank_students_by_scores_on_resources() include a secondary sort (arbitrarily chosen to be by username) so rank for users with the same score is invariant between calls. Index: loncom/interface/loncoursedata.pm diff -u loncom/interface/loncoursedata.pm:1.202 loncom/interface/loncoursedata.pm:1.203 --- loncom/interface/loncoursedata.pm:1.202 Mon Dec 18 23:51:14 2017 +++ loncom/interface/loncoursedata.pm Sun Mar 11 12:44:22 2018 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: loncoursedata.pm,v 1.202 2017/12/18 23:51:14 raeburn Exp $ +# $Id: loncoursedata.pm,v 1.203 2018/03/11 12:44:22 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1933,7 +1933,7 @@ $limits =~ s/( AND )$//; # Remove extra conjunction $request .= "WHERE $limits"; } - $request .= " $award_clause GROUP BY a.student_id ORDER BY score"; + $request .= " $award_clause GROUP BY a.student_id ORDER BY score, b.student"; #&Apache::lonnet::logthis('request = '.$/.$request); my $sth = $dbh->prepare($request) or die "Can't prepare $request"; $sth->execute(); From raeburn at source.lon-capa.org Sun Mar 11 08:49:53 2018 From: raeburn at source.lon-capa.org (raeburn) Date: Sun, 11 Mar 2018 12:49:53 -0000 Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncoursedata.pm Message-ID: raeburn Sun Mar 11 12:49:53 2018 EDT Modified files: (Branch: version_2_11_X) /loncom/interface loncoursedata.pm Log: - For 2.11 - Backport 1.203 Index: loncom/interface/loncoursedata.pm diff -u loncom/interface/loncoursedata.pm:1.201 loncom/interface/loncoursedata.pm:1.201.2.1 --- loncom/interface/loncoursedata.pm:1.201 Tue Aug 16 00:46:58 2016 +++ loncom/interface/loncoursedata.pm Sun Mar 11 12:49:53 2018 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: loncoursedata.pm,v 1.201 2016/08/16 00:46:58 raeburn Exp $ +# $Id: loncoursedata.pm,v 1.201.2.1 2018/03/11 12:49:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1933,7 +1933,7 @@ $limits =~ s/( AND )$//; # Remove extra conjunction $request .= "WHERE $limits"; } - $request .= " $award_clause GROUP BY a.student_id ORDER BY score"; + $request .= " $award_clause GROUP BY a.student_id ORDER BY score, b.student"; #&Apache::lonnet::logthis('request = '.$/.$request); my $sth = $dbh->prepare($request) or die "Can't prepare $request"; $sth->execute();