--- loncom/interface/statistics/lonproblemanalysis.pm 2004/10/15 16:50:30 1.94 +++ loncom/interface/statistics/lonproblemanalysis.pm 2004/11/02 20:45:41 1.102 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.94 2004/10/15 16:50:30 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.102 2004/11/02 20:45:41 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -148,9 +148,9 @@ sub BuildProblemAnalysisPage { $problem_data, \@Students); } elsif ($current_problem->{'resptype'} eq 'radiobutton') { - &RadioResponseAnalysis($r,$current_problem, - $problem_data, - \@Students); + &radio_response_analysis($r,$current_problem, + $problem_data, + \@Students); } elsif ($current_problem->{'resptype'} eq 'numerical') { ## ## analyze all responses of a problem at once @@ -164,7 +164,7 @@ sub BuildProblemAnalysisPage { } } } else { - $r->print('

This analysis is not supported

'); + $r->print('

Analysis of '.$current_problem->{'resptype'}.' is not supported

'); } } $r->print('
'); @@ -240,6 +240,7 @@ sub NumericalResponseAnalysis { my $height = 100; my $plot = &one_dimensional_plot($r,500,100,scalar(@$Students), \@Labels,\@PlotData); + $r->print($plot); return; } @@ -375,53 +376,13 @@ sub build_student_data_worksheet { ## ######################################################### ######################################################### -sub RadioResponseAnalysis { +sub radio_response_analysis { my ($r,$problem,$problem_analysis,$students) = @_; - if ($ENV{'form.AnalyzeOver'} eq 'tries') { - &RR_tries_analysis($r,$problem,$problem_analysis,$students); - } elsif ($ENV{'form.AnalyzeOver'} eq 'time') { - &RR_static_time_analysis($r,$problem,$problem_analysis,$students); - } else { + # + if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) { $r->print('Bad request'); } - return; -} - -sub RR_computed_tries_analysis { - my ($r,$problem,$problem_analysis) = @_; - my ($resource,$partid,$respid) = ($problem->{'resource'}, - $problem->{'part'}, - $problem->{'respid'}); - $r->print('The tries answer you seek must be computed'); - # Gather student data - # for each try - # loop through data, classifying it by - # correct foil -> selected foil - # if there is concept data - # make a concept correct plot - # for each correct foil - # make a plot of the data -} - -sub RR_computed_time_analysis { - my ($r,$problem,$problem_analysis) = @_; - my ($resource,$partid,$respid) = ($problem->{'resource'}, - $problem->{'part'}, - $problem->{'respid'}); - $r->print('The time answer you seek must be computed'); - # Gather student data - # for time division - # limit to between start time & end time - # loop through data, classifying it by - # correct foil -> selected foil - # if there is concept data - # make a concept correct plot - # for each correct foil - # make a plot of the data -} - -sub RR_tries_analysis { - my ($r,$problem,$problem_analysis,$students) = @_; + # my ($resource,$partid,$respid) = ($problem->{'resource'}, $problem->{'part'}, $problem->{'respid'}); @@ -429,6 +390,18 @@ sub RR_tries_analysis { my $analysis_html; my $foildata = $problem_analysis->{'_Foils'}; my ($table,$foils,$concepts) = &build_foil_index($problem_analysis); + # + my %true_foils; + my $num_true = 0; + if (! $problem_analysis->{'answercomputed'}) { + foreach my $foil (@$foils) { + if ($foildata->{$foil}->{'value'} eq 'true') { + $true_foils{$foil}++; + } + } + $num_true = scalar(keys(%true_foils)); + } + # $analysis_html .= $table; # Gather student data my $response_data = &Apache::loncoursedata::get_response_data @@ -451,12 +424,11 @@ sub RR_tries_analysis { foreach my $foil (keys(%$foildata)) { if ($foildata->{$foil}->{'value'} eq 'true') { $correct = $foildata->{$foil}->{'name'}; - last; } } } - if (! defined($response_data) || - ref($response_data) ne 'ARRAY' ) { + # + if (! defined($response_data) || ref($response_data) ne 'ARRAY' ) { $analysis_html = '

'. &mt('There is no submission data for this resource'). '

'; @@ -465,12 +437,58 @@ sub RR_tries_analysis { } # $analysis_html.=''; - for (my $try = 1;$try<=$ENV{'form.NumPlots'};$try++) { + for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) { # classify data ->correct foil -> selected foil - my $attempt_restriction_function = - my $foil_choice_data = + my ($restriction_function, + $correct_foil_title,$incorrect_foil_title, + $pre_graph_text,$post_graph_text, + $no_data_text,@extra_data); + if ($ENV{'form.AnalyzeOver'} eq 'tries') { + $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)}; + $correct_foil_title = 'Attempt '.$plot_num; + $incorrect_foil_title = 'Attempt '.$plot_num; + $pre_graph_text = + 'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect'; + $post_graph_text = ''; + $no_data_text = 'No data exists for attempt [_1]'; + } elsif ($ENV{'form.AnalyzeOver'} eq 'time') { + my $starttime = &Apache::lonhtmlcommon::get_date_from_form + ('startdate_'.$plot_num); + my $endtime = &Apache::lonhtmlcommon::get_date_from_form + ('enddate_'.$plot_num); + ($starttime,$endtime) = &ensure_start_end_times + ($starttime,$endtime, + &get_time_from_row($response_data->[0]), + &get_time_from_row($response_data->[-1]), + $plot_num); + $pre_graph_text = + 'Data from [_6] to [_7]
[_2] submissions from [_5] students, [_3] correct, [_4] incorrect'; + $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime); + $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime); + # + $post_graph_text = + &mt('Start time: [_1]', + &Apache::lonhtmlcommon::date_setter + ('Statistics','startdate_'.$plot_num,$starttime)). + '
'. + &mt('End time: [_1]', + &Apache::lonhtmlcommon::date_setter + ('Statistics','enddate_'.$plot_num,$endtime)); + $restriction_function = + sub { + my $t = $_[0]->{'timestamp'}; + if ($t >= $starttime && $t < $endtime) { + return 1; + } else { + return 0; + } + }; + $no_data_text = 'No data for [_5] to [_6]'; + } + my $foil_choice_data = &RR_classify_response_data($response_data,$correct, - sub {($_[0]->{'tries'} == $try?1:0)}); + $restriction_function); + # &Apache::lonstathelpers::log_hash_ref($foil_choice_data); my $answers; if (ref($correct)) { my %tmp; @@ -485,36 +503,84 @@ sub RR_tries_analysis { my $concept_plot = ''; if (scalar(@$concepts) > 1) { $concept_plot = &RR_concept_plot($concepts,$foil_choice_data, - '% choosing'); + 'Correct Concepts'); } # % Choosing plot my $choice_plot = &RR_create_percent_selected_plot - ($foils,$foil_choice_data,'Attempt '.$try); + ($concepts,$foils,$foil_choice_data,$correct_foil_title); # for each correct foil, how did they mark it? (stacked bar graph) - my ($stacked_plot,$count_by_foil) = - &RR_create_stacked_selection_plot($foils,$foil_choice_data,''); + my ($stacked_plot,$count_by_foil); + if ($problem_analysis->{'answercomputed'} || $num_true > 1) { + ($stacked_plot,$count_by_foil) = + &RR_create_stacked_selection_plot($foils,$foil_choice_data, + $incorrect_foil_title, + \%true_foils); + } # if ($concept_plot ne '' || - $choice_plot ne '' || + $choice_plot ne '' || $stacked_plot ne '') { + my $correct = $foil_choice_data->{'_correct'}; + if (! defined($correct) || $correct eq '') { + $correct = 0; + } + my $incorrect = + $analysis_html.= ''.$/; $analysis_html.= ''. ''. ''; if ($stacked_plot ne '') { $analysis_html .= - ''. - ''; + ''. + ''; } else { $analysis_html .= (''x2); } $analysis_html.=''.$/; + if (defined($post_graph_text)) { + $analysis_html.= ''.$/; + } + } elsif ($no_data_text ne '') { + $analysis_html.=''.$/; } - } + } # end of loop for plots $analysis_html.='
'. + ''. + &mt($pre_graph_text, + $plot_num,$foil_choice_data->{'_count'}, + $correct, + $foil_choice_data->{'_count'}-$correct, + $foil_choice_data->{'_students'}, + @extra_data). + '
'.$concept_plot.''.$choice_plot.''.$stacked_plot.''.&build_foil_key($foils,$count_by_foil).''.$stacked_plot.''.&build_foil_key($foils,$count_by_foil).'
'. + $post_graph_text.'
'. + &mt($no_data_text, + $plot_num,$foil_choice_data->{'_count'}, + $correct, + $foil_choice_data->{'_count'}-$correct, + @extra_data); + if (defined($post_graph_text)) { + $analysis_html.='
'.$post_graph_text; + } + $analysis_html.='
'; $r->print($analysis_html); } +sub ensure_start_end_times { + my ($start,$end,$first,$last,$plot_num) = @_; + if (! defined($start) || ! defined($end)) { + my $sec_in_day = 86400; + my ($sday,$smon,$syear) = + (localtime($last - $sec_in_day*($plot_num-1)))[3..5]; + $start = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear); + $end = $start + $sec_in_day; + if ($plot_num == $ENV{'form.NumPlots'}) { + $start = $first; + } + } + return ($start,$end); +} sub RR_concept_plot { my ($concepts,$foil_data,$title) = @_; @@ -554,7 +620,6 @@ sub RR_concept_plot { $correct[$i] = sprintf('%0f',$correct[$i]/$total*100); } my $xlabel = 'concept'; - $title.= ' (N='.$total.')'; my $plot= &Apache::loncommon::DrawBarGraph($title, $xlabel, 'Percent Choosing', @@ -565,18 +630,21 @@ sub RR_concept_plot { return $plot; } - sub RR_create_percent_selected_plot { - my ($foils,$foil_data,$title) = @_; + my ($concepts,$foils,$foil_data,$title) = @_; # - my %foil_selections; - my %true; + if ($foil_data->{'_count'} == 0) { return ''; }; + my %correct_selections; + my %incorrect_selections; foreach my $foil (@$foils) { - # foil_data has format $foil_data->{true_foil}->{selected foil} + # foil_data has format $foil_data->{true_foil}->{selected foil}=count next if (! exists($foil_data->{$foil})); - $true{$foil}++; while (my ($f,$count)= each(%{$foil_data->{$foil}})) { - $foil_selections{$f}+=$count; + if ($f eq $foil) { + $correct_selections{$foil} += $count; + } else { + $incorrect_selections{$f} += $count; + } } } # @@ -585,59 +653,77 @@ sub RR_create_percent_selected_plot { my @correct; my @incorrect; # - my $total =0; + my $total = $foil_data->{'_count'}; for (my $i=0;$i[$i]; - if ($true{$foil}) { - $correct[$i] = $foil_selections{$foil}; - $incorrect[$i] = 0; - } else { - $correct[$i] = 0; - $incorrect[$i] = $foil_selections{$foil}; - } - $total+=$foil_selections{$foil}; + $correct[$i] = $correct_selections{$foil}; + $incorrect[$i] = $incorrect_selections{$foil}; } - if ($total == 0) { return ''; }; for (my $i=0;$i<=$#correct;$i++) { - $correct[$i] = sprintf('%0f',$correct[$i]/$total*100); + $correct[$i] = sprintf('%2f',$correct[$i]/$total*100); } for (my $i=0;$i<=$#incorrect;$i++) { - $incorrect[$i] = sprintf('%0f',$incorrect[$i]/$total*100); + $incorrect[$i] = sprintf('%2f',$incorrect[$i]/$total*100); + } + # + # Put a blank in the data sets between concepts, if there are concepts + my @labels; + if (defined($concepts) && scalar(@$concepts) > 1) { + my @new_correct; + my @new_incorrect; + my $foil_count = 0; + foreach my $concept (@$concepts) { + foreach (@{$concept->{'foils'}}) { + push(@new_correct, $correct[$foil_count]); + push(@new_incorrect,$incorrect[$foil_count]); + push(@labels,++$foil_count); + } + push(@new_correct,''); + push(@new_incorrect,''); + push(@labels,''); + } + @correct = @new_correct; + @incorrect = @new_incorrect; + } else { + @labels = (1 .. scalar(@correct)); } + # my $xlabel = 'foil chosen'; - $title.= ' (N='.$total.')'; my $plot= &Apache::loncommon::DrawBarGraph($title, $xlabel, 'Percent Choosing', 100, ['#33ff00','#ff3300'], - undef, + \@labels, \@correct, \@incorrect); return $plot; } - sub RR_create_stacked_selection_plot { - my ($foils,$foil_data,$title)=@_; + my ($foils,$foil_data,$title,$true_foils)=@_; # - my @correct_choice; # the green row - my @dataset; # array of array refs - multicolor rows. - my %filled; + my @dataset; # array of array refs - multicolor rows $datasets[row]->[col] my @labels; - my $count=-1; - my %column; + my $count; + my %column; # maps foil name to column in @datasets for (my $i=0;$i[$i]; + if (defined($true_foils) && scalar(keys(%$true_foils)) > 0 ) { + next if (! $true_foils->{$foil} ); + push(@labels,$i+1); + } else { + next if (! exists($foil_data->{$foil})); + push(@labels,$i+1); + } next if (! exists($foil_data->{$foils->[$i]})); - my $correct_foil = $foils->[$i]; - push(@labels,$i+1); - $column{$correct_foil}= ++$count; + $column{$foil}= $count++; for (my $j=0;$j{$correct_foil}->{$foils->[$j]}; + $value += $foil_data->{$foil}->{$foils->[$j]}; } - $dataset[$j]->[$column{$correct_foil}]=$value; + $dataset[$j]->[$column{$foil}]=$value; } } # @@ -655,7 +741,7 @@ sub RR_create_stacked_selection_plot { $dataset[$j]->[$bar] = sprintf('%2f',$dataset[$j]->[$bar]/$bar_total * 100); } - $count_per_foil{$foil}=' (N='.$bar_total.')'; + $count_per_foil{$foil}=' ( '.$bar_total.' )'; $grand_total += $bar_total; } if ($grand_total == 0) { @@ -666,19 +752,18 @@ sub RR_create_stacked_selection_plot { push(@empty_row,0); } # - $title .= ' (N='.$grand_total.')'; my $graph = &Apache::loncommon::DrawBarGraph ($title,'Correct Foil','foils chosen Incorrectly', 100,$plotcolors,\@labels,\@empty_row,@dataset); return ($graph,\%count_per_foil); } - # if $correct is a hash ref, it is assumed to be indexed by student names. # the values are assumed to be hash refs with a key of 'answer'. sub RR_classify_response_data { my ($full_row_data,$correct,$function) = @_; my %submission_data; + my %students; foreach my $row (@$full_row_data) { my %subm = &hashify_attempt($row); if (ref($correct) eq 'HASH') { @@ -688,199 +773,18 @@ sub RR_classify_response_data { } $subm{'submission'} =~ s/=\d+\s*$//; if (&$function(\%subm)) { + $students{$subm{'student'}}++; + $submission_data{'_count'}++; + if (&submission_is_correct($subm{'award'})) { + $submission_data{'_correct'}++; + } $submission_data{$subm{'correct'}}->{$subm{'submission'}}++; } } + $submission_data{'_students'}=scalar(keys(%students)); return \%submission_data; } -sub RR_static_time_analysis { - my ($r,$problem,$problem_analysis) = @_; - my ($resource,$partid,$respid) = ($problem->{'resource'}, - $problem->{'part'}, - $problem->{'respid'}); - $r->print('

The time answer you seek is static

'); - my $analysis_html; - # Gather student data - my $response_data = &Apache::loncoursedata::get_response_data - (\@Apache::lonstatistics::SelectedSections, - $Apache::lonstatistics::enrollment_status, - $resource->{'symb'},$respid); - if (! defined($response_data) || - ref($response_data) ne 'ARRAY' ) { - $analysis_html = '

'. - &mt('There is no submission data for this resource'). - '

'; - $r->print($analysis_html); - return; - } - # for time division - - # limit to between start time & end time - # loop through data, classifying it by - # correct foil -> selected foil - # if there is concept data - # make a concept correct plot - # for each correct foil - # make a plot of the data - -} - - -=pod - - - } elsif ($ENV{'form.AnalyzeOver'} eq 'tries') { - $analysis_html .= &RR_tries_Analysis($r,$problem->{'resource'}, - $PerformanceData,$problem_data); - } elsif ($ENV{'form.AnalyzeOver'} eq 'time') { - $analysis_html .= &RR_time_Analysis($r,$problem->{'resource'}, - $PerformanceData,$problem_data); - } else { - $analysis_html .= '

'. - &mt('The analysis you have selected is not supported at this time'). - '

'; - } - $r->print($analysis_html); -} - -sub RR_Excel_output { - my ($r,$PerformanceData,$problem_data) = @_; - return '

No!

'; -} - -sub RR_tries_Analysis { - my ($r,$resource,$PerformanceData,$problem_data) = @_; - my $analysis_html; - my $mintries = 1; - my $maxtries = $ENV{'form.NumPlots'}; - my ($table,$Foils,$Concepts) = &build_foil_index($problem_data); - if ((! defined($Concepts)) || (@$Concepts < 2)) { - $table = '

'. - &mt('Not enough data for concept analysis. '. - 'Performing Foil Analysis'). - '

'.$table; - } - $analysis_html .= $table; - my @TryData = &RR_tries_data_analysis($r,$PerformanceData); - $analysis_html .= &RR_tries_Foil_Analysis($mintries,$maxtries,$Foils, - \@TryData,$problem_data); - return $analysis_html; -} - -sub RR_tries_data_analysis { - my ($r,$Attempt_data) = @_; - my @TryData; - foreach my $attempt (@$Attempt_data) { - my %Attempt = &hashify_attempt($attempt); - my ($answer,undef) = split('=',$Attempt{'submission'}); - $TryData[$Attempt{'tries'}]->{$answer}++; - } - return @TryData; -} - -sub RR_time_Analysis { - my ($r,$PerformanceData,$problem_data) = @_; - my $html; - return $html; -} - -sub RR_tries_Foil_Analysis { - my ($min,$max,$Foils,$TryData,$problem_data) = @_; - my $html; - # - # Compute the data neccessary to make the plots - for (my $try=$min;$try<=$max;$try++) { - my @PlotData_Correct; - my @PlotData_Incorrect; - next if ($try > scalar(@{$TryData})); - next if (! defined($TryData->[$try])); - my %DataSet = %{$TryData->[$try]}; - my $total = 0; - foreach my $foilid (@$Foils) { - $total += $DataSet{$foilid}; - } - foreach my $foilid (@$Foils) { - if ($total == 0) { - push (@PlotData_Correct,0); - push (@PlotData_Incorrect,0); - } else { - if ($problem_data->{'_Foils'}->{$foilid}->{'value'} eq 'true') { - push (@PlotData_Correct, - int(100*$DataSet{$foilid}/$total)); - push (@PlotData_Incorrect,0); - } else { - push (@PlotData_Correct,0); - push (@PlotData_Incorrect, - int(100*$DataSet{$foilid}/$total)); - } - } - } - my $title='Attempt '.$try.' (N='.$total.')'; - my $xlabel = 'Foil Chosen'; - $html.= &Apache::loncommon::DrawBarGraph($title, - $xlabel, - 'Percent Choosing', - 100, - ['#33ff00','#ff3300'], - undef, - \@PlotData_Correct, - \@PlotData_Incorrect); - } - return $html; -} - -sub RR_tries_Concept_Analysis { - my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_; - my $html; - return $html; -} - -sub RR_time_Foil_Analysis { - my ($min,$max,$Foils,$ResponseData,$problem_data) = @_; - my $html; - return $html; -} - -sub RR_time_Concept_Analysis { - my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_; - my $html; - return $html; -} - - -sub get_Radio_problem_data { - my ($url) = @_; - my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze')); - (my $garbage,$Answ)=split('_HASH_REF__',$Answ,2); - my %Answer = &Apache::lonnet::str2hash($Answ); - my %Partdata; - foreach my $part (@{$Answer{'parts'}}) { - while (my($key,$value) = each(%Answer)) { -# if (ref($value) eq 'ARRAY') { -# &Apache::lonnet::logthis('is ref part:'.$part.' '.$key.'='.join(',',@$value)); -# } else { -# &Apache::lonnet::logthis('notref part:'.$part.' '.$key.'='.$value); -# } - next if ($key !~ /^$part/); - $key =~ s/^$part\.//; - if ($key eq 'foils') { - $Partdata{$part}->{'_Foils'}=$value; - } elsif ($key eq 'options') { - $Partdata{$part}->{'_Options'}=$value; - } elsif ($key eq 'shown') { - $Partdata{$part}->{'_Shown'}=$value; - } elsif ($key =~ /^foil.value.(.*)$/) { - $Partdata{$part}->{$1}->{'value'}=$value; - } elsif ($key =~ /^foil.text.(.*)$/) { - $Partdata{$part}->{$1}->{'text'}=$value; - } - } - } - return %Partdata; -} - -=cut ######################################################### ######################################################### @@ -993,7 +897,7 @@ sub OR_tries_analysis { } # End of concept loops # # Build a table for the plots - my $analysis_html = "\n"; + my $analysis_html = "
\n"; my $optionkey = &build_option_index($ORdata); my $num_concepts = 1; if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); } @@ -1028,17 +932,14 @@ sub OR_tries_analysis { } } # - my $title; - my $count = $response_data{'_total'}->[$try]; - $title = 'Attempt '.$try.' (N='.$count.')'; $concept_graph = &Apache::loncommon::DrawBarGraph - ($title,'Concept Number','Percent Correct', + ('Correct Concepts','Concept Number','Percent Correct', 100,$plotcolors,undef,\@concept_plot_data); } # # Create Foil Plots - my $count = $response_data{'_total'}->[$try]; - my $title = 'Attempt '.$try.' (N='.$count.')'; + my $data_count = $response_data{'_total'}->[$try]; + my $correct = $response_data{'_correct'}->[$try]; my @Datasets; foreach my $option ('_correct',@{$ORdata->{'_Options'}}) { next if (! exists($foil_plot[$try]->{$option})); @@ -1070,7 +971,7 @@ sub OR_tries_analysis { } # my $correct_graph = &Apache::loncommon::DrawBarGraph - ($title,'Foil Number','Percent Correct', + ('Correct Statements','Statement','% Answered Correct', 100,$plotcolors,\@Labels,$Datasets[0]); # @@ -1079,13 +980,17 @@ sub OR_tries_analysis { for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) { $Datasets[0]->[$i]=0; } - $count = $response_data{'_total'}->[$try] - + my $count = $response_data{'_total'}->[$try] - $response_data{'_correct'}->[$try]; - $title = 'Attempt '.$try.' (N='.$count.')'; my $incorrect_graph = &Apache::loncommon::DrawBarGraph - ($title,'Foil Number','% Option Chosen Incorrectly', + ('Incorrect Statements','Statement','% Chosen Incorrectly', 100,$plotcolors,\@Labels,@Datasets); $analysis_html.= + ''.$/. ''. ''. ''. @@ -1103,11 +1008,14 @@ sub OR_analyze_by_tries { my %Trydata; $mintries = 1 if (! defined($mintries) || $mintries < 1); $maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries); + my @students; foreach my $row (@$PerformanceData) { next if (! defined($row)); my $tries = &get_tries_from_row($row); my %Row = &Process_OR_Row($row); next if (! %Row); + my $student_id = $row->[&Apache::loncoursedata::RD_student_id()]; + $students[$tries]->{$student_id}++; while (my ($foilid,$href) = each(%Row)) { if (! ref($href)) { $Trydata{$foilid}->[$tries] += $href; @@ -1118,6 +1026,9 @@ sub OR_analyze_by_tries { } } } + for (my $try=$mintries;$try<=$maxtries;$try++) { + $Trydata{'_studentcount'}->[$try] = scalar(keys(%{$students[$try]})); + } return %Trydata; } @@ -1142,8 +1053,8 @@ sub OR_time_analysis { # my $num_plots = $ENV{'form.NumPlots'}; my $num_data = scalar(@$performance_data)-1; - my $percent = sprintf('%2f',100/$num_plots); # + my $current_index; $table .= "
'. + ''. + &mt('Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect', + $try,$data_count,$correct,$data_count-$correct). + ''.'
'.$concept_graph.''.$correct_graph.'
\n"; for (my $i=0;$i<$num_plots;$i++) { ## @@ -1154,19 +1065,19 @@ sub OR_time_analysis { if (! defined($starttime) || ! defined($endtime)) { my $sec_in_day = 86400; my $last_sub_time = &get_time_from_row($performance_data->[-1]); - my ($sday,$smon,$syear); - (undef,undef,undef,$sday,$smon,$syear) = - localtime($last_sub_time - $sec_in_day*$i); + my ($sday,$smon,$syear) = + (localtime($last_sub_time - $sec_in_day*$i))[3..5]; $starttime = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear); $endtime = $starttime + $sec_in_day; if ($i == ($num_plots -1 )) { $starttime = &get_time_from_row($performance_data->[0]); } } - $table .= ''.$/; + &Apache::lonlocal::locallocaltime($endtime)). + ''.$/; my $startdateform = &Apache::lonhtmlcommon::date_setter ('Statistics','startdate_'.$i,$starttime); my $enddateform = &Apache::lonhtmlcommon::date_setter @@ -1189,33 +1100,32 @@ sub OR_time_analysis { } $end_index = $j; ## - my $interval = { - begin_index => $begin_index, - end_index => $end_index, - startdateform => $startdateform, - enddateform => $enddateform, - }; + my ($processed_time_data,$correct,$data_count,$student_count) = + &OR_time_process_data($performance_data,$begin_index,$end_index); + ## + $table .= ''.$/; my $concept_correct_plot = ''; if ($num_concepts > 1) { $concept_correct_plot = - &OR_Concept_Time_Analysis($performance_data, - $ORdata,$Concepts, - $interval); + &OR_Concept_Time_Analysis($processed_time_data, + $correct,$data_count,$student_count, + $ORdata,$Concepts); } my ($foil_correct_plot,$foil_incorrect_plot) = - &OR_Foil_Time_Analysis($performance_data,$ORdata, - $Foils,$Concepts,$interval); + &OR_Foil_Time_Analysis($processed_time_data, + $correct,$data_count,$student_count, + $ORdata,$Foils,$Concepts); $table .= ''. ''. ''. ''. ''.$/; $table .= ''.$/; + &mt('Start time: [_1]',$startdateform).'
'. + &mt('End time: [_1]',$enddateform).''.$/; $table.= ''.$/; } $table .= '
'. + $table .= '
'. &mt('Data from [_1] to [_2]', &Apache::lonlocal::locallocaltime($starttime), - &Apache::lonlocal::locallocaltime($endtime)).'
'. + &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect', + $data_count,$student_count,$correct,$data_count-$correct). + '
'.$concept_correct_plot.''.$foil_correct_plot.''.$foil_incorrect_plot.''.$foilkey.'
'. - &mt('Start time: [_1]', - $interval->{'startdateform'}).'
'. - &mt('End time: [_1]', - $interval->{'enddateform'}). - '
 
'; @@ -1224,47 +1134,32 @@ sub OR_time_analysis { } sub OR_Foil_Time_Analysis { - my ($performance_data,$ORdata,$Foils,$Concepts,$interval) = @_; - my $analysis_html; - my ($begin_index,$end_index) = ($interval->{'begin_index'}, - $interval->{'end_index'}); - my %TimeData; - # - # Compute the number getting the foils correct or incorrects - for (my $j=$begin_index;$j<=$end_index;$j++) { - my $row = $performance_data->[$j]; - next if (! defined($row)); - my %Row = &Process_OR_Row($row); - while (my ($foilid,$href) = each(%Row)) { - if (! ref($href)) { - $TimeData{$foilid} += $href; - next; - } - while (my ($option,$value) = each(%$href)) { - $TimeData{$foilid}->{$option}+=$value; - } - } + my ($processed_time_data,$correct,$data_count,$student_count, + $ORdata,$Foils,$Concepts) = @_; + if ($data_count <= 0) { + return ('

'.&mt('There is no data to plot').'

',''); } + my $analysis_html; my @plotdata; my @labels; foreach my $concept (@{$Concepts}) { foreach my $foil (@{$concept->{'foils'}}) { push(@labels,scalar(@labels)+1); - my $total = $TimeData{$foil}->{'_total'}; + my $total = $processed_time_data->{$foil}->{'_total'}; if ($total == 0) { push(@{$plotdata[0]},0); } else { push(@{$plotdata[0]}, - 100 * $TimeData{$foil}->{'_correct'} / $total); + 100 * $processed_time_data->{$foil}->{'_correct'} / $total); } - my $total_incorrect = $total - $TimeData{$foil}->{'_correct'}; + my $total_incorrect = $total - $processed_time_data->{$foil}->{'_correct'}; for (my $i=0;$i{'_Options'}});$i++) { my $option = $ORdata->{'_Options'}->[$i]; if ($total_incorrect == 0) { push(@{$plotdata[$i+1]},0); } else { push(@{$plotdata[$i+1]}, - 100 * $TimeData{$foil}->{$option} / $total_incorrect); + 100 * $processed_time_data->{$foil}->{$option} / $total_incorrect); } } } @@ -1277,77 +1172,39 @@ sub OR_Foil_Time_Analysis { } # # Create the plot - my $count = $end_index-$begin_index; - return ('No data','') if ($count <= 0); - my $title; - if ($count == 0) { - $title = 'no submissions'; - } elsif ($count == 1) { - $title = 'one submission'; - } elsif ($count > 1) { - $title = $count.' submissions'; - } - my $correct_plot = &Apache::loncommon::DrawBarGraph($title, - 'Foil Number', - 'Percent Correct', - 100, - $plotcolors, - undef, - $plotdata[0]); + my $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements', + 'Statement Number', + 'Percent Correct', + 100, + $plotcolors, + undef, + $plotdata[0]); for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) { $plotdata[0]->[$j]=0; } - $count = $end_index-$begin_index-$TimeData{'_correct'}; - if ($count == 0) { - $title = 'no submissions'; - } elsif ($count < 0) { - return ($correct_plot,''); - } elsif ($count == 1) { - $title = 'one submission'; - } else { - $title = $count.' submissions'; - } - my $incorrect_plot = &Apache::loncommon::DrawBarGraph($title, - 'Foil Number', - 'Incorrect Option Choice', - 100, - $plotcolors, - undef, - @plotdata); + my $incorrect_plot = + &Apache::loncommon::DrawBarGraph('Incorrect Statements', + 'Statement Number', + 'Incorrect Option Choice', + 100, + $plotcolors, + undef, + @plotdata); return ($correct_plot,$incorrect_plot); } sub OR_Concept_Time_Analysis { - my ($performance_data,$ORdata,$Concepts,$interval) = @_; - ## - ## Determine starttime, endtime, startindex, endindex - my ($begin_index,$end_index) = ($interval->{'begin_index'}, - $interval->{'end_index'}); - my %TimeData; - # - # Compute the number getting the foils correct or incorrects - for (my $j=$begin_index;$j<=$end_index;$j++) { - my $row = $performance_data->[$j]; - next if (! defined($row)); - my %Row = &Process_OR_Row($row); - while (my ($foilid,$href) = each(%Row)) { - if (! ref($href)) { - $TimeData{$foilid} += $href; - next; - } - while (my ($option,$value) = each(%$href)) { - $TimeData{$foilid}->{$option}+=$value; - } - } - } + my ($processed_time_data,$correct,$data_count,$student_count, + $ORdata,$Concepts) = @_; + return '' if ($data_count == 0); # # Put the data in plottable form my @plotdata; foreach my $concept (@$Concepts) { my ($total,$correct); foreach my $foil (@{$concept->{'foils'}}) { - $total += $TimeData{$foil}->{'_total'}; - $correct += $TimeData{$foil}->{'_correct'}; + $total += $processed_time_data->{$foil}->{'_total'}; + $correct += $processed_time_data->{$foil}->{'_correct'}; } if ($total == 0) { push(@plotdata,0); @@ -1357,8 +1214,7 @@ sub OR_Concept_Time_Analysis { } # # Create the plot - my $title = ($end_index - $begin_index).' submissions'; - return &Apache::loncommon::DrawBarGraph($title, + return &Apache::loncommon::DrawBarGraph('Correct Concepts', 'Concept Number', 'Percent Correct', 100, @@ -1367,6 +1223,44 @@ sub OR_Concept_Time_Analysis { \@plotdata); } +sub OR_time_process_data { + my ($performance_data,$begin_index,$end_index)=@_; + my %processed_time_data; + my %distinct_students; + my ($correct,$data_count); + if (($begin_index == $end_index) && + ($end_index != scalar(@$performance_data)-1)) { + return undef; + } + # Be sure we include the last one if we are asked for it. + # That we have to correct here (and not when $end_index is + # given a value) should probably be considered a bug. + if ($end_index == scalar(@$performance_data)-1) { + $end_index++; + } + my $count; + for (my $i=$begin_index;$i<$end_index;$i++) { + my $attempt = $performance_data->[$i]; + $count++; + next if (! defined($attempt)); + my %attempt = &Process_OR_Row($attempt); + $data_count++; + $correct += $attempt{'_correct'}; + $distinct_students{$attempt->[&Apache::loncoursedata::RD_student_id()]}++; + while (my ($foilid,$href) = each(%attempt)) { + if (! ref($href)) { + $processed_time_data{$foilid} += $href; + next; + } + while (my ($option,$value) = each(%$href)) { + $processed_time_data{$foilid}->{$option}+=$value; + } + } + } + return (\%processed_time_data,$correct,$data_count, + scalar(keys(%distinct_students))); +} + ######################################################### ######################################################### ## @@ -1671,10 +1565,11 @@ sub build_option_index { my $optionindex = 0; my @Rows; foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) { + my $color = $plotcolors->[$optionindex++]; push (@Rows, ''. - ''. - (' 'x4).''. + ''. + ''.('*'x3).''.''. ''.&HTML::Entities::encode($option,'<>&"').''. "\n"); } @@ -1690,10 +1585,11 @@ sub build_foil_key { my $foil_index = 0; my @rows; foreach my $foil (&mt('correct foil chosen'),@{$foils}) { + my $color = $plotcolors->[$foil_index++]; push (@rows, ''. - ''. - (' 'x4).''. + ''. + ''.('*'x4).''. ''.&HTML::Entities::encode($foil,'<>&"'). (' 'x2).$extra_data->{$foil}.''. "\n"); @@ -1846,14 +1742,14 @@ sub hashify_attempt { sub Process_OR_Row { my ($row) = @_; my %RowData; - my $student_id = $row->[&Apache::loncoursedata::RD_student_id()]; +# my $student_id = $row->[&Apache::loncoursedata::RD_student_id()]; my $award = $row->[&Apache::loncoursedata::RD_awarddetail()]; my $grading = $row->[&Apache::loncoursedata::RD_response_eval()]; my $submission = $row->[&Apache::loncoursedata::RD_submission()]; my $time = $row->[&Apache::loncoursedata::RD_timestamp()]; - my $tries = $row->[&Apache::loncoursedata::RD_tries()]; +# my $tries = $row->[&Apache::loncoursedata::RD_tries()]; return undef if ($award eq 'MISSING_ANSWER'); - if ($award =~ /(APPROX_ANS|EXACT_ANS)/) { + if (&submission_is_correct($award)) { $RowData{'_correct'} = 1; } $RowData{'_total'} = 1; @@ -1874,6 +1770,15 @@ sub Process_OR_Row { return %RowData; } +sub submission_is_correct { + my ($award) = @_; + if ($award =~ /(APPROX_ANS|EXACT_ANS)/) { + return 1; + } else { + return 0; + } +} + 1; __END__