loncom/homework/default_homework.lcpm - diff

Return to default_homework.lcpm CVS log

Up to [LON-CAPA] / loncom / homework

version 1.97, 2005/03/31 14:43:13	version 1.99, 2005/04/01 13:58:25
Line 518 sub format {	Line 518 sub format {
#if ($options =~ /\$/) { $dollamode=1; }	#if ($options =~ /\$/) { $dollamode=1; }
#if ($options =~ /,/) { $commamode=1; }	#if ($options =~ /,/) { $commamode=1; }
if ($options =~ /\./) { $alwaysperiod=1; }	if ($options =~ /\./) { $alwaysperiod=1; }
	my $result;
if ($fmt=~/s$/i) {	if ($fmt=~/s$/i) {
$result=&format_significant_figures($value,$fmt);	$result=&format_significant_figures($value,$fmt);
} else {	} else {
$fmt=~s/e/E/g;	$fmt=~s/e/E/g;
my $result=sprintf('%.'.$fmt,$value);	$result=sprintf('%.'.$fmt,$value);
if ($alwaysperiod && $fmt eq '0f') { $result .='.'; }	if ($alwaysperiod && $fmt eq '0f') { $result .='.'; }
$result=~s/(E[+-]*)0/$1/;	$result=~s/(E[+-]*)0/$1/;
}	}
Line 680 sub format_significant_figures {	Line 681 sub format_significant_figures {
my $numSig = $xint10*($x10-$sig+$power);	my $numSig = $xint10*($x10-$sig+$power);
# insert trailing zero's if have decimal point	# insert trailing zero's if have decimal point
$numSig =~ s/^(\d+)\.(\d+)(\e?(.*)?)$/$1\.$2$zeros$3/;	$numSig =~ s/^(\d+)\.(\d+)(\e?(.*)?)$/$1\.$2$zeros$3/;
	# put a decimal pt for number ending with 0 and length = # of sig fig
	$numSig.='.' if (length($numSig) == $sig && $numSig =~ /0$/);
	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;