version 1.161, 2011/10/06 17:15:40
|
version 1.164, 2014/06/16 16:52:50
|
Line 816 sub cos { CORE::cos(shift) }
|
Line 816 sub cos { CORE::cos(shift) }
|
sub exp { CORE::exp(shift) } |
sub exp { CORE::exp(shift) } |
sub int { CORE::int(shift) } |
sub int { CORE::int(shift) } |
sub log { CORE::log(shift) } |
sub log { CORE::log(shift) } |
|
sub ln { CORE::log(shift) } |
sub atan2 { CORE::atan2($_[0],$_[1]) } |
sub atan2 { CORE::atan2($_[0],$_[1]) } |
sub sqrt { CORE::sqrt(shift) } |
sub sqrt { CORE::sqrt(shift) } |
|
|
Line 1032 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 1196 sub sec {
|
Line 1208 sub sec {
|
} |
} |
|
|
sub submission { |
sub submission { |
my ($partid,$responseid,$subnumber)=@_; |
my ($partid,$responseid,$subnumber,$encode)=@_; |
my $sub=''; |
my $sub=''; |
if ($subnumber) { $sub=$subnumber.':'; } |
if ($subnumber) { $sub=$subnumber.':'; } |
return &EXT('user.resource.'.$sub.'resource.'.$partid.'.'.$responseid.'.submission'); |
my $output = |
|
&EXT('user.resource.'.$sub.'resource.'.$partid.'.'.$responseid.'.submission'); |
|
if ($encode) { |
|
$output =~ s/&/&/g; |
|
$output =~ s/</</g; |
|
$output =~ s/>/>/g; |
|
$output =~ s/"/"/g; |
|
}; |
|
return $output; |
} |
} |
|
|
sub currentpart { |
sub currentpart { |