[BACK]Return to lonquickgrades.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

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

version 1.92, 2011/05/25 01:12:01 version 1.94, 2011/05/27 19:32:10
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 718  ENDMOVE Line 745  ENDMOVE
                 }                  }
             }              }
         } elsif ($code eq 'droplow') {          } elsif ($code eq 'droplow') {
             ($totalcorrect,@individual)=&drop(0,0,$value,@individual);              ($totalpossible,$totalcorrect,@individual)=&drop(0,0,$value,@individual);
         } elsif ($code eq 'drophigh') {          } elsif ($code eq 'drophigh') {
             ($totalcorrect,@individual)=&drop(1,0,$value,@individual);              ($totalpossible,$totalcorrect,@individual)=&drop(1,0,$value,@individual);
         } elsif ($code eq 'droplowperc') {          } elsif ($code eq 'droplowperc') {
             ($totalcorrect,@individual)=&drop(0,1,$value,@individual);              ($totalpossible,$totalcorrect,@individual)=&drop(0,1,$value,@individual);
         } elsif ($code eq 'drophighperc') {          } elsif ($code eq 'drophighperc') {
             ($totalcorrect,@individual)=&drop(1,1,$value,@individual);              ($totalpossible,$totalcorrect,@individual)=&drop(1,1,$value,@individual);
         }          }
         if ($output) { $r->print('</li>'); }          if ($output) { $r->print('</li>'); }
     }      }
   # Re-adjust total points if force total
       if ($categories{$id.'_totaltype'} eq 'typein') {
          $totalpossible=1.*$categories{$id.'_total'};
       }
   
     if ($output) {       if ($output) { 
         $r->print('</ul>');           $r->print('</ul>'); 
         if ($cangrade) { $r->print('<br />'.&new_calc_rule_form($id)); }          if ($cangrade) { $r->print('<br />'.&new_calc_rule_form($id)); }
Line 775  ENDMOVE Line 807  ENDMOVE
 #  #
   
 sub drop {  sub drop {
     my ($high,$percent,@individual)=@_;      my ($high,$percent,$n,@individual)=@_;
   # Sort assignments by points or percent
     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 822  sub drop {
             $ca<=>$cb;              $ca<=>$cb;
         }          }
     } @individual;      } @individual;
   # Drop the ones we don't want
       if ($#newindividual>=$n) {
           if ($high) {
              splice(@newindividual,$#newindividual+1-$n,$n);
           } else {
              splice(@newindividual,0,$n);
           }
       } else {
           @newindividual=();
       }
   # Re-calculate how many points possible and achieved
       my $newpossible=0;
     my $newcorrect=0;      my $newcorrect=0;
     return ($newcorrect,@newindividual);      for my $score (@newindividual) {
           my ($thispossible,$thiscorrect)=(split(/\:/,$score));
           $newpossible+=$thispossible;
           $newcorrect+=$thiscorrect;
       }
       return ($newpossible,$newcorrect,@newindividual);
 }   } 
 #  #
 # Bottom line with grades  # Bottom line with grades
Removed from v.1.92  
changed lines
  Added in v.1.94

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