--- loncom/homework/caparesponse/caparesponse.pm 2002/09/30 15:10:58 1.58
+++ loncom/homework/caparesponse/caparesponse.pm 2002/10/04 06:35:28 1.64
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# caparesponse definition
#
-# $Id: caparesponse.pm,v 1.58 2002/09/30 15:10:58 sakharuk Exp $
+# $Id: caparesponse.pm,v 1.64 2002/10/04 06:35:28 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -168,9 +168,9 @@ sub end_numericalresponse {
my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
if ($target eq 'web') {
- $result="
The computer got ";
+ $result="
The correct answer is ";
} elsif ($target eq 'tex') {
- $result='\vskip 0 mm The computer got \\texttt{';
+ $result='\vskip 0 mm The correct answer is \\texttt{';
}
for (my $i=0; $i <= $#answers; $i++) {
my $answer=$answers[$i];
@@ -220,19 +220,36 @@ sub end_numericalresponse {
for ($ind=0;$ind<$number_of_bubbles;$ind++) {
$bubbles_values[$ind] = $answers[0]*$factor**($power-$powers[$powers_number-$ind-1]);
}
+ my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
+ 'Q','R','S','T','U','V','W','X','Y','Z');
if ($target eq 'web') {
$result.= '
'.$ans.' | '; + my $ans; + if ($formats[0] ne '') { + $ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]); + } else { + my $badans = $bubbles_values[$ind]; + my $format = ''; + #What is the number? (integer,decimal,floating point) + if ($badans=~/^(\d*\.?\d*)(E|e)(\d*)$/) { + $format = 'e'.$2; + } elsif ($badans=~/^(\d*)\.(\d*)$/) { + $format = '4f'; + } elsif ($badans=~/^(\d*)$/) { + $format = 'd'; + } + $ans = sprintf('%.'.$format,$bubbles_values[$ind]); } + $result.=''.$alphabet[$ind].': '.$ans.' | '; + } $result.='