loncom/homework/default_homework.lcpm - diff

Return to default_homework.lcpm CVS log

Up to [LON-CAPA] / loncom / homework

version 1.78, 2004/05/17 18:26:31	version 1.79, 2004/05/17 21:15:56
Line 484 sub format {	Line 484 sub format {
if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; }	if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; }
$fmt=~s/e/E/g;	$fmt=~s/e/E/g;
my $result=sprintf('%.'.$fmt,$value);	my $result=sprintf('%.'.$fmt,$value);
	if ($fmt eq '0f') { $result .='.'; }
$result=~s/(E[+-]*)0/$1/;	$result=~s/(E[+-]*)0/$1/;
if ($dollarmode) {$result=&dollarmode($result);}	if ($dollarmode) {$result=&dollarmode($result);}
return $result;	return $result;
Line 536 sub prettyprint {	Line 537 sub prettyprint {
if ($fmt =~ /chem/i) { return(&chemparse($value)); }	if ($fmt =~ /chem/i) { return(&chemparse($value)); }
if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; }	if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; }
if ($fmt) { $value=sprintf('%.'.$fmt,$value); }	if ($fmt) { $value=sprintf('%.'.$fmt,$value); }
	if ($fmt eq '0f') { $value .='.'; }
if ($value =~ /([0-9\.\-\+]+)E([0-9\-\+]+)/i ) {	if ($value =~ /([0-9\.\-\+]+)E([0-9\-\+]+)/i ) {
my $frac=$1;	my $frac=$1;
if ($dollarmode) { $frac=&dollarformat($frac); }	if ($dollarmode) { $frac=&dollarformat($frac); }