--- loncom/homework/caparesponse/caparesponse.pm	2002/01/17 12:23:31	1.50
+++ loncom/homework/caparesponse/caparesponse.pm	2002/04/11 19:48:16	1.52
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.50 2002/01/17 12:23:31 harris41 Exp $
+# $Id: caparesponse.pm,v 1.52 2002/04/11 19:48:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -191,6 +191,7 @@ sub end_numericalresponse {
     $result.='</td></tr>'.&Apache::edit::end_table;
   } elsif ($target eq 'answer') {
 
+    &Apache::response::setup_params($$tagstack[-1]);
     my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
@@ -207,12 +208,26 @@ sub end_numericalresponse {
 	  $fmt=$formats[0];
 	}
       }
-      if ($fmt) { $ans = sprintf('%.'.$fmt,$ans); }
+      my ($high,$low);
+      if ($Apache::inputtags::params{'tol'}) {
+	($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});
+      }	
+      my ($sighigh,$siglow);
+      if ($Apache::inputtags::params{'sig'}) {
+	($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
+      }
+      if ($fmt) {
+	$ans = sprintf('%.'.$fmt,$ans);
+	if ($high) {
+	  $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low);
+	}
+      }
+      if ($high) { $ans.=' ['.$low.','.$high.'] '; }
+      if ($sighigh) { $ans.= "Sig <i>$siglow - $sighigh</i>"; }
       $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
     }
     if ($unit) {
-      $result.=&Apache::response::answer_part($$tagstack[-1],
-					      '<b>'.$unit.'</b>');
+      $result.=&Apache::response::answer_part($$tagstack[-1],"Unit: <b>$unit</b>");
     }
     if ($type || $token->[1] eq 'stringresponse') {
       my $string='Case Insensitive';
@@ -238,6 +253,40 @@ sub end_numericalresponse {
   return $result;
 }
 
+sub get_tolrange {
+  my ($ans,$tol)=@_;
+  my ($high,$low);
+  if ($tol =~ /%$/) {
+    chop($tol);
+    my $change=$ans*($tol/100.0);
+    $high=$ans+$change;
+    $low=$ans-$change;
+  } else {
+    $high=$ans+$tol;
+    $low=$ans-$tol;
+  }
+  return ($high,$low);
+}
+
+sub get_sigrange {
+  my ($sig)=@_;
+  &Apache::lonxml::debug("Got a sig of :$sig:");
+  my $sig_lbound;
+  my $sig_ubound;
+  if ($sig eq '') {
+    $sig_lbound = 0; #SIG_LB_DEFAULT
+    $sig_ubound =15; #SIG_UB_DEFAULT
+  } else {
+    ($sig_lbound,$sig_ubound) = split(/,/,$sig);
+    if (!$sig_lbound) {
+      $sig_lbound = 0; #SIG_LB_DEFAULT
+      $sig_ubound =15; #SIG_UB_DEFAULT
+    }
+    if (!$sig_ubound) { $sig_ubound=$sig_lbound; }
+  }
+  return ($sig_ubound,$sig_lbound);
+}
+
 sub start_stringresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;