--- loncom/interface/statistics/lonproblemstatistics.pm 2002/07/29 22:01:11 1.6 +++ loncom/interface/statistics/lonproblemstatistics.pm 2002/08/05 18:10:08 1.12 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # (Publication Handler # -# $Id: lonproblemstatistics.pm,v 1.6 2002/07/29 22:01:11 minaeibi Exp $ +# $Id: lonproblemstatistics.pm,v 1.12 2002/08/05 18:10:08 minaeibi Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,7 +31,7 @@ # 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei # YEAR=2002 # 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei -# 5/12,5/14,5/15,5/19,5/26,7/16,7/25,7/29 Behrouz Minaei +# 5/12,5/14,5/15,5/19,5/26,7/16,7/25,7/29,8/5 Behrouz Minaei # ### @@ -56,9 +56,16 @@ sub BuildProblemStatisticsPage { $Ptr .= ''; $Ptr .= ''."\n"; $Ptr .= ''."\n"; + $Ptr .= ''."\n"; + $Ptr .= ''."\n"; - $Ptr .= &AscendOrderOptions($cache{'Ascend'}); $Ptr .= &ProblemStatisticsButtons($cache{'DisplayFormat'}); $Ptr .= '
Select Map'; - $Ptr .= &Apache::lonhtmlcommon::MapOptions(\%cache, 'ProblemStatistics'); + $Ptr .= &Apache::lonhtmlcommon::MapOptions(\%cache, 'ProblemStatistics', + 'Statistics'); + $Ptr .= '
Sorting Type:'."\n"; + $Ptr .= &Apache::lonhtmlcommon::AscendOrderOptions( + $cache{'ProblemStatisticsAscend'}, + 'ProblemStatistics', + 'Statistics'); $Ptr .= '
'; $Ptr .= &ProblemStatisticsLegend(); @@ -80,24 +87,53 @@ sub BuildProblemStatisticsPage { unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) { return 'Unable to tie database.'; } - my %discriminant=(); - my @list=(); - my %Discuss=&Apache::loncoursedata::LoadDiscussion($courseID); - my $index=0; - foreach (@$students) { - $index++; - #&Apache::lonstatistics::Update_PrgWin(++$index,$r); - &ExtractStudentData(\%cache, $_, \@list,\%Discuss, $r, \%discriminant); - } - #&Apache::lonstatistics::Close_PrgWin($r); - - my ($upper, $lower) = &Discriminant(\%discriminant); + my %Header = (0,"Homework Sets Order",1,"#Stdnts",2,"Tries",3,"Mod", 4,"Mean",5,"#YES",6,"#yes",7,"%Wrng",8,"DoDiff", 9,"S.D.",10,"Skew.",11,"D.F.1st",12,"D.F.2nd", 13, "Disc."); my $color=&setbgcolor(0); - my %GraphDat= &BuildStatisticsTable(\%cache, \%discriminant, \@list, - \%Header, $students, $r, $color); + + my $state=$ENV{'form.ProblemStatisticsHeading'}; + +# my $state=&Apache::lonstatistics::CheckFormElement(\%cache, +# 'ProblemStatisticsHeading', +# 'ProblemStatisticsHeading', +# 'Homework Sets Order'); + $r->print("
state=".$state); + + my $TempCache; + + if ($state) { + $TempCache=&CacheStatisticsTable($state,\%cache,\%Header, + $r,$color); + } else { + my %discriminant=(); + my @list=(); + my %Discuss=&Apache::loncoursedata::LoadDiscussion($courseID); + my $index=0; + foreach (@$students) { + $index++; + #&Apache::lonstatistics::Update_PrgWin(++$index,$r); + &ExtractStudentData(\%cache, $_, \@list,\%Discuss, $r, + \%discriminant); + } + #&Apache::lonstatistics::Close_PrgWin($r); + my ($upper, $lower) = &Discriminant(\%discriminant,$r); + $TempCache= &BuildStatisticsTable(\%cache, $upper, $lower, + \@list, \%Header, $students, + $r, $color); + } + untie(%cache); + + foreach (keys %$TempCache) { + last if ($c->aborted()); + if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT,0640)) { + $cache{$_}=$TempCache->{$_}; + + untie(%cache); + } + } + if($c->aborted()) { return; } untie(%cache); } @@ -157,6 +193,7 @@ sub ExtractStudentData { my $TotFirst = 0; my $TimeTot = 0; my $Discussed=0; + my $discrim=''; my $tempSequenceOrder=100; #$Apache::lonxml::debug=1; @@ -165,15 +202,15 @@ sub ExtractStudentData { foreach my $sequence (split(':', $cache->{'orderedSequences'})) { my $tempProblemOrder=100; - $tempSequenceOrder++; -# if($cache->{'ProblemStatisticsMap'} ne 'All Maps' && -# $cache->{'ProblemStatisticsMap'} ne $cache->{$sequence.':title'}) { + if($cache->{'ProblemStatisticsMaps'} ne 'All Maps' && + $cache->{'ProblemStatisticsMaps'} ne $cache->{$sequence.':title'}) { # $r->print("
sequences=$cache->{'orderedSequences'}"); # $r->print("
".$cache->{$sequence.':title'}); -# next; -# } + next; + } + $tempSequenceOrder++; - my $Dis = ''; + #$discrim .= '&'; foreach my $problemID (split(':', $cache->{$sequence.':problems'})) { # $r->print("
problems=$cache->{$sequence.':problems'}"); my $problem = $cache->{$problemID.':problem'}; @@ -192,6 +229,7 @@ sub ExtractStudentData { #} my %partData=undef; + $partData{'count'}=0; # Initialize part data, display skips correctly # Skip refers to when a student made no submissions on that # part/problem. @@ -199,6 +237,7 @@ sub ExtractStudentData { $problemID. ':parts'})) { $tempProblemOrder++; + $partData{'count'}++; # $r->print("
parts=$cache->{$sequence.':'.$problemID.':parts'}"); $partData{$part.':order'}=$tempProblemOrder; $partData{$part.':tries'}=0; @@ -225,13 +264,12 @@ sub ExtractStudentData { $Discussed=0; my $code='-'; - $awarded = $cache->{$name. - "$Version:$problem:resource.". + $awarded = $cache->{"$name:$Version:$problem:resource.". "$part.awarded"}; $partData{$part.':awarded'} = ($awarded) ? $awarded : 0; $totalAwarded += $awarded; - $tries = $cache->{$name.":$Version:$problem". + $tries = $cache->{"$name:$Version:$problem". ":resource.$part.tries"}; $partData{$part.':tries'} = ($tries) ? $tries : 0; $partData{$part.':wrong'} = $partData{$part.':tries'}; @@ -258,10 +296,10 @@ sub ExtractStudentData { # Loop through all the parts for the current problem in the # correct order and prepare the output + my $partCounter=0; foreach (split(/\:/,$cache->{$sequence.':'.$problemID. ':parts'})) { - #$r->print("
".$cache->{$sequence.':title'}); - + $partCounter++; my $Yes = 0; if($partData{$_.':code'} eq 'C' || $partData{$_.':code'} eq 'O') { @@ -270,10 +308,12 @@ sub ExtractStudentData { my $pOrder=$partData{$_.':order'}; my $ptr = $tempSequenceOrder.':'.$pOrder.':'.$problemID; - if($_ > 1) { + if($partData{'count'} > 1) { $ptr .= "*(part $_)"; - $Dis .= '&'; } + #if($partCounter > 1) { + $discrim .= '&'; + #} my ($pr_no,$dod)=split('&',$ptr); # my $DoDiff=$DoDiff->{$dod}; @@ -293,7 +333,7 @@ sub ExtractStudentData { $Discussed=1; } my $time = $cache->{"$name:$LatestVersion:$problem:timestamp"}; - $Dis .= $tempSequenceOrder.'@'.$pOrder.'='.$DisF.'+'.$Yes; + $discrim .= $tempSequenceOrder.'@'.$pOrder.'='.$DisF.'+'.$Yes; $ptr .= '&'.$partData{$_.':tries'}. '&'.$partData{$_.':wrong'}. '&'.$partData{$_.':code'}; @@ -323,41 +363,41 @@ sub ExtractStudentData { $tempProblemOrder++; } } - my $pstr; - if($totalTries) { - my $DisFac = ($totalAwarded/$totalTries); - my $DisFactor = sprintf( "%.4f", $DisFac ); - my $TS = sprintf( "%.2f", $spent ); - my $TS_yes = sprintf( "%.2f", $spent_yes ); - # $DiscFac{$DisFactor}=$Dis; - $pstr=$DisFactor.':'.$name.':'.$ProbTot.':'.$TotalOpend.':'. - $totalTries.':'.$ProbSolved.':'.$TotFirst.':'. - $TS_yes.':'.$TS.':'.$TotDiscuss; - (%$discriminant)->{$pstr}=$Dis; - } + } + my $pstr; + if($totalTries) { + my $DisFac = ($totalAwarded/$totalTries); + my $DisFactor = sprintf( "%.4f", $DisFac ); + my $TS = sprintf( "%.2f", $spent ); + my $TS_yes = sprintf( "%.2f", $spent_yes ); + $pstr=$DisFactor.':'.$name.':'.$ProbTot.':'.$TotalOpend.':'. + $totalTries.':'.$ProbSolved.':'.$TotFirst.':'. + $TS_yes.':'.$TS.':'.$TotDiscuss; + (%$discriminant)->{$pstr}=$discrim; } } -=pod -sub MySort { - if ( $Pos > 0 ) { + +sub MySort { + my $pos=shift; + if ( $pos > 0 ) { if ($ENV{'form.order'} eq 'Descending') {$b <=> $a;} else { $a <=> $b; } } else { - if ($ENV{'form.order'} eq 'Descending') {$b cmp $a;} - else { $a cmp $b; } +# if ($ENV{'form.order'} eq 'Descending') {$b cmp $a;} +# else { $a cmp $b; } + $a cmp $b; } } -=cut -sub BuildStatisticsTable { - my ($cache,$discriminantFactor,$list,$headings,$students,$r,$color)=@_; +sub BuildStatisticsTable { + my ($cache,$upper,$lower,$list,$headings,$students,$r,$color)=@_; my $NoElements = scalar @$list; - my @List=sort(@$list); + my @list=sort(@$list); #6666666 # my $file="/home/httpd/perl/tmp/183d.txt"; @@ -377,18 +417,20 @@ sub BuildStatisticsTable { my $dummy; my $p_val; my $ResId; - my %GraphDat; + my %TempCache; my $cIdx=0; foreach my $sequence (split(':', $cache->{'orderedSequences'})) { - - &CreateProblemStatisticsTableHeading(1,$cache->{$sequence.':source'}, + if($cache->{'ProblemStatisticsMaps'} ne 'All Maps' && + $cache->{'ProblemStatisticsMaps'} ne $cache->{$sequence.':title'}) { + next; + } + &CreateProblemStatisticsTableHeading($cache->{'DisplayFormat'}, + $cache->{$sequence.':source'}, $cache->{$sequence.':title'}, $headings,$r); - my ($tar,$Tries,$Wrongs,$Code,$Disc)=split(/\&/, - $List[$cIdx]); - + $list[$cIdx]); my ($SqOrd,$PrOrd,$Prob)=split(/\:/,$tar); $sequence+=100; while ($SqOrd==$sequence && $cIdx<$NoElements) { @@ -415,7 +457,7 @@ sub BuildStatisticsTable { elsif( $Code eq 'O' ) { $Override++; } elsif( $Code eq '-' ) { $StdNo--; } ($tar,$Tries,$Wrongs,$Code,$Disc)=split(/\&/, - $List[$cIdx]); + $list[$cIdx]); ($SqOrd,$PrOrd,$Prob)=split(/\:/,$tar); } @@ -427,7 +469,11 @@ sub BuildStatisticsTable { $Temp = ''.$cache->{$ResId.':title'}.$Dummy.''; - my $res = &Apache::lonnet::declutter($cache->{'src_'.$ResId}); + #$r->print('
rid='.$ResId); + #$r->print('
src='.$cache->{$ResId.':source'}); + #$r->print('
tit='.$cache->{$ResId.':title'}); + + my $res = &Apache::lonnet::declutter($cache->{$ResId.':source'}); my $urlres=$res; $ResId=~/(\d+)\.(\d+)/; @@ -435,7 +481,7 @@ sub BuildStatisticsTable { $urlres=$Map; ####################### -# $res = ''.$res.''; +# $res = ''.$res.''; #$Map = ''.$res.''; #------------------------ Compute the Average of Tries about one problem @@ -481,8 +527,9 @@ sub BuildStatisticsTable { } #--------------------- Compute the Discrimination Factors - my ($Up1,$Up2)=split(/\:/,':');#jason$DisUp->{$lpr[$i]}); - my ($Lw1,$Lw2)=split(/\:/,':');#jason$DisLow->{$lpr[$i]}); + my ($Up1,$Up2)=split(/\:/,$upper->{$sequence.'@'.$pOrd}); + my ($Lw1,$Lw2)=split(/\:/,$lower->{$sequence.'@'.$pOrd}); + my $Dis1 = $Up1 - $Lw1; my $Dis2 = $Up2 - $Lw2; my $_D1 = sprintf("%.2f", $Dis1); @@ -494,12 +541,14 @@ sub BuildStatisticsTable { my $SD = sprintf( "%.1f", $StdDev ); my $DoD = sprintf( "%.2f", $DoDiff ); my $Sk = sprintf( "%.1f", $Skewness ); - my $join = $Prob.'&'.$Temp.'&'.$StdNo.'&'. + my $join = $sequence.'@'.$pOrd.'&'.$Temp.'&'.$StdNo.'&'. $TotalTries.'&'.$MxTries.'&'.$Avg.'&'. $YES.'&'.$Override.'&'.$Wrng.'&'.$DoD.'&'. $SD.'&'.$Sk.'&'.$_D1.'&'.$_D2.'&'. $DiscNo.'&'.$Prob; -##8888 $CachData{($p_count-1)}=$join; + +#####{$sequence.'@'.$pOrd} + $TempCache{'CacheTable:'.($p_count-1)}=$join; #6666666 # $r->print('
'.$out.'&'.$DoD); @@ -511,47 +560,72 @@ sub BuildStatisticsTable { &Apache::lonnet::put('resevaldata',\%storestats,$1,$2); } #-------------------------------- Row of statistical table - &TableRow($cache,$join,$cIdx,($p_count-1),$r,$color,\%GraphDat); + &TableRow($cache,$join,$cIdx,($p_count-1),$r,$color, + \%TempCache); } + $TempCache{'ProblemCount'}=$p_count; &CloseTable($cache,$r); } ### &Close_PrgWin(); #666666 # close( OUT ); #666666 + return \%TempCache; } -=pod -sub Cache_Statistics { - my ($cache,$color)=@_; + +sub CacheStatisticsTable { + my ($state,$cache,$Header,$r,$color)=@_; my @list = (); my $Useful; - my $UnUseful; -# $r->print(''."\n"); - my %myHeader = reverse( %Header ); - $Pos = $myHeader{$ENV{'form.sort'}}; - if ($Pos > 0) {$Pos++;} - my $p_count = 0; - foreach my $key( keys %CachData) { - my @Temp=split(/\&/,$CachData{$key}); - if ( $Pos == 0 ) { - ($UnUseful,$Useful)=split(/\>/,$Temp[$Pos]); + my $UnUseful; + my %TempCache; + my %myHeader = reverse( %$Header ); + my $pos = $myHeader{$state}; + if ($pos > 0) {$pos++;} + my $p_count = $cache->{'ProblemCount'}; + + for ( my $k=0; $k<$p_count;$k++) { + my $key=$cache->{'CacheTable:'.$k}; + my @Temp=split(/\&/,$key); + if ( $pos == 0 ) { + ($UnUseful,$Useful)=split(/\>/,$Temp[$pos]); } else { - $Useful = $Temp[$Pos]; + $Useful = $Temp[$pos]; } - $list[$p_count]=$Useful.'@'.$CachData{$key}; - $p_count++; + $list[$k]=$Useful.'@'.$key; + $r->print('
'.$list[$k]); } + @list = sort MySort (@list); my $nIndex=0; + return \%TempCache; +} + + +=pod + if ( $Pos == 0 ) { - foreach (sort keys %mapsort) { - my ($Hid,$pr)=split(/\:/,$mapsort{$_}); - &CreateProblemStatisticsTableHeading($cache,1,$Hid); + foreach my $sequence (split(':', $cache->{'orderedSequences'})) { + if($cache->{'ProblemStatisticsMaps'} ne 'All Maps' && + $cache->{'ProblemStatisticsMaps'} ne $cache->{$sequence.':title'}) { + next; + } + &CreateProblemStatisticsTableHeading($cache->{'DisplayFormat'}, + $cache->{$sequence.':source'}, + $cache->{$sequence.':title'}, + $headings,$r); + + my ($tar,$Tries,$Wrongs,$Code,$Disc)=split(/\&/, + $list[$cIdx]); + my ($SqOrd,$PrOrd,$Prob)=split(/\:/,$tar); + $sequence+=100; + while ($SqOrd==$sequence && $cIdx<$NoElements) { + my %storestats=(); my @lpr=split(/\&/,$pr); for (my $i=1; $i<=$#lpr; $i++) { my($Pre, $Post) = split(/\@/,$list[$nIndex]); @@ -563,64 +637,70 @@ sub Cache_Statistics { } } else { - &CreateProblemStatisticsTableHeading($cache,0); + &CreateProblemStatisticsTableHeading($cache->{'DisplayFormat'}, + $cache->{$sequence.':source'}, + $cache->{$sequence.':title'}, + $headings,$r); for ( my $nIndex = 0; $nIndex < $p_count; $nIndex++ ) { my($Pre, $Post) = split(/\@/,$list[$nIndex]); &TableRow($cache,$Post,$nIndex,$nIndex,$color,\%GraphDat); } &CloseTable($cache); } + + return \%TempCache; } -=cut + +=cut + sub TableRow { my ($cache,$Str,$Idx,$RealIdx,$r,$color,$GraphDat)=@_; my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,$Override, $Wrng,$DoD,$SD,$Sk,$_D1,$_D2,$DiscNo,$Prob)=split(/\&/,$Str); -# $r->print('
'.$Str); - if ($ENV{'form.showcsv'}) { + my $Ptr; + if($cache->{'DisplayFormat'} eq 'Display CSV Format') { my ($ResId,$Dummy)=split(/\*/,$Prob); - my $Ptr = "\n".'
'. - "\n".'"'.($RealIdx+1).'",'. - "\n".'"'.$cache->{'title_'.$ResId}.$Dummy.'",'. - "\n".'"'.$cache->{'src_'.$ResId}.'",'. - "\n".'"'.$StdNo.'",'. - "\n".'"'.$TotalTries.'",'. - "\n".'"'.$MxTries.'",'. - "\n".'"'.$Avg.'",'. - "\n".'"'.$YES.'",'. - "\n".'"'.$Override.'",'. - "\n".'"'.$Wrng.'",'. - "\n".'"'.$DoD.'",'. - "\n".'"'.$SD.'",'. - "\n".'"'.$Sk.'",'. - "\n".'"'.$_D1.'",'. - "\n".'"'.$_D2.'"'. - "\n".'"'.$DiscNo.'"'; + $Ptr="\n".'
'. + "\n".'"'.($RealIdx+1).'",'. + "\n".'"'.$cache->{$ResId.':title'}.$Dummy.'",'. + "\n".'"'.$cache->{$ResId.':source'}.'",'. + "\n".'"'.$StdNo.'",'. + "\n".'"'.$TotalTries.'",'. + "\n".'"'.$MxTries.'",'. + "\n".'"'.$Avg.'",'. + "\n".'"'.$YES.'",'. + "\n".'"'.$Override.'",'. + "\n".'"'.$Wrng.'",'. + "\n".'"'.$DoD.'",'. + "\n".'"'.$SD.'",'. + "\n".'"'.$Sk.'",'. + "\n".'"'.$_D1.'",'. + "\n".'"'.$_D2.'"'. + "\n".'"'.$DiscNo.'"'; $r->print("\n".$Ptr); - } - else{ - my $Ptr = "\n".''. - "\n".''.($RealIdx+1).''. - # "\n".''.$PrOrd.$Temp.''. - "\n".''.$Temp.''. - "\n".' '.$StdNo.''. - "\n".''.$TotalTries.''. - "\n".''.$MxTries.''. - "\n".''.$Avg.''. - "\n".' '.$YES.''. - "\n".' '.$Override.''. - "\n".' '.$Wrng.''. - "\n".' '.$DoD.''. - "\n".' '.$SD.''. - "\n".' '.$Sk.''. - "\n".' '.$_D1.''. - "\n".' '.$_D2.''. - "\n".' '.$DiscNo.''; + } else { + $Ptr="\n".''. + "\n".''.($RealIdx+1).''. + # "\n".''.$PrOrd.$Temp.''. + "\n".''.$Temp.''. + "\n".' '.$StdNo.''. + "\n".''.$TotalTries.''. + "\n".''.$MxTries.''. + "\n".''.$Avg.''. + "\n".' '.$YES.''. + "\n".' '.$Override.''. + "\n".' '.$Wrng.''. + "\n".' '.$DoD.''. + "\n".' '.$SD.''. + "\n".' '.$Sk.''. + "\n".' '.$_D1.''. + "\n".' '.$_D2.''. + "\n".' '.$DiscNo.''; $r->print("\n".$Ptr.'' ); } -# $GraphDat->{$RealIdx}=$DoD.':'.$Wrng; + $GraphDat->{'graph_gif:'.$RealIdx}=$DoD.':'.$Wrng; } @@ -645,59 +725,10 @@ sub setbgcolor { return \%color; } - -sub StatusOptions { - my ($cache)=@_; - - my $Status = $cache->{'Status'}; - my $OpSel1 = ''; - my $OpSel2 = ''; - my $OpSel3 = ''; - - if($Status eq 'Any') { $OpSel3 = ' selected'; } - elsif($Status eq 'Expired' ) { $OpSel2 = ' selected'; } - else { $OpSel1 = ' selected'; } - - my $Ptr = ''; - $Ptr .= 'Student Status:'."\n"; - $Ptr .= ''."\n"; - - return $Ptr; -} - -sub AscendOrderOptions { - my ($order)=@_; - - my $OpSel1 = ''; - my $OpSel2 = ''; - - if($order eq 'Ascending') { - $OpSel1 = ' selected'; - } else { - $OpSel2 = ' selected'; - } - - my $Ptr = ''; - $Ptr .= 'Sorting Type:'."\n"; - $Ptr .= ''."\n"; - - return $Ptr; -} - sub ProblemStatisticsButtons { my ($displayFormat)=@_; my $Ptr = ''; - $Ptr .= 'print("
$nIndex) $sortedList[$nIndex]"); ($Problem,$tmp)=split(/\=/,$sortedList[$nIndex]); @Dis=split(/\+/,$tmp); my $Temp = $Problem; @@ -797,9 +829,8 @@ sub ProcessDiscriminant { ($Problem,$tmp)=split(/\=/,$sortedList[$nIndex]); @Dis=split(/\+/,$tmp); } while ( $Problem eq $Temp && $nIndex < $Count ); -# $Proc{$Temp}=($Sum1/$nStudent).':'.$nStudent; $Proc{$Temp}=($Sum1/$nStudent).':'.($Sum2/$nStudent); -# $r->print("$nIndex) $Temp --> ($nStudent) $Proc{$Temp}
"); +# $r->print("
$nIndex) $Temp --> ($nStudent) $Proc{$Temp}"); $Sum1=0; $Sum2=0; $nStudent=0; @@ -810,8 +841,11 @@ sub ProcessDiscriminant { #------- Creating Discimination factor sub Discriminant { - my ($discriminantFactor)=@_; - my @discriminantKeys=keys(%$discriminantFactor); + my ($discriminant,$r)=@_; +#$Apache::lonxml::debug=1; +#&Apache::lonhomework::showhash(%$discriminant); +#$Apache::lonxml::debug=0; + my @discriminantKeys=keys(%$discriminant); my $Count = scalar @discriminantKeys; my $UpCnt = int(0.27*$Count); @@ -825,8 +859,8 @@ sub Discriminant { $Count++; if($low < $UpCnt || $Count > $up) { $low++; - my $str=$discriminantFactor->{$key}; - foreach(split(/\:/,$str)){ + my $str=$discriminant->{$key}; + foreach(split(/\&/,$str)){ if($_) { if($low<$UpCnt) { push(@LowList,$_); } else { push(@UpList,$_); } @@ -834,13 +868,11 @@ sub Discriminant { } } } - my %DisUp = &ProcessDiscriminant(\@UpList); - my %DisLow = &ProcessDiscriminant(\@LowList); + my %DisUp = &ProcessDiscriminant(\@UpList,$r); + my %DisLow = &ProcessDiscriminant(\@LowList,$r); return (\%DisUp, \%DisLow); -} - - +} #---- END Problem Statistics Web Page ---------------------------------------- @@ -852,14 +884,18 @@ sub BuildDiffGraph { my ($r)=@_; my $graphData = &GetGraphData('DiffGraph', $r); - return ''; + $r->print(''); + + return; } sub BuildWrongGraph { my ($r)=@_; my $graphData = &GetGraphData('WrongGraph', $r); - return ''; + $r->print(''); + + return; }