--- loncom/interface/statistics/lonproblemanalysis.pm 2005/02/23 02:03:42 1.115 +++ loncom/interface/statistics/lonproblemanalysis.pm 2006/02/04 19:06:53 1.124 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.115 2005/02/23 02:03:42 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.124 2006/02/04 19:06:53 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,7 +27,7 @@ package Apache::lonproblemanalysis; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::loncoursedata(); @@ -73,7 +73,7 @@ sub BuildProblemAnalysisPage { # my @Students = @Apache::lonstatistics::Students; # - if (@Students < 1 && exists($ENV{'form.firstrun'})) { + if (@Students < 1 && exists($env{'form.firstrun'})) { $r->print('

There are no students in the sections selected

'); } # @@ -82,8 +82,8 @@ sub BuildProblemAnalysisPage { $r->rflush(); # my $problem_types = '(option|radiobutton|numerical)'; - if (exists($ENV{'form.problemchoice'}) && - ! exists($ENV{'form.SelectAnother'})) { + if (exists($env{'form.problemchoice'}) && + ! exists($env{'form.SelectAnother'})) { foreach my $button (@SubmitButtons) { if ($button->{'name'} eq 'break') { $r->print("
\n"); @@ -97,47 +97,51 @@ sub BuildProblemAnalysisPage { $r->print($html.(' 'x5)); } # - $r->print(&Apache::lonstathelpers::submission_report_form - ('problem_analysis')); + + # This is commented out pending actual implementation of + # CSV and Excel output. + #$r->print(&Apache::lonstathelpers::submission_report_form + # ('problem_analysis')); # $r->print('
'); $r->rflush(); # # Determine which problem we are to analyze my $current_problem = &Apache::lonstathelpers::get_target_from_id - ($ENV{'form.problemchoice'}); + ($env{'form.problemchoice'}); # - my ($prev,$curr,$next) = + my ($navmap,$prev,$curr,$next) = &Apache::lonstathelpers::get_prev_curr_next($current_problem, $problem_types, 'response', ); - if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) { + if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) { $current_problem = $prev; - } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) { + } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) { $current_problem = $next; } else { $current_problem = $curr; } # # Store the current problem choice and send it out in the form - $ENV{'form.problemchoice'} = + $env{'form.problemchoice'} = &Apache::lonstathelpers::make_target_id($current_problem); $r->print(''); + $env{'form.problemchoice'}.'" />'); # if (! defined($current_problem->{'resource'})) { $r->print('resource is undefined'); } else { my $resource = $current_problem->{'resource'}; - $r->print('

'.$resource->{'title'}.'

'); - $r->print('

'.$resource->{'src'}.'

'); - if ($ENV{'form.show_prob'} eq 'true') { + $r->print('

'.$resource->compTitle.'

'); + $r->print('

'.$resource->src.'

'); + $r->print('

'.&Apache::lonstatistics::section_and_enrollment_description().'

'); + if ($env{'form.show_prob'} eq 'true') { $r->print(&Apache::lonstathelpers::render_resource($resource)); } $r->rflush(); my %Data = &Apache::lonstathelpers::get_problem_data - ($resource->{'src'}); + ($resource->src); my $problem_data = $Data{$current_problem->{'part'}. '.'. $current_problem->{'respid'}}; @@ -158,12 +162,14 @@ sub BuildProblemAnalysisPage { } $r->print('
'); } else { - $r->print(''); + my $submit_button = ''; + $r->print($submit_button); $r->print(' 'x5); $r->print('

'.&mt('Please select a problem to analyze').'

'); - $r->print(&Apache::lonstathelpers::ProblemSelector - ($problem_types)); + $r->print(&Apache::lonstathelpers::problem_selector($problem_types, + $submit_button)); } } @@ -178,7 +184,7 @@ sub numerical_response_analysis { my ($r,$problem,$problem_analysis,$students) = @_; my $c = $r->connection(); # - if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) { + if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) { $r->print('Bad request'); } # @@ -187,9 +193,9 @@ sub numerical_response_analysis { $problem->{'respid'}); # Gather student data my $response_data = &Apache::loncoursedata::get_response_data - (\@Apache::lonstatistics::SelectedSections, + ([&Apache::lonstatistics::get_selected_sections()], $Apache::lonstatistics::enrollment_status, - $resource->{'symb'},$respid); + $resource->symb,$respid); # $problem_analysis->{'answercomputed'} = 1; if ($problem_analysis->{'answercomputed'}) { @@ -207,14 +213,14 @@ sub numerical_response_analysis { return; } my $analysis_html = ''; - for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) { + for (my $plot_num = 1;$plot_num<=$env{'form.NumPlots'};$plot_num++) { my $restriction_function; my $header_message; my $stats_message; my $post_message; # passed through &mt sooner rather than later my $no_data_message; my @extra_data; - if ($ENV{'form.AnalyzeOver'} eq 'tries') { + if ($env{'form.AnalyzeOver'} eq 'tries') { $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)}; $header_message = 'Attempt [_1]'; $stats_message = @@ -338,7 +344,9 @@ sub numerical_plot_percent { while (my ($ans,$submissions) = each(%$responses)) { while (my ($submission,$counts) = each(%$submissions)) { my ($correct_count,$incorrect_count) = @$counts; - my $scaled_value = 100*($submission-$ans)/abs($ans); + my $scaled_value = + ($ans) ? 100*($submission-$ans)/abs($ans) + : 0; if ($scaled_value < $bins[0]) { $bins[0]=$scaled_value -1; } @@ -393,7 +401,8 @@ sub numerical_plot_differences { } elsif ($low_bin < 0 && $high_bin < -$low_bin) { $high_bin = -$low_bin; } - if (($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) { + if (!$min_bin_size || + ($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) { $min_bin_size = abs($high_bin - $low_bin) / $max_bins * 2; } my @bins; @@ -482,8 +491,12 @@ sub numerical_classify_responses { if ($stats{'max_abs'} < $abs_high) { $stats{'max_abs'} = $abs_high; } - my $low_percent = 100 * abs($abs_low / $subm{'correct'}); - my $high_percent = 100 * abs($abs_high / $subm{'correct'}); + my $low_percent; + my $high_percent; + if (defined($subm{'correct'}) && $subm{'correct'} != 0) { + $low_percent = 100 * abs($abs_low / $subm{'correct'}); + $high_percent = 100 * abs($abs_high / $subm{'correct'}); + } if (! defined($stats{'min_percent'}) || $stats{'min_percent'} > $low_percent) { $stats{'min_percent'} = $low_percent; @@ -531,6 +544,8 @@ sub numerical_classify_responses { } } } + $stats{'correct_count'} |= 0; + $stats{'incorrect_count'} |= 0; $stats{'students'}=scalar(keys(%students)); return (\%submission_data,\%stats); } @@ -737,7 +752,7 @@ sub circle { sub radio_response_analysis { my ($r,$problem,$problem_analysis,$students) = @_; # - if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) { + if ($env{'form.AnalyzeOver'} !~ /^(tries|time)$/) { $r->print('Bad request'); } # @@ -766,9 +781,9 @@ sub radio_response_analysis { $analysis_html .= $table; # Gather student data my $response_data = &Apache::loncoursedata::get_response_data - (\@Apache::lonstatistics::SelectedSections, + ([&Apache::lonstatistics::get_selected_sections()], $Apache::lonstatistics::enrollment_status, - $resource->{'symb'},$respid); + $resource->symb,$respid); my $correct; # either a hash reference or a scalar if ($problem_analysis->{'answercomputed'} || scalar(@$concepts) > 1) { # This takes a while for large classes... @@ -798,13 +813,13 @@ sub radio_response_analysis { } # $analysis_html.='
'; - for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) { + for (my $plot_num = 1;$plot_num<=$env{'form.NumPlots'};$plot_num++) { # classify data ->correct foil -> selected foil 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') { + 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; @@ -812,7 +827,7 @@ sub radio_response_analysis { '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') { + } 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 @@ -882,16 +897,14 @@ sub radio_response_analysis { $choice_plot ne '' || $stacked_plot ne '') { my $correct = $foil_choice_data->{'_correct'}; - if (! defined($correct) || $correct eq '') { - $correct = 0; - } - my $incorrect = + $correct |= 0; + my $incorrect = $foil_choice_data->{'_count'}-$correct; $analysis_html.= ''.$/; @@ -936,7 +949,7 @@ sub ensure_start_end_times { (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'}) { + if ($plot_num == $env{'form.NumPlots'}) { $start = $first; } } @@ -1173,9 +1186,9 @@ sub OptionResponseAnalysis { $problem->{'respid'}); # Note: part data is not needed. my $PerformanceData = &Apache::loncoursedata::get_response_data - (\@Apache::lonstatistics::SelectedSections, + ([&Apache::lonstatistics::get_selected_sections()], $Apache::lonstatistics::enrollment_status, - $resource->{'symb'},$respid); + $resource->symb,$respid); if (! defined($PerformanceData) || ref($PerformanceData) ne 'ARRAY' ) { $r->print('

'. @@ -1183,13 +1196,13 @@ sub OptionResponseAnalysis { '

'); } else { $r->rflush(); - if ($ENV{'form.AnalyzeOver'} eq 'tries') { + if ($env{'form.AnalyzeOver'} eq 'tries') { my $analysis_html = &OR_tries_analysis($r, $PerformanceData, $problem_data); $r->print($analysis_html); $r->rflush(); - } elsif ($ENV{'form.AnalyzeOver'} eq 'time') { + } elsif ($env{'form.AnalyzeOver'} eq 'time') { my $analysis_html = &OR_time_analysis($PerformanceData, $problem_data); $r->print($analysis_html); @@ -1211,7 +1224,7 @@ sub OptionResponseAnalysis { sub OR_tries_analysis { my ($r,$PerformanceData,$ORdata) = @_; my $mintries = 1; - my $maxtries = $ENV{'form.NumPlots'}; + my $maxtries = $env{'form.NumPlots'}; my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); if (! defined($Concepts)) { $Concepts = []; @@ -1309,6 +1322,7 @@ sub OR_tries_analysis { # Create Foil Plots my $data_count = $response_data{'_total'}->[$try]; my $correct = $response_data{'_correct'}->[$try]; + $correct |= 0; my @Datasets; foreach my $option ('_correct',@{$ORdata->{'_Options'}}) { next if (! exists($foil_plot[$try]->{$option})); @@ -1420,7 +1434,7 @@ sub OR_time_analysis { ''.$table; } # - my $num_plots = $ENV{'form.NumPlots'}; + my $num_plots = $env{'form.NumPlots'}; my $num_data = scalar(@$performance_data)-1; # my $current_index; @@ -1471,6 +1485,7 @@ sub OR_time_analysis { ## my ($processed_time_data,$correct,$data_count,$student_count) = &OR_time_process_data($performance_data,$begin_index,$end_index); + $correct |= 0; ## $table .= ''; $Str .= ''; $Str .= ''; -# $Str .= ''; $Str .= ''; $Str .= ''."\n"; ## @@ -1827,24 +1841,13 @@ sub CreateInterface { $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); $Str .= ''; # -# $Str .= '
'. ''. &mt($pre_graph_text, $plot_num,$foil_choice_data->{'_count'}, $correct, - $foil_choice_data->{'_count'}-$correct, + $incorrect, $foil_choice_data->{'_students'}, @extra_data). '
'. &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect', @@ -1802,8 +1817,8 @@ sub build_foil_key { sub CreateInterface { ## ## Environment variable initialization - if (! exists$ENV{'form.AnalyzeOver'}) { - $ENV{'form.AnalyzeOver'} = 'tries'; + if (! exists($env{'form.AnalyzeOver'})) { + $env{'form.AnalyzeOver'} = 'tries'; } ## ## Build the menu @@ -1814,7 +1829,6 @@ sub CreateInterface { $Str .= '
'.&mt('Sections').''.&mt('Enrollment Status').''.&mt('Sequences and Folders').' 
'; - my $only_seq_with_assessments = sub { - my $s=shift; - if ($s->{'num_assess'} < 1) { - return 0; - } else { - return 1; - } - }; - &Apache::lonstatistics::MapSelect('Maps','multiple,all',5, - $only_seq_with_assessments); ## ## $Str .= ''; ## my $showprob_checkbox = ''; $analyze_selector .= '