--- loncom/interface/statistics/lonproblemanalysis.pm 2004/01/16 20:19:33 1.56 +++ loncom/interface/statistics/lonproblemanalysis.pm 2004/01/19 16:33:16 1.57 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonproblemanalysis.pm,v 1.56 2004/01/16 20:19:33 matthew Exp $ +# $Id: lonproblemanalysis.pm,v 1.57 2004/01/19 16:33:16 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -232,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'). @@ -387,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(); @@ -419,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'}; @@ -431,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; # @@ -504,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; } @@ -526,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"; @@ -592,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); @@ -620,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')) { @@ -678,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); } } @@ -689,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); @@ -784,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; ## @@ -852,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); @@ -924,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; @@ -993,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; @@ -1019,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; @@ -1249,6 +1251,8 @@ sub build_foil_index { my @Foils = sort(keys(%Foildata)); my %Concepts; foreach my $foilid (@Foils) { + &Apache::lonnet::logthis('foilid = '.$foilid); + &Apache::lonnet::logthis('_Concept = '.$Foildata{$foilid}->{'_Concept'}); push(@{$Concepts{$Foildata{$foilid}->{'_Concept'}}}, $foilid); } @@ -1269,16 +1273,25 @@ 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{$b1})) { + $b = $Numbers{$b1}; } - if (exists($Numbers{$b})) { - $b1 = $Numbers{$b}; + 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}=[]; + &Apache::lonnet::logthis('concept error: '.$concept.' does not have a value'); +# next; + } push(@Concepts,{ name => $concept, foils => [@{$Concepts{$concept}}]}); push(@Foils,(@{$Concepts{$concept}})); @@ -1526,7 +1539,7 @@ sub ProblemSelector { $seq_str .= ''. + $Str .= ''. "\n".$seq_str; } }
'. ''. ''. -#.$resptype.''. + $resptype.''. ''.$title.' '; # ''.$resptype.' '.$res->{'title'}.' '; if ($partdata->{'option'} > 1) { @@ -1538,7 +1551,7 @@ sub ProblemSelector { } } if ($seq_str ne '') { - $Str .= '
 '.$seq->{'title'}.'
 '.$seq->{'title'}.'