[LON-CAPA-cvs] cvs: loncom /interface/statistics lonproblemstatistics.pm
bisitz
bisitz@source.lon-capa.org
Thu, 05 Mar 2009 09:12:14 -0000
This is a MIME encoded message
--bisitz1236244334
Content-Type: text/plain
bisitz Thu Mar 5 09:12:14 2009 EDT
Modified files:
/loncom/interface/statistics lonproblemstatistics.pm
Log:
- Use standard style for info messages
- Removed several unnecessary trailing white spaces
--bisitz1236244334
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20090305091214.txt"
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.116 loncom/interface/statistics/lonproblemstatistics.pm:1.117
--- loncom/interface/statistics/lonproblemstatistics.pm:1.116 Tue Jan 20 16:38:44 2009
+++ loncom/interface/statistics/lonproblemstatistics.pm Thu Mar 5 09:12:14 2009
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonproblemstatistics.pm,v 1.116 2009/01/20 16:38:44 bisitz Exp $
+# $Id: lonproblemstatistics.pm,v 1.117 2009/03/05 09:12:14 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -123,11 +123,11 @@
align => 'left',
color => '#FFFFE6',
special => 'link',
- sortable => 'yes',
+ sortable => 'yes',
selectable => 'no',
defaultselected => 'yes',
},
- { name => 'part',
+ { name => 'part',
title => 'Part',
align => 'left',
color => '#FFFFE6',
@@ -375,7 +375,7 @@
align => 'left',
color => '#FFFFE6',
special => 'no',
- sortable => 'no',
+ sortable => 'no',
selectable => 'yes',
defaultselected => 'no',
},
@@ -510,7 +510,7 @@
long_title => 'KR-21 reliability statistic',
selectable => 'yes',
defaultselected => 'no',
- },
+ },
);
my %SelectedFields;
@@ -709,7 +709,7 @@
$r->print('<input type="hidden" name="sortby" value="'.$env{'form.sortby'}.
'" />');
#
- my @CacheButtonHTML =
+ my @CacheButtonHTML =
&Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
my $Str;
foreach my $html (@CacheButtonHTML) {
@@ -718,11 +718,12 @@
#
$r->print($Str);
if (! exists($env{'form.firstrun'})) {
- $r->print('<h3>'.
+ $r->print('<p class="LC_info"><b>'.
&mt('Press "Generate Statistics" when you are ready.').
- '</h3><p>'.
+ '</b></p>'.
+ '<p class="LC_info">'.
&mt('It may take some time to update the student data '.
- 'for the first analysis. Future analysis this session '.
+ 'for the first analysis. Future analysis this session '.
'will not have this delay.').
'</p>');
&clean_up();
@@ -734,7 +735,7 @@
# it does not slow things down noticably.
&Apache::loncoursedata::populate_weight_table();
#
- ($navmap,@sequences) =
+ ($navmap,@sequences) =
&Apache::lonstatistics::selected_sequences_with_assessments();
if (! ref($navmap)) {
$r->print('<div class="LC_error">'.&mt('A course-wide error occurred.').'</div>'.
@@ -747,7 +748,7 @@
&Apache::lonstatistics::section_and_enrollment_description().
'</h4>');
&Excel_output($r);
- } else {
+ } else {
$r->print('<input type="submit" name="Excel" value="'.
&mt('Produce Excel Output').'" />'.' 'x5);
$r->rflush();
@@ -756,7 +757,7 @@
'</h4>');
my $count = 0;
foreach my $seq (@sequences) {
- my @resources =
+ my @resources =
&Apache::lonstathelpers::get_resources($navmap,$seq);
$count += scalar(@resources);
}
@@ -801,7 +802,7 @@
'<table border="0" cellpadding="3">'."\n".
'<tr bgcolor="#FFFFE6">');
$r->print(&sequence_html_header());
- foreach my $seq (@sequences) {
+ foreach my $seq (@sequences) {
last if ($c->aborted);
&compute_sequence_statistics($seq);
$r->print(&sequence_html_output($seq));
@@ -1024,7 +1025,7 @@
}
#
# Build up the data sets to plot
- my @Labels;
+ my @Labels;
my @Data;
my $max = 1;
foreach my $data (@StatsArray) {
@@ -1064,7 +1065,7 @@
my $plot = '';
my $ymax = 0;
my $ymin = 0;
- my @Disc; my @Diff; my @Labels;
+ my @Disc; my @Diff; my @Labels;
foreach my $data (@StatsArray) {
push(@Labels,$data->{'problem_num'});
my $disc = $data->{'deg_of_disc'};
@@ -1154,7 +1155,7 @@
</curve>
</gnuplot>
END
- my $plotresult =
+ my $plotresult =
'<p>'.&Apache::lonxml::xmlparse($r,'web',$plot).'</p>'.$/;
$r->print($plotresult);
return;
@@ -1239,7 +1240,7 @@
</curve>
</gnuplot>
END
- my $plotresult =
+ my $plotresult =
'<p>'.&Apache::lonxml::xmlparse($r,'web',$plot).'</p>'.$/;
$r->print($plotresult);
return;
@@ -1350,11 +1351,11 @@
$excel_sheet->write($rows_output,$cols_output++,
'Compiled on '.localtime(time));
#
- $rows_output++;
+ $rows_output++;
$cols_output=0;
##
## Sequence Statistics
- ##
+ ##
&write_headers($excel_sheet,$format,\$rows_output,\$cols_output,
\@SeqFields);
foreach my $seq (@sequences) {
@@ -1432,7 +1433,7 @@
foreach my $field (@{$Fields}) {
next if ($field->{'selected'} ne 'yes');
next if ($field->{'name'} eq 'problem_num');
- # Use english for excel as I am not sure how well excel handles
+ # Use english for excel as I am not sure how well excel handles
# other character sets....
$excel_sheet->write($$rows_output,$$cols_output,
$field->{'title'},
@@ -1545,13 +1546,13 @@
=item &get_statistics()
-Wrapper routine from the call to loncoursedata::get_problem_statistics.
+Wrapper routine from the call to loncoursedata::get_problem_statistics.
Calls lonstathelpers::get_time_limits() to limit the data set by time
and &compute_discrimination_factor
Inputs: $sequence, $resource, $part, $problem_num
-Returns: Hash reference with statistics data from
+Returns: Hash reference with statistics data from
loncoursedata::get_problem_statistics.
=cut
@@ -1579,7 +1580,7 @@
&escape($resource->symb);
#
if ($SelectedFields{'deg_of_disc'}) {
- $data->{'deg_of_disc'} =
+ $data->{'deg_of_disc'} =
&compute_discrimination_factor($resource,$part,$sequence);
}
#
@@ -1592,9 +1593,9 @@
$data->{'course'} = $env{'request.course.id'};
my $urlres=(&Apache::lonnet::decode_symb($resource->symb))[2];
$data->{'urlres'}=$urlres;
- my %storestats =
+ my %storestats =
&LONCAPA::lonmetadata::dynamic_metadata_storage($data);
- my ($dom,$user) = ($urlres=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)});
+ my ($dom,$user) = ($urlres=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)});
&Apache::lonnet::put('nohist_resevaldata',\%storestats,$dom,$user);
}
#
@@ -1608,7 +1609,7 @@
# my $hinttries = &Apache::lonnet::EXT('resource.'.$part.'.hinttries',$symb);
my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',$symb);
$data->{'weight'} = $weight;
-# $data->{'duedate'} = $duedate;
+# $data->{'duedate'} = $duedate;
# $data->{'opendate'} = $opendate;
# $data->{'maxtries'} = $maxtries;
# $data->{'hinttries'} = $hinttries;
@@ -1642,7 +1643,7 @@
#
# rank
my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
- my $ranking =
+ my $ranking =
&Apache::loncoursedata::rank_students_by_scores_on_resources
(\@Resources,
[&Apache::lonstatistics::get_selected_sections()],
@@ -1653,20 +1654,20 @@
# compute their percent scores on the problems in the sequence,
my $number_to_grab = int(scalar(@{$ranking})/4);
my $num_students = scalar(@{$ranking});
- my @BottomSet = map { $_->[&Apache::loncoursedata::RNK_student()];
+ my @BottomSet = map { $_->[&Apache::loncoursedata::RNK_student()];
} @{$ranking}[0..$number_to_grab];
- my @TopSet =
- map {
- $_->[&Apache::loncoursedata::RNK_student()];
+ my @TopSet =
+ map {
+ $_->[&Apache::loncoursedata::RNK_student()];
} @{$ranking}[-$number_to_grab..0];
if (! @BottomSet || (@BottomSet == 1 && $BottomSet[0] eq '') ||
! @TopSet || (@TopSet == 1 && $TopSet[0] eq '')) {
return 'nan';
}
- my ($bottom_sum,$bottom_max) =
+ my ($bottom_sum,$bottom_max) =
&Apache::loncoursedata::get_sum_of_scores($symb,$part,\@BottomSet,
undef,$starttime,$endtime);
- my ($top_sum,$top_max) =
+ my ($top_sum,$top_max) =
&Apache::loncoursedata::get_sum_of_scores($symb,$part,\@TopSet,
undef,$starttime,$endtime);
my $deg_of_disc;
@@ -1689,10 +1690,10 @@
##
## K=the number of items in your test
## M=the mean score on the test
-## s=the standard deviation of the scores on your test
+## s=the standard deviation of the scores on your test
##
## then:
-##
+##
## KR-21 rk= [K/(K-1)] * [1- (M*(K-M))/(K*s^2))]
##
###############################################
@@ -1709,7 +1710,7 @@
my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
#
# First compute statistics based on student scores
- my ($smin,$smax,$sMean,$sSTD,$scount,$sMAX) =
+ my ($smin,$smax,$sMean,$sSTD,$scount,$sMAX) =
&Apache::loncoursedata::score_stats
([&Apache::lonstatistics::get_selected_sections()],
[&Apache::lonstatistics::get_selected_groups()],
@@ -1724,7 +1725,7 @@
$SeqStat{$symb}->{'max_possible'} = $sMAX;
#
# Compute statistics based on the number of correct problems
- # 'correct' is taken to mean
+ # 'correct' is taken to mean
my ($cmin,$cmax,$cMean,$cSTD,$ccount)=
&Apache::loncoursedata::count_stats
([&Apache::lonstatistics::get_selected_sections()],
--bisitz1236244334--