[LON-CAPA-cvs] cvs: loncom /interface/statistics lonproblemstatistics.pm

minaeibi lon-capa-cvs@mail.lon-capa.org
Tue, 30 Jul 2002 22:09:01 -0000


This is a MIME encoded message

--minaeibi1028066941
Content-Type: text/plain

minaeibi		Tue Jul 30 18:09:01 2002 EDT

  Modified files:              
    /loncom/interface/statistics	lonproblemstatistics.pm 
  Log:
  Fixed some important bugs in calculating and displaying the discrimination factor
  
  
--minaeibi1028066941
Content-Type: text/plain
Content-Disposition: attachment; filename="minaeibi-20020730180901.txt"

Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.6 loncom/interface/statistics/lonproblemstatistics.pm:1.7
--- loncom/interface/statistics/lonproblemstatistics.pm:1.6	Mon Jul 29 18:01:11 2002
+++ loncom/interface/statistics/lonproblemstatistics.pm	Tue Jul 30 18:09:01 2002
@@ -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.7 2002/07/30 22:09:01 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -91,12 +91,12 @@
     }
     #&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 @@
     my $TotFirst = 0;
     my $TimeTot = 0;
     my $Discussed=0;
+    my $discrim='';
     my $tempSequenceOrder=100;
 
 #$Apache::lonxml::debug=1;
@@ -173,7 +174,7 @@
 #            next;
 #        }
 
-        my $Dis = '';
+        #$discrim .= '&';
         foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
 #	    $r->print("<br>problems=$cache->{$sequence.':problems'}");
             my $problem = $cache->{$problemID.':problem'};
@@ -192,6 +193,7 @@
             #}
 
             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 @@
                                                   $problemID.
                                                   ':parts'})) {
 		$tempProblemOrder++;
+		$partData{'count'}++;
 #		$r->print("<br>parts=$cache->{$sequence.':'.$problemID.':parts'}");
                 $partData{$part.':order'}=$tempProblemOrder;
                 $partData{$part.':tries'}=0;
@@ -225,13 +228,12 @@
 		    $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 @@
 
             # 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("<br>".$cache->{$sequence.':title'});
-
+		$partCounter++;
                 my $Yes = 0;
                 if($partData{$_.':code'} eq 'C' || 
                    $partData{$_.':code'} eq 'O') {
@@ -270,10 +272,12 @@
                 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 @@
                     $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 @@
                 $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 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 @@
         &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) {
@@ -481,8 +481,9 @@
 	    }
 
 #--------------------- 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);
@@ -773,7 +774,7 @@
 
 #------- Processing upperlist and lowerlist according to each problem
 sub ProcessDiscriminant {
-    my ($List) = @_;
+    my ($List,$r) = @_;
     my @sortedList = sort (@$List);
     my $Count = scalar @sortedList;
     my $Problem;
@@ -786,6 +787,7 @@
     my $nStudent=0;
     my %Proc=undef;
     while ($nIndex<$Count) {
+#        $r->print("<br> $nIndex) $sortedList[$nIndex]");
 	($Problem,$tmp)=split(/\=/,$sortedList[$nIndex]);
 	@Dis=split(/\+/,$tmp);
 	my $Temp = $Problem;
@@ -797,9 +799,8 @@
 	    ($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} <br>");
+#        $r->print("<br> $nIndex) $Temp --> ($nStudent) $Proc{$Temp}");
 	$Sum1=0;
 	$Sum2=0;
 	$nStudent=0;
@@ -810,8 +811,11 @@
 
 #------- 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 +829,8 @@
 	$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,8 +838,8 @@
             }
         }
     }
-    my %DisUp =  &ProcessDiscriminant(\@UpList);
-    my %DisLow = &ProcessDiscriminant(\@LowList);
+    my %DisUp =  &ProcessDiscriminant(\@UpList,$r);
+    my %DisLow = &ProcessDiscriminant(\@LowList,$r);
 
     return (\%DisUp, \%DisLow);
 }

--minaeibi1028066941--