Diff for /loncom/interface/lonquickgrades.pm between versions 1.92 and 1.93

version 1.92, 2011/05/25 01:12:01 version 1.93, 2011/05/26 18:02:22
Line 478  sub outputCategories { Line 478  sub outputCategories {
 #    foreach (keys(%data)) {  #    foreach (keys(%data)) {
 #        $r->print("\n<br />".$_.'='.$data{$_});  #        $r->print("\n<br />".$_.'='.$data{$_});
 #    }  #    }
   #   my @debugarray=('5:1','4:3','1:1','5:5','6:7');
   #   $r->print("Array: ".join(',',@debugarray).'<br />');
   #   $r->print("0,0,0: ".join(',',&drop(0,0,0,@debugarray)).'<br />');
   #   $r->print("1,0,0: ".join(',',&drop(1,0,0,@debugarray)).'<br />');
   #   $r->print("0,1,0: ".join(',',&drop(0,1,0,@debugarray)).'<br />');
   #   $r->print("1,1,0: ".join(',',&drop(1,1,0,@debugarray)).'<br />');
   #
   #   $r->print("0,0,2: ".join(',',&drop(0,0,2,@debugarray)).'<br />');
   #   $r->print("1,0,2: ".join(',',&drop(1,0,2,@debugarray)).'<br />');
   #   $r->print("0,1,2: ".join(',',&drop(0,1,2,@debugarray)).'<br />');
   #   $r->print("1,1,2: ".join(',',&drop(1,1,2,@debugarray)).'<br />');
   #
   #   $r->print("0,0,4: ".join(',',&drop(0,0,4,@debugarray)).'<br />');
   #   $r->print("1,0,4: ".join(',',&drop(1,0,4,@debugarray)).'<br />');
   #   $r->print("0,1,4: ".join(',',&drop(0,1,4,@debugarray)).'<br />');
   #   $r->print("1,1,4: ".join(',',&drop(1,1,4,@debugarray)).'<br />');
   #
   #   $r->print("0,0,5: ".join(',',&drop(0,0,5,@debugarray)).'<br />');
   #   $r->print("1,0,5: ".join(',',&drop(1,0,5,@debugarray)).'<br />');
   #   $r->print("0,1,5: ".join(',',&drop(0,1,5,@debugarray)).'<br />');
   #   $r->print("1,1,5: ".join(',',&drop(1,1,5,@debugarray)).'<br />');
   #
   #   $r->print("0,0,7: ".join(',',&drop(0,0,7,@debugarray)).'<br />');
   #   $r->print("1,0,7: ".join(',',&drop(1,0,7,@debugarray)).'<br />');
   #   $r->print("0,1,7: ".join(',',&drop(0,1,7,@debugarray)).'<br />');
   #   $r->print("1,1,7: ".join(',',&drop(1,1,7,@debugarray)).'<br />');
   
 }  }
   
 #  #
Line 775  ENDMOVE Line 802  ENDMOVE
 #  #
   
 sub drop {  sub drop {
     my ($high,$percent,@individual)=@_;      my ($high,$percent,$n,@individual)=@_;
     my @newindividual=sort {      my @newindividual=sort {
         my ($pa,$ca)=split(/\:/,$a);          my ($pa,$ca)=split(/\:/,$a);
         my ($pb,$cb)=split(/\:/,$b);          my ($pb,$cb)=split(/\:/,$b);
Line 789  sub drop { Line 816  sub drop {
             $ca<=>$cb;              $ca<=>$cb;
         }          }
     } @individual;      } @individual;
       if ($#newindividual>=$n) {
           if ($high) {
              splice(@newindividual,$#newindividual+1-$n,$n);
           } else {
              splice(@newindividual,0,$n);
           }
       } else {
           @newindividual=();
       }
     my $newcorrect=0;      my $newcorrect=0;
       for my $score (@newindividual) {
           $newcorrect+=(split(/\:/,$score))[1];
       }
     return ($newcorrect,@newindividual);      return ($newcorrect,@newindividual);
 }   } 
 #  #

Removed from v.1.92  
changed lines
  Added in v.1.93


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>