--- loncom/interface/statistics/lonproblemstatistics.pm 2002/07/29 22:01:11 1.6
+++ loncom/interface/statistics/lonproblemstatistics.pm 2002/07/30 23:08:56 1.8
@@ -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.8 2002/07/30 23:08:56 minaeibi Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -91,12 +91,12 @@ sub BuildProblemStatisticsPage {
}
#&Apache::lonstatistics::Close_PrgWin($r);
- my ($upper, $lower) = &Discriminant(\%discriminant);
+ my ($upper, $lower) = &Discriminant(\%discriminant,$r);
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,
+ my %GraphDat= &BuildStatisticsTable(\%cache, $upper, $lower, \@list,
\%Header, $students, $r, $color);
untie(%cache);
}
@@ -157,6 +157,7 @@ sub ExtractStudentData {
my $TotFirst = 0;
my $TimeTot = 0;
my $Discussed=0;
+ my $discrim='';
my $tempSequenceOrder=100;
#$Apache::lonxml::debug=1;
@@ -173,7 +174,7 @@ sub ExtractStudentData {
# next;
# }
- my $Dis = '';
+ #$discrim .= '&';
foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
# $r->print("
problems=$cache->{$sequence.':problems'}");
my $problem = $cache->{$problemID.':problem'};
@@ -192,6 +193,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 +201,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 +228,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 +260,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 +272,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 +297,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,18 +327,17 @@ 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;
}
}
@@ -354,8 +357,7 @@ sub MySort {
sub BuildStatisticsTable {
- my ($cache,$discriminantFactor,$list,$headings,$students,$r,$color)=@_;
-
+ my ($cache,$upper,$lower,$list,$headings,$students,$r,$color)=@_;
my $NoElements = scalar @$list;
my @List=sort(@$list);
@@ -385,10 +387,8 @@ sub BuildStatisticsTable {
&CreateProblemStatisticsTableHeading(1,$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) {
@@ -427,7 +427,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+)/;
@@ -481,8 +485,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);
@@ -578,46 +583,46 @@ sub TableRow {
my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,$Override,
$Wrng,$DoD,$SD,$Sk,$_D1,$_D2,$DiscNo,$Prob)=split(/\&/,$Str);
# $r->print('
'.$Str);
+ my $Ptr;
if ($ENV{'form.showcsv'}) {
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->{'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.'"';
$r->print("\n".$Ptr);
- }
- else{
- my $Ptr = "\n".'