';
foreach my $field (@SeqFields) {
-# next if ($field->{'selected'} ne 'yes');
+ next if ($field->{'selected'} ne 'yes');
$row .= '{'align'})) {
$row .= ' align="'.$field->{'align'}.'"';
@@ -945,6 +1082,11 @@ sub degrees_plot {
my $diffdata .= ''.join(',',@Labels).' '.$/.
''.join(',',@Diff).' '.$/;
#
+ my $title = 'Degree of Discrimination\nand Degree of Difficulty';
+ if ($xmax > 50) {
+ $title = 'Degree of Discrimination and Degree of Difficulty';
+ }
+ #
$plot=<<"END";
Degree of Discrmination and Degree of Difficulty
+ $title
Problem Number
'.join(',',@Mean).''.$/.
''.join(',',@STD).' '.$/;
#
+ my $title = 'Mean and S.D. of Tries';
+ if ($xmax > 25) {
+ $title = 'Mean and Standard Deviation of Tries';
+ }
+ #
$plot=<<"END";
- Mean and S.D. of Tries
+ $title
Problem Number
+ Number of Tries
'yes',
name => 'degrees',
- title => 'DoDisc and DoDiff' },
+ title => 'Difficulty Indexes' },
{ graphable=>'yes',
name => 'tries statistics',
- title => 'Mean and S.D. of Tries' });
+ title => 'Tries Statistics' });
#
my $Str= "\n".'';
$Str .= 'none '."\n";
- foreach my $field (@Fields,@Additional_Plots) {
+ foreach my $field (@Additional_Plots,@Fields) {
if (! exists($field->{'graphable'}) ||
$field->{'graphable'} ne 'yes') {
next;
@@ -1148,6 +1296,8 @@ sub Excel_output {
}
my $excel_sheet = $excel_workbook->addworksheet(
&Apache::loncommon::clean_excel_name($sheetname));
+ #
+ my $format = &Apache::loncommon::define_excel_formats($excel_workbook);
##
## Begin creating excel sheet
##
@@ -1155,28 +1305,17 @@ sub Excel_output {
#
# Put the course description in the header
$excel_sheet->write($rows_output,$cols_output++,
- $ENV{'course.'.$ENV{'request.course.id'}.'.description'});
+ $ENV{'course.'.$ENV{'request.course.id'}.'.description'},
+ $format->{'h1'});
$cols_output += 3;
#
# Put a description of the sections listed
my $sectionstring = '';
- my @Sections = @Apache::lonstatistics::SelectedSections;
- if (scalar(@Sections) > 1) {
- if (scalar(@Sections) > 2) {
- my $last = pop(@Sections);
- $sectionstring = "Sections ".join(', ',@Sections).', and '.$last;
- } else {
- $sectionstring = "Sections ".join(' and ',@Sections);
- }
- } else {
- if ($Sections[0] eq 'all') {
- $sectionstring = "All sections";
- } else {
- $sectionstring = "Section ".$Sections[0];
- }
- }
- $excel_sheet->write($rows_output,$cols_output++,$sectionstring);
- $cols_output += scalar(@Sections);
+ $excel_sheet->write($rows_output,$cols_output++,
+ &Apache::lonstathelpers::sections_description
+ (@Apache::lonstatistics::SelectedSections),
+ $format->{'h3'});
+ $cols_output += scalar(@Apache::lonstatistics::SelectedSections);
#
# Time restrictions
my $time_string;
@@ -1192,6 +1331,10 @@ sub Excel_output {
# See note above about lonlocal:locallocaltime
$time_string .= 'Data collected before '.localtime($endtime).'.';
}
+ if (defined($time_string)) {
+ $excel_sheet->write($rows_output,$cols_output++,$time_string);
+ $cols_output+= 5;
+ }
#
# Put the date in there too
$excel_sheet->write($rows_output,$cols_output++,
@@ -1199,38 +1342,48 @@ sub Excel_output {
#
$rows_output++;
$cols_output=0;
- #
- # Long Headers
- foreach my $field (@Fields) {
- next if ($field->{'name'} eq 'problem_num');
- next if ($field->{'selected'} ne 'yes');
- if (exists($field->{'long_title'})) {
+ ##
+ ## Sequence Statistics
+ ##
+ &write_headers($excel_sheet,$format,\$rows_output,\$cols_output,
+ \@SeqFields);
+ foreach my $seq (@sequences) {
+ my $data = $SeqStat{$seq->symb};
+ $cols_output=0;
+ foreach my $field (@SeqFields) {
+ next if ($field->{'selected'} ne 'yes');
+ my $fieldformat = undef;
+ if (exists($field->{'excel_format'})) {
+ $fieldformat = $format->{$field->{'excel_format'}};
+ }
$excel_sheet->write($rows_output,$cols_output++,
- $field->{'long_title'});
- } else {
- $excel_sheet->write($rows_output,$cols_output++,'');
+ $data->{$field->{'name'}},$fieldformat);
}
+ $rows_output++;
+ $cols_output=0;
}
+ ##
+ ## Resource Statistics
+ ##
$rows_output++;
$cols_output=0;
- # Brief headers
- 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
- # other character sets....
- $excel_sheet->write($rows_output,$cols_output++,$field->{'title'});
- }
- $rows_output++;
+ &write_headers($excel_sheet,$format,\$rows_output,\$cols_output,
+ \@Fields);
+ #
foreach my $data (@StatsArray) {
$cols_output=0;
foreach my $field (@Fields) {
next if ($field->{'selected'} ne 'yes');
next if ($field->{'name'} eq 'problem_num');
+ my $fieldformat = undef;
+ if (exists($field->{'excel_format'})) {
+ $fieldformat = $format->{$field->{'excel_format'}};
+ }
$excel_sheet->write($rows_output,$cols_output++,
- $data->{$field->{'name'}});
+ $data->{$field->{'name'}},$fieldformat);
}
$rows_output++;
+ $cols_output=0;
}
#
$excel_workbook->close();
@@ -1243,6 +1396,44 @@ sub Excel_output {
return;
}
+##
+## &write_headers
+##
+sub write_headers {
+ my ($excel_sheet,$format,$rows_output,$cols_output,$Fields) = @_;
+ ##
+ ## First the long titles
+ foreach my $field (@{$Fields}) {
+ next if ($field->{'name'} eq 'problem_num');
+ next if ($field->{'selected'} ne 'yes');
+ if (exists($field->{'long_title'})) {
+ $excel_sheet->write($$rows_output,${$cols_output},
+ $field->{'long_title'},
+ $format->{'bold'});
+ } else {
+ $excel_sheet->write($$rows_output,${$cols_output},'');
+ }
+ ${$cols_output}+= 1;
+ }
+ ${$cols_output} =0;
+ ${$rows_output}+=1;
+ ##
+ ## Then the short titles
+ 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
+ # other character sets....
+ $excel_sheet->write($$rows_output,$$cols_output,
+ $field->{'title'},
+ $format->{'bold'});
+ $$cols_output+=1;
+ }
+ ${$cols_output} =0;
+ ${$rows_output}+=1;
+ return;
+}
+
##################################################
##################################################
##
@@ -1253,9 +1444,9 @@ sub Excel_output {
sub compute_statistics_on_sequence {
my ($seq) = @_;
my @Data;
- foreach my $res (@{$seq->{'contents'}}) {
- next if ($res->{'type'} ne 'assessment');
- foreach my $part (@{$res->{'parts'}}) {
+ foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
+ foreach my $part (@{$res->parts}) {
+ next if ($res->is_survey($part));
#
# This is where all the work happens
my $data = &get_statistics($seq,$res,$part,scalar(@StatsArray)+1);
@@ -1273,9 +1464,9 @@ sub compute_all_statistics {
return;
}
my $c = $r->connection;
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ foreach my $seq (@sequences) {
last if ($c->aborted);
- next if ($seq->{'num_assess'} < 1);
+ &compute_sequence_statistics($seq);
&compute_statistics_on_sequence($seq);
}
}
@@ -1361,24 +1552,56 @@ sub get_statistics {
my ($sequence,$resource,$part,$problem_num) = @_;
#
my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
- my $symb = $resource->{'symb'};
+ my $symb = $resource->symb;
my $courseid = $ENV{'request.course.id'};
#
my $data = &Apache::loncoursedata::get_problem_statistics
(\@Apache::lonstatistics::SelectedSections,
$Apache::lonstatistics::enrollment_status,
$symb,$part,$courseid,$starttime,$endtime);
+ $data->{'symb'} = $symb;
$data->{'part'} = $part;
$data->{'problem_num'} = $problem_num;
- $data->{'container'} = $sequence->{'title'};
- $data->{'title'} = $resource->{'title'};
- $data->{'title.link'} = $resource->{'src'}.'?symb='.
- &Apache::lonnet::escape($resource->{'symb'});
+ $data->{'container'} = $sequence->compTitle;
+ $data->{'title'} = $resource->compTitle;
+ $data->{'title.link'} = $resource->src.'?symb='.
+ &Apache::lonnet::escape($resource->symb);
#
if ($SelectedFields{'deg_of_disc'}) {
$data->{'deg_of_disc'} =
&compute_discrimination_factor($resource,$part,$sequence);
}
+ #
+ # Store in metadata if computations were done for all students
+ if ($data->{'num_students'} > 1) {
+ my @Sections = @Apache::lonstatistics::SelectedSections;
+ my $sections = '"'.join(' ',@Sections).'"';
+ $sections =~ s/&+/_/g; # Ensure no special characters
+ $data->{'sections'}=$sections;
+ $data->{'course'} = $ENV{'request.course.id'};
+ my $urlres=(&Apache::lonnet::decode_symb($resource->symb))[2];
+ $data->{'urlres'}=$urlres;
+ my %storestats =
+ &LONCAPA::lonmetadata::dynamic_metadata_storage($data);
+ my ($dom,$user) = $urlres=~/^(\w+)\/(\w+)/;
+ &Apache::lonnet::put('nohist_resevaldata',\%storestats,$dom,$user);
+ }
+ #
+ $data->{'tries_per_correct'} = $data->{'tries'} /
+ ($data->{'num_solved'}+0.1);
+ #
+ # Get the due date for research purposes (commented out most of the time)
+# $data->{'duedate'} =
+# &Apache::lonnet::EXT('resource.'.$part.'.duedate',$symb);
+# $data->{'opendate'} =
+# &Apache::lonnet::EXT('resource.'.$part.'.opendate',$symb);
+# $data->{'maxtries'} =
+# &Apache::lonnet::EXT('resource.'.$part.'.maxtries',$symb);
+# $data->{'hinttries'} =
+# &Apache::lonnet::EXT('resource.'.$part.'.hinttries',$symb);
+ $data->{'weight'} =
+ &Apache::lonnet::EXT('resource.'.$part.'.weight',$symb);
+# $data->{'resptypes'} = join(',',@{$resource->{'partdata'}->{$part}->{'ResponseTypes'}});
return $data;
}
@@ -1398,19 +1621,22 @@ Returns: integer between -1 and 1
###############################################
###############################################
sub compute_discrimination_factor {
- my ($resource,$part,$sequence) = @_;
+ my ($resource,$part,$seq) = @_;
+ my $symb = $resource->symb;
my @Resources;
- foreach my $res (@{$sequence->{'contents'}}) {
- next if ($res->{'symb'} eq $resource->{'symb'});
- push (@Resources,$res->{'symb'});
+ foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)){
+ next if ($res->symb eq $symb);
+ push (@Resources,$res->symb);
}
#
# rank
+ my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
my $ranking =
&Apache::loncoursedata::rank_students_by_scores_on_resources
(\@Resources,
\@Apache::lonstatistics::SelectedSections,
- $Apache::lonstatistics::enrollment_status,undef);
+ $Apache::lonstatistics::enrollment_status,undef,
+ $starttime,$endtime);
#
# compute their percent scores on the problems in the sequence,
my $number_to_grab = int(scalar(@{$ranking})/4);
@@ -1421,10 +1647,16 @@ sub compute_discrimination_factor {
map {
$_->[&Apache::loncoursedata::RNK_student()];
} @{$ranking}[($num_students-$number_to_grab)..($num_students-1)];
+ if (! @BottomSet || (@BottomSet == 1 && $BottomSet[0] eq '') ||
+ ! @TopSet || (@TopSet == 1 && $TopSet[0] eq '')) {
+ return 'nan';
+ }
my ($bottom_sum,$bottom_max) =
- &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@BottomSet);
+ &Apache::loncoursedata::get_sum_of_scores($symb,$part,\@BottomSet,
+ undef,$starttime,$endtime);
my ($top_sum,$top_max) =
- &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@TopSet);
+ &Apache::loncoursedata::get_sum_of_scores($symb,$part,\@TopSet,
+ undef,$starttime,$endtime);
my $deg_of_disc;
if ($top_max == 0 || $bottom_max==0) {
$deg_of_disc = 'nan';
@@ -1455,11 +1687,12 @@ sub compute_discrimination_factor {
###############################################
sub compute_sequence_statistics {
my ($seq) = @_;
- my $symb = $seq->{'symb'};
+ my $symb = $seq->symb;
my @Resources;
- foreach my $res (@{$seq->{'contents'}}) {
- next if ($res->{'type'} ne 'assessment');
- push (@Resources,$res->{'symb'});
+ my $part_count;
+ foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
+ push (@Resources,$res->symb);
+ $part_count += scalar(@{$res->parts});
}
my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
#
@@ -1469,7 +1702,7 @@ sub compute_sequence_statistics {
(\@Apache::lonstatistics::SelectedSections,
$Apache::lonstatistics::enrollment_status,
\@Resources,$starttime,$endtime,undef);
- $SeqStat{$symb}->{'title'} = $seq->{'title'};
+ $SeqStat{$symb}->{'title'} = $seq->compTitle;
$SeqStat{$symb}->{'scoremax'} = $smax;
$SeqStat{$symb}->{'scoremin'} = $smin;
$SeqStat{$symb}->{'scoremean'} = $sMean;
@@ -1484,7 +1717,7 @@ sub compute_sequence_statistics {
(\@Apache::lonstatistics::SelectedSections,
$Apache::lonstatistics::enrollment_status,
\@Resources,$starttime,$endtime,undef);
- my $K = $seq->{'num_assess_parts'};
+ my $K = $part_count;
my $kr_21;
if ($K > 1 && $cSTD > 0) {
$kr_21 = ($K/($K-1)) * (1 - $cMean*($K-$cMean)/($K*$cSTD**2));
@@ -1494,10 +1727,10 @@ sub compute_sequence_statistics {
$SeqStat{$symb}->{'countmax'} = $cmax;
$SeqStat{$symb}->{'countmin'} = $cmin;
$SeqStat{$symb}->{'countstd'} = $cSTD;
+ $SeqStat{$symb}->{'countmean'} = $cMean;
$SeqStat{$symb}->{'count'} = $ccount;
$SeqStat{$symb}->{'items'} = $K;
$SeqStat{$symb}->{'KR-21'}=$kr_21;
-
return;
}