[BACK]Return to default_homework.lcpm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/default_homework.lcpm between versions 1.164 and 1.165

version 1.164, 2014/06/16 16:52:50 version 1.165, 2014/06/24 17:02:33
Line 1033  sub format_significant_figures { Line 1033  sub format_significant_figures {
     $number = abs($number);      $number = abs($number);
     # needed to correct for a number greater than 1 (or      # needed to correct for a number greater than 1 (or
     my $power = ($number < 1) ? 0 : 1;      my $power = ($number < 1) ? 0 : 1;
     if ($power && $number =~ /^\d+$/) {  
         my $nonzeros = $number;  
         $nonzeros =~ s/0+$//;  
         if (length($number) - length($nonzeros) > 1) {  
             # convert to exponential form  
             my $n = $sig-1;  
             my $numSig = sprintf('%.' . $n . 'E', $number);  
             # return number with sign  
             return $sign.$numSig;  
         }  
     }  
     # could round up. Take the integer part of log10.      # could round up. Take the integer part of log10.
     my $x10 = int(log($number)/log(10));      my $x10 = int(log($number)/log(10));
     # find number with values left of decimal pt = # of sign figs.      # find number with values left of decimal pt = # of sign figs.
Line 1054  sub format_significant_figures { Line 1043  sub format_significant_figures {
     my ($zeros) = ($xint =~ /(0+)$/);      my ($zeros) = ($xint =~ /(0+)$/);
     # return number to original magnitude      # return number to original magnitude
     my $numSig = $xint*10**($x10-$sig+$power);      my $numSig = $xint*10**($x10-$sig+$power);
     # insert trailing zero's if have decimal point      if ($numSig =~ /^(\d+)\.(\d+)/) {
     $numSig =~ s/^(\d+)\.(\d+)(\e?(.*)?)$/$1\.$2$zeros$3/;          # insert trailing zero's if have decimal point
     # put a decimal pt for number ending with 0 and length = # of sig fig          $numSig =~ s/^(\d+)\.(\d+)(\e?(.*)?)$/$1\.$2$zeros$3/;
     $numSig.='.' if (length($numSig) == $sig && $numSig =~ /0$/);      } else {
     if (length($numSig) < $sig) {          if ($numSig =~ /0$/) {
  $numSig.='.'.substr($zeros,0,($sig-length($numSig)));              # add decimal pt for number ending with 0 and length == # of sig figs
               if (length($numSig) == $sig) {
                   $numSig.='.';
               } elsif (length($numSig) > $sig) {
                   # exponential form for number ending with 0 and length > # of sig figs
                   my $fmtsig = $sig-1;
                   if ($fmtsig) {
                       $numSig = sprintf('%.'.$fmtsig.'e',$numSig);
                   }
               }
           }
           if (length($numSig) < $sig) {
               $numSig.='.'.substr($zeros,0,($sig-length($numSig)));
           }
     }      }
     # return number with sign      # return number with sign
     return $sign.$numSig;      return $sign.$numSig;
   
 }  }
   
 sub map {  sub map {
Line 1218  sub submission { Line 1219  sub submission {
        $output =~ s/</&lt;/g;         $output =~ s/</&lt;/g;
        $output =~ s/>/&gt;/g;         $output =~ s/>/&gt;/g;
        $output =~ s/"/&quot;/g;         $output =~ s/"/&quot;/g;
    };     }
    return $output;     return $output;
 }  }
   
Removed from v.1.164  
changed lines
  Added in v.1.165

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