--- loncom/interface/statistics/lonproblemanalysis.pm 2004/01/16 15:33:40 1.54 +++ loncom/interface/statistics/lonproblemanalysis.pm 2004/01/19 20:10:36 1.59 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.54 2004/01/16 15:33:40 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.59 2004/01/19 20:10:36 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -159,14 +159,11 @@ sub BuildProblemAnalysisPage { '.'. $current_problem->{'respid'}}; if ($current_problem->{'resptype'} eq 'option') { - &OptionResponseAnalysis($r,$resource, - $current_problem->{'respid'}, + &OptionResponseAnalysis($r,$current_problem, $ProblemData, \@Students); } elsif ($current_problem->{'resptype'} eq 'radiobutton') { - &RadioResponseAnalysis($r,$resource, - $current_problem->{'part'}, - $current_problem->{'respid'}, + &RadioResponseAnalysis($r,$current_problem, $ProblemData, \@Students); } else { @@ -183,9 +180,6 @@ sub BuildProblemAnalysisPage { } } -=pod - -Removed code: ######################################################### ######################################################### @@ -195,7 +189,9 @@ Removed code: ######################################################### ######################################################### sub RadioResponseAnalysis { - my ($r,$resource,$part,$respid,$ProblemData,$Students) = @_; + my ($r,$problem,$ProblemData,$Students) = @_; + my ($resource,$respid) = ($problem->{'resource'}, + $problem->{'respid'}); my $analysis_html; my $PerformanceData = &Apache::loncoursedata::get_response_data @@ -209,14 +205,14 @@ sub RadioResponseAnalysis { return; } if (exists($ENV{'form.ExcelOutput'})) { - $analysis_html .= &RR_Excel_output($r,$resource,$PerformanceData, - $ProblemData); + $analysis_html .= &RR_Excel_output($r,$problem->{'resource'}, + $PerformanceData,$ProblemData); } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') { - $analysis_html .= &RR_Tries_Analysis($r,$resource,$PerformanceData, - $ProblemData); + $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'}, + $PerformanceData,$ProblemData); } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { - $analysis_html .= &RR_Time_Analysis($r,$resource,$PerformanceData, - $ProblemData); + $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'}, + $PerformanceData,$ProblemData); } else { $analysis_html .= '

'. &mt('The analysis you have selected is not supported at this time'). @@ -225,7 +221,6 @@ sub RadioResponseAnalysis { $r->print($analysis_html); } - sub RR_Excel_output { my ($r,$PerformanceData,$ProblemData) = @_; return '

No!

'; @@ -237,7 +232,8 @@ sub RR_Tries_Analysis { my $mintries = 1; my $maxtries = $ENV{'form.NumPlots'}; my ($table,$Foils,$Concepts) = &build_foil_index($ProblemData); - if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) { + if ((! defined($Concepts)) || ((@$Concepts < 2) && + ($ENV{'form.AnalyzeAs'} ne 'Foils'))) { $table = '

'. &mt('Not enough data for concept analysis. '. 'Performing Foil Analysis'). @@ -246,15 +242,15 @@ sub RR_Tries_Analysis { } $analysis_html .= $table; my @TryData = &RR_tries_data_analysis($r,$PerformanceData); - if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $analysis_html = &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, +# if ($ENV{'form.AnalyzeAs'} eq 'Foils') { + $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, \@TryData,$ProblemData); - } else { - $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries, - $Concepts, - \@TryData, - $ProblemData); - } +# } else { +# $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries, +# $Concepts, +# \@TryData, +# $ProblemData); +# } return $analysis_html; } @@ -284,8 +280,8 @@ sub RR_Tries_Foil_Analysis { my @PlotData_Correct; my @PlotData_Incorrect; next if ($try > scalar(@{$TryData})); - next if (! defined($TryData->[$try-1])); - my %DataSet = %{$TryData->[$try-1]}; + next if (! defined($TryData->[$try])); + my %DataSet = %{$TryData->[$try]}; my $total = 0; foreach my $foilid (@$Foils) { $total += $DataSet{$foilid}; @@ -316,7 +312,6 @@ sub RR_Tries_Foil_Analysis { \@PlotData_Correct, \@PlotData_Incorrect); } - &Apache::lonnet::logthis('plot = '.$html); return $html; } @@ -339,14 +334,12 @@ sub RR_Time_Concept_Analysis { } - 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; - &Apache::lonnet::logthis('url = '.$url); foreach my $part (@{$Answer{'parts'}}) { while (my($key,$value) = each(%Answer)) { # if (ref($value) eq 'ARRAY') { @@ -372,9 +365,6 @@ sub get_Radio_problem_data { return %Partdata; } -=cut - - ######################################################### ######################################################### ## @@ -383,7 +373,10 @@ sub get_Radio_problem_data { ######################################################### ######################################################### sub OptionResponseAnalysis { - my ($r,$resource,$respid,$ProblemData,$Students) = @_; + my ($r,$problem,$ProblemData,$Students) = @_; + my ($resource,$respid) = ($problem->{'resource'}, + $problem->{'respid'}); + # Note: part data is not needed. my $PerformanceData = &Apache::loncoursedata::get_response_data ($Students,$resource->{'symb'},$respid); @@ -395,20 +388,20 @@ sub OptionResponseAnalysis { } else { $r->rflush(); if (exists($ENV{'form.ExcelOutput'})) { - my $result = &prepare_optionresponse_excel_sheet($r,$resource, - $PerformanceData, - $ProblemData); + my $result = &OR_excel_sheet($r,$resource, + $PerformanceData, + $ProblemData); $r->print($result); $r->rflush(); } else { if ($ENV{'form.AnalyzeOver'} eq 'Tries') { - my $analysis_html = &tries_analysis($r, + my $analysis_html = &OR_tries_analysis($r, $PerformanceData, $ProblemData); $r->print($analysis_html); $r->rflush(); } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') { - my $analysis_html = &time_analysis($PerformanceData, + my $analysis_html = &OR_time_analysis($PerformanceData, $ProblemData); $r->print($analysis_html); $r->rflush(); @@ -427,7 +420,7 @@ sub OptionResponseAnalysis { # Option Response: Tries Analysis # ######################################################### -sub tries_analysis { +sub OR_tries_analysis { my ($r,$PerformanceData,$ORdata) = @_; my $mintries = 1; my $maxtries = $ENV{'form.NumPlots'}; @@ -439,21 +432,21 @@ sub tries_analysis { '

'.$table; $ENV{'form.AnalyzeAs'} = 'Foils'; } - my %ResponseData = &analyze_option_data_by_tries($r,$PerformanceData, + my %ResponseData = &OR_analyze_by_tries($r,$PerformanceData, $mintries,$maxtries); my $analysis = ''; if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $analysis = &Tries_Foil_Analysis($mintries,$maxtries,$Foils, + $analysis = &OR_Tries_Foil_Analysis($mintries,$maxtries,$Foils, \%ResponseData,$ORdata); } else { - $analysis = &Tries_Concept_Analysis($mintries,$maxtries, + $analysis = &OR_Tries_Concept_Analysis($mintries,$maxtries, $Concepts,\%ResponseData,$ORdata); } $table .= $analysis; return $table; } -sub Tries_Foil_Analysis { +sub OR_Tries_Foil_Analysis { my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_; my %ResponseData = %$respdat; # @@ -512,6 +505,7 @@ sub Tries_Foil_Analysis { $analysis_html.= ''.$correctgraph.''; ## ## + next if (! defined($Datasets[0])); for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) { $Datasets[0]->[$i]=0; } @@ -534,7 +528,7 @@ sub Tries_Foil_Analysis { return $analysis_html; } -sub Tries_Concept_Analysis { +sub OR_Tries_Concept_Analysis { my ($mintries,$maxtries,$Concepts,$respdat,$ORdata) = @_; my %ResponseData = %$respdat; my $analysis_html = "\n"; @@ -600,7 +594,7 @@ sub Tries_Concept_Analysis { return $analysis_html; } -sub analyze_option_data_by_tries { +sub OR_analyze_by_tries { my ($r,$PerformanceData,$mintries,$maxtries) = @_; my %Trydata; $mintries = 1 if (! defined($mintries) || $mintries < 1); @@ -628,7 +622,7 @@ sub analyze_option_data_by_tries { # Option Response: Time Analysis # ######################################################### -sub time_analysis { +sub OR_time_analysis { my ($PerformanceData,$ORdata) = @_; my ($table,$Foils,$Concepts) = &build_foil_index($ORdata); if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) { @@ -686,10 +680,10 @@ sub time_analysis { enddateform => $enddateform, }; if ($ENV{'form.AnalyzeAs'} eq 'Foils') { - $table .= &Foil_Time_Analysis($PerformanceData,$ORdata,$Foils, + $table .= &OR_Foil_Time_Analysis($PerformanceData,$ORdata,$Foils, $interval); } else { - $table .= &Concept_Time_Analysis($PerformanceData,$ORdata, + $table .= &OR_Concept_Time_Analysis($PerformanceData,$ORdata, $Concepts,$interval); } } @@ -697,7 +691,7 @@ sub time_analysis { return $table; } -sub Foil_Time_Analysis { +sub OR_Foil_Time_Analysis { my ($PerformanceData,$ORdata,$Foils,$interval) = @_; my $analysis_html; my $foilkey = &build_option_index($ORdata); @@ -792,7 +786,7 @@ sub Foil_Time_Analysis { return $analysis_html; } -sub Concept_Time_Analysis { +sub OR_Concept_Time_Analysis { my ($PerformanceData,$ORdata,$Concepts,$interval) = @_; my $analysis_html; ## @@ -860,7 +854,7 @@ sub Concept_Time_Analysis { ## ######################################################### ######################################################### -sub prepare_optionresponse_excel_sheet { +sub OR_excel_sheet { my ($r,$resource,$PerformanceData,$ORdata) = @_; my $response = ''; my (undef,$Foils,$Concepts) = &build_foil_index($ORdata); @@ -904,16 +898,16 @@ sub prepare_optionresponse_excel_sheet { } # my $result; - $result = &build_problem_data_worksheet($problem_data_sheet,$format, + $result = &OR_build_problem_data_worksheet($problem_data_sheet,$format, $Concepts,$ORdata); if ($result ne 'okay') { # Do something useful } - $result = &build_student_data_worksheet($student_data_sheet,$format); + $result = &OR_build_student_data_worksheet($student_data_sheet,$format); if ($result ne 'okay') { # Do something useful } - $result = &build_response_data_worksheet($response_data_sheet,$format, + $result = &OR_build_response_data_worksheet($response_data_sheet,$format, $PerformanceData,$Foils, $ORdata); if ($result ne 'okay') { @@ -932,7 +926,7 @@ sub prepare_optionresponse_excel_sheet { return $result; } -sub build_problem_data_worksheet { +sub OR_build_problem_data_worksheet { my ($worksheet,$format,$Concepts,$ORdata) = @_; my $rows_output = 3; my $cols_output = 0; @@ -1001,7 +995,7 @@ sub build_problem_data_worksheet { return 'okay'; } -sub build_student_data_worksheet { +sub OR_build_student_data_worksheet { my ($worksheet,$format) = @_; my $rows_output = 3; my $cols_output = 0; @@ -1027,7 +1021,7 @@ sub build_student_data_worksheet { return; } -sub build_response_data_worksheet { +sub OR_build_response_data_worksheet { my ($worksheet,$format,$PerformanceData,$Foils,$ORdata)=@_; my $rows_output = 3; my $cols_output = 0; @@ -1277,16 +1271,24 @@ sub build_foil_index { ten => 10,); my $a1 = lc($a); my $b1 = lc($b); - if (exists($Numbers{$a})) { - $a1 = $Numbers{$a}; + if (exists($Numbers{$a1})) { + $a = $Numbers{$a1}; } - if (exists($Numbers{$b})) { - $b1 = $Numbers{$b}; + if (exists($Numbers{$b1})) { + $b = $Numbers{$b1}; + } + if (($a =~/^\d+$/) && ($b =~/^\d+$/)) { + return $a <=> $b; + } else { + return $a cmp $b; } - $a1 cmp $b1; }; my @Concepts; foreach my $concept (sort $sortfunction (keys(%Concepts))) { + if (! defined($Concepts{$concept})) { + $Concepts{$concept}=[]; +# next; + } push(@Concepts,{ name => $concept, foils => [@{$Concepts{$concept}}]}); push(@Foils,(@{$Concepts{$concept}})); @@ -1517,8 +1519,8 @@ sub ProblemSelector { for (my $i=0;$i{'ResponseTypes'}});$i++){ my $respid = $partdata->{'ResponseIds'}->[$i]; my $resptype = $partdata->{'ResponseTypes'}->[$i]; - if ($resptype eq 'option' ){ -# if ($resptype eq 'option' || $resptype eq 'radiobutton') { +# if ($resptype eq 'option' ){ + if ($resptype eq 'option' || $resptype eq 'radiobutton') { my $value = &make_target_id({symb=>$res->{'symb'}, part=>$part, respid=>$respid, @@ -1533,7 +1535,8 @@ sub ProblemSelector { } $seq_str .= ''. + $Str .= ''. "\n".$seq_str; } } @@ -1562,10 +1565,7 @@ sub ProblemSelector { ######################################################### sub get_problem_symb { my $problemstring = shift(); - &Apache::lonnet::logthis('problemstring = '.$problemstring); my ($symb,$partid,$respid,$resptype) = split(':',$problemstring); - &Apache::lonnet::logthis("\n". - join(" --- \n",split(':',$problemstring))); return ({ symb => $symb, part => $partid, respid => $respid, @@ -1586,9 +1586,6 @@ sub get_resource_from_symb { sub get_prev_curr_next { my ($target) = @_; - while(my($k,$v) = each(%$target)) { - &Apache::lonnet::logthis($k.' = '.$v); - } # # Build an array with the data we need to search through my @Resource; @@ -1600,7 +1597,8 @@ sub get_prev_curr_next { for (my $i=0;$i{'ResponseTypes'}});$i++){ my $respid = $partdata->{'ResponseIds'}->[$i]; my $resptype = $partdata->{'ResponseTypes'}->[$i]; - next if ($resptype ne 'option'); + next if ($resptype ne 'option' && + $resptype ne 'radiobutton'); push (@Resource, { symb => $res->{symb}, part => $part, @@ -1613,16 +1611,11 @@ sub get_prev_curr_next { } } # - &Apache::lonnet::logthis('size of @Resource = '.scalar(@Resource)); # # Get the index of the current situation my $curr_idx; for ($curr_idx=0;$curr_idx<$#Resource;$curr_idx++) { my $curr_item = $Resource[$curr_idx]; - &Apache::lonnet::logthis('-----------------------------------'); - while(my($k,$v) = each(%$curr_item)) { - &Apache::lonnet::logthis($k.' = '.$v); - } last if ($curr_item->{'symb'} eq $target->{'symb'} && $curr_item->{'part'} eq $target->{'part'} && $curr_item->{'respid'} eq $target->{'respid'} && @@ -1634,7 +1627,6 @@ sub get_prev_curr_next { $curr_item->{'respid'} ne $target->{'respid'} || $curr_item->{'resptype'} ne $target->{'resptype'}){ # bogus symb - return nothing - &Apache::lonnet::logthis('bailing out'); return (undef,undef,undef); } # @@ -1667,12 +1659,7 @@ sub make_target_id { sub get_target_from_id { my ($id) = @_; - &Apache::lonnet::logthis('id = '.$id); my ($symb,$part,$respid,$resptype) = split(':',$id); - &Apache::lonnet::logthis('get_target_from_id:symb='.$symb); - &Apache::lonnet::logthis('get_target_from_id:symb='.$part); - &Apache::lonnet::logthis('get_target_from_id:symb='.$respid); - &Apache::lonnet::logthis('get_target_from_id:symb='.$resptype); return ({ symb =>&Apache::lonnet::unescape($symb), part =>&Apache::lonnet::unescape($part), respid =>&Apache::lonnet::unescape($respid), @@ -1730,6 +1717,7 @@ sub Process_OR_Row { my @Foilsubs = split('&',$submission); for (my $j=0;$j<=$#Foilgrades;$j++) { my ($foilid,$correct) = split('=',$Foilgrades[$j]); + $foilid = &Apache::lonnet::unescape($foilid); my (undef,$submission) = split('=',$Foilsubs[$j]); if ($correct) { $RowData{$foilid}->{'_correct'}++;
'. ''. - ''. + ''. + $resptype.''. ''.$title.' '; # ''.$resptype.' '.$res->{'title'}.' '; if ($partdata->{'option'} > 1) { @@ -1545,7 +1548,7 @@ sub ProblemSelector { } } if ($seq_str ne '') { - $Str .= '
 '.$seq->{'title'}.'
 '.$seq->{'title'}.'