[LON-CAPA-cvs] cvs: loncom /interface/statistics lonproblemstatistics.pm
minaeibi
lon-capa-cvs@mail.lon-capa.org
Mon, 05 Aug 2002 18:10:08 -0000
This is a MIME encoded message
--minaeibi1028571008
Content-Type: text/plain
minaeibi Mon Aug 5 14:10:08 2002 EDT
Modified files:
/loncom/interface/statistics lonproblemstatistics.pm
Log:
Edited the Statistics table to resort the table. (It needs more work)
--minaeibi1028571008
Content-Type: text/plain
Content-Disposition: attachment; filename="minaeibi-20020805141008.txt"
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.11 loncom/interface/statistics/lonproblemstatistics.pm:1.12
--- loncom/interface/statistics/lonproblemstatistics.pm:1.11 Fri Aug 2 17:04:46 2002
+++ loncom/interface/statistics/lonproblemstatistics.pm Mon Aug 5 14:10:08 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonproblemstatistics.pm,v 1.11 2002/08/02 21:04:46 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
#
###
@@ -87,24 +87,53 @@
unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
return '<html><body>Unable to tie database.</body></html>';
}
- 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);
+
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, $upper, $lower, \@list,
- \%Header, $students, $r, $color);
+
+ my $state=$ENV{'form.ProblemStatisticsHeading'};
+
+# my $state=&Apache::lonstatistics::CheckFormElement(\%cache,
+# 'ProblemStatisticsHeading',
+# 'ProblemStatisticsHeading',
+# 'Homework Sets Order');
+ $r->print("<br>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);
}
@@ -349,24 +378,26 @@
}
-=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,$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";
@@ -386,7 +417,7 @@
my $dummy;
my $p_val;
my $ResId;
- my %GraphDat;
+ my %TempCache;
my $cIdx=0;
foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
@@ -399,7 +430,7 @@
$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) {
@@ -426,7 +457,7 @@
elsif( $Code eq 'O' ) { $Override++; }
elsif( $Code eq '-' ) { $StdNo--; }
($tar,$Tries,$Wrongs,$Code,$Disc)=split(/\&/,
- $List[$cIdx]);
+ $list[$cIdx]);
($SqOrd,$PrOrd,$Prob)=split(/\:/,$tar);
}
@@ -510,14 +541,14 @@
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;
#####{$sequence.'@'.$pOrd}
- # $cache->{'tableCache:'.$p_count-1}=$join;
+ $TempCache{'CacheTable:'.($p_count-1)}=$join;
#6666666
# $r->print('<br>'.$out.'&'.$DoD);
@@ -529,47 +560,72 @@
&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('<input type="hidden" name="show" value="excel" />'."\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('<br>'.$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]);
@@ -581,21 +637,27 @@
}
}
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('<br>'.$Str);
my $Ptr;
if($cache->{'DisplayFormat'} eq 'Display CSV Format') {
my ($ResId,$Dummy)=split(/\*/,$Prob);
@@ -638,7 +700,7 @@
"\n".'<td bgcolor='.$color->{"yellow"}.'> '.$DiscNo.'</td>';
$r->print("\n".$Ptr.'</tr>' );
}
-# $cache->{'graph_gif:'.$RealIdx}=$DoD.':'.$Wrng;
+ $GraphDat->{'graph_gif:'.$RealIdx}=$DoD.':'.$Wrng;
}
--minaeibi1028571008--