version 1.112, 2003/09/22 18:47:59
|
version 1.114, 2003/09/22 20:49:01
|
Line 169 sub end_numericalresponse {
|
Line 169 sub end_numericalresponse {
|
$safeeval); |
$safeeval); |
my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
my $status = $Apache::inputtags::status['-1']; |
my $status = $Apache::inputtags::status['-1']; |
if ( ($award =~ /^correct/ |
if ( &Apache::response::show_answer() ) { |
&& lc($Apache::lonhomework::problemstatus) ne 'no') |
|
|| $status eq "SHOW_ANSWER") { |
|
my (@formats)=&Apache::lonxml::get_param_var('format',$parstack, |
my (@formats)=&Apache::lonxml::get_param_var('format',$parstack, |
$safeeval); |
$safeeval); |
my $unit=&Apache::lonxml::get_param_var('unit',$parstack, |
my $unit=&Apache::lonxml::get_param_var('unit',$parstack, |
Line 411 sub format_number {
|
Line 409 sub format_number {
|
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*)$/) { |
if (abs($3)>=100) {$format = 'e3';} else {$format = 'e2';} |
$format = '3e'; |
} elsif ($number=~/^(\d*)\.(\d*)$/) { |
} elsif ($number=~/^(\d*)\.(\d*)$/) { |
$format = '4f'; |
$format = '4f'; |
} elsif ($number=~/^(\d*)$/) { |
} elsif ($number=~/^(\d*)$/) { |