loncom/homework/lonmaxima.pm - diff

Return to lonmaxima.pm CVS log

Up to [LON-CAPA] / loncom / homework

-version 1.4, 2006/06/12 14:22:01
+version 1.6, 2006/12/11 17:37:43
  Line 65  sub blacklisted {
      return 0;
  }
+ sub runscript {
+     my ($socket,$fullscript)=@_;
+     if (&blacklisted($fullscript)) { return 'Error: blacklisted'; }
+     return &maximareply($socket,$fullscript);
+ }
+ sub maxima_run {
+     my ($script,$submission,$arguments) = @_;
+     my $socket=&connect();
+     my $fullscript=$script;
+     my $reply=&runscript($socket,$fullscript);
+ #    &Apache::lonnet::logthis('Script:'.$fullscript);
+ #    &Apache::lonnet::logthis('Sub:'.$submission);
+ #    &Apache::lonnet::logthis('Arg:'.$arguments);
+     &disconnect($socket);
+     if ($reply=~/^\s*true\s*$/) { return 'EXACT_ANS'; }
+     if ($reply=~/^\s*false\s*/) { return 'INCORRECT'; }
+     return 'BAD_FORMULA';
+ }
  sub compareterms {
      my ($socket,$terma,$termb)=@_;
      my $difference=$terma.'-'.$termb;
- Line 76  sub compareterms {
+ Line 97  sub compareterms {
  }
  sub maxima_check {
-     my ($response,$answer,$type,
+     my ($response,$answer,$reterror) = @_;
-         $tol_type,$tol,
-         $sig_lbound,$sig_ubound,
-         $ans_fmt,$unit,$calc,$id_list,
-         $points,
-         $randomseed,
-         $reterror) = @_;
      my $socket=&connect();
      my $reply=&compareterms($socket,$response,$answer);
      &disconnect($socket);