loncom/homework/caparesponse/caparesponse.pm - diff

Return to caparesponse.pm CVS log

Up to [LON-CAPA] / loncom / homework / caparesponse

-version 1.9, 2000/10/13 14:32:42
+version 1.10, 2000/10/13 14:59:31
  Line 38  sub end_caparesponse {
        $args=$$parstack[$#$parstack];
      }
      my $answer = &Apache::run::run("{$args;".'return $answer}',$safeeval);
-     if ( $answer eq $response ) {
+     if ( $answer == 1.0 * $answer ) {
-       return "Correct, Computer had $answer<br></br>";
+       my $tol = &Apache::run::run("{$args;".'return $tol}',$safeeval);
-     } else {
+       my $format = &Apache::run::run("{$args;".'return $format}',$safeeval);
-       return "Incorrect, Computer had $answer<br></br>";
+       my $formatedanswer = sprintf('%.'.$format,$answer);
+       my $difference = abs($answer - $formatedanswer);
+       my $studiff = abs($answer - $response);
+       if ( $difference > $studiff ) {
+ 	return "Correct, Computer had $answer<br></br>";
+       } else {
+ 	return "Incorrect, Computer had $answer<br></br>";
+       }
+     } else {
+       if ( $answer eq $response ) {
+ 	return "Correct, Computer had $answer<br></br>";
+       } else {
+ 	return "Incorrect, Computer had $answer<br></br>";
+       }
      }
    } else {
      #return "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";