version 1.108, 2003/08/21 17:33:22
|
version 1.111, 2003/09/22 18:38:59
|
Line 194 sub end_numericalresponse {
|
Line 194 sub end_numericalresponse {
|
} |
} |
my $formatted; |
my $formatted; |
if ((defined($format)) && ($format ne '')) { |
if ((defined($format)) && ($format ne '')) { |
|
$format=~s/e/E/g; |
&Apache::lonxml::debug("formatting with :$format: answer :$answer:"); |
&Apache::lonxml::debug("formatting with :$format: answer :$answer:"); |
$formatted=sprintf('%.'.$format,$answer).','; |
$formatted=sprintf('%.'.$format,$answer).','; |
} else { |
} else { |
Line 416 sub format_number {
|
Line 417 sub format_number {
|
my ($number,$format,$target)=@_; |
my ($number,$format,$target)=@_; |
my $ans; |
my $ans; |
if ($format ne '') { |
if ($format ne '') { |
|
$format=~s/e/E/g; |
$ans = sprintf('%.'.$format,$number); |
$ans = sprintf('%.'.$format,$number); |
} else { |
} else { |
my $format = ''; |
my $format = ''; |
#What is the number? (integer,decimal,floating point) |
#What is the number? (integer,decimal,floating point) |
if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) { |
if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) { |
$format = 'e'.$2; |
if (abs($3)>=100) {$format = 'e3';} else {$format = 'e2';} |
} elsif ($number=~/^(\d*)\.(\d*)$/) { |
} elsif ($number=~/^(\d*)\.(\d*)$/) { |
$format = '4f'; |
$format = '4f'; |
} elsif ($number=~/^(\d*)$/) { |
} elsif ($number=~/^(\d*)$/) { |