[BACK]Return to lonmaxima.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/lonmaxima.pm between versions 1.3 and 1.10

version 1.3, 2006/06/12 13:51:13 version 1.10, 2006/12/18 21:12:51
Line 31  package Apache::lonmaxima; Line 31  package Apache::lonmaxima;
 use strict;  use strict;
 use IO::Socket;  use IO::Socket;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::response();
   use LONCAPA;
   
 sub connect {  sub connect {
    return IO::Socket::UNIX->new(Peer    => $Apache::lonnet::perlvar{'lonSockDir'}.'/maximasock',     return IO::Socket::UNIX->new(Peer    => $Apache::lonnet::perlvar{'lonSockDir'}.'/maximasock',
Line 46  sub disconnect { Line 48  sub disconnect {
 sub maximareply {  sub maximareply {
     my ($socket,$cmd)=@_;      my ($socket,$cmd)=@_;
     if ($socket) {      if ($socket) {
  print $socket &Apache::lonnet::escape($cmd)."\n";   print $socket &escape($cmd)."\n";
         my $reply=<$socket>;          my $reply=<$socket>;
         chomp($reply);          chomp($reply);
         if ($reply=~/^Incorrect/) { $reply='Error: '.$reply; }          if ($reply=~/^Incorrect/) { $reply='Error: '.$reply; }
         return &Apache::lonnet::unescape($reply);          return &unescape($reply);
     } else {      } else {
         return 'Error: no connection.';          return 'Error: no connection.';
     }      }
Line 64  sub blacklisted { Line 66  sub blacklisted {
     return 0;      return 0;
 }  }
   
   sub runscript {
       my ($socket,$fullscript)=@_;
       if (&blacklisted($fullscript)) { return 'Error: blacklisted'; }
       my $reply;
       $fullscript=~s/[\n\r\l]//gs;
       foreach my $line (split(/\;/s,$fullscript)) {
    if ($line=~/\w/) { $reply=&maximareply($socket,$line.";\n"); }
    if ($reply=~/^Error\:/) { return $reply; }
       }
       $reply=~s/\W//gs;
       return $reply;
   }
   
   sub maxima_cas_formula_fix {
      my ($expression)=@_;
      return &Apache::response::implicit_multiplication($expression);
   }
   
   sub maxima_run {
       my ($script,$submission,$argument) = @_;
       my $socket=&connect();
       my $fullscript='';
       my $submission_index=1;
       foreach my $submission_component (split(/\s*\,\s*/,$submission)) {
    $fullscript.="RESPONSE[$submission_index]:".&maxima_cas_formula_fix($submission_component).";\n";
    $submission_index++;
       }
       my $argument_index=1;
       foreach my $argument_component (@{$argument}) {
    $fullscript.="LONCAPALIST[$argument_index]:".&maxima_cas_formula_fix($argument_component).";\n";
    $argument_index++;
       }
       $fullscript.=$script;
       my $reply=&runscript($socket,$fullscript);
       &disconnect($socket);
       if ($reply=~/^\s*true\s*$/) { return 'EXACT_ANS'; }
       if ($reply=~/^\s*false\s*/) { return 'INCORRECT'; } 
       return 'BAD_FORMULA';
   }
   
 sub compareterms {  sub compareterms {
     my ($socket,$terma,$termb)=@_;      my ($socket,$terma,$termb)=@_;
     my $difference=$terma.'-'.$termb;      my $difference=$terma.'-'.$termb;
Line 75  sub compareterms { Line 117  sub compareterms {
 }  }
   
 sub maxima_check {  sub maxima_check {
     my ($response,$answer,$type,      my ($response,$answer,$reterror) = @_;
         $tol_type,$tol,      my $socket=&connect();
         $sig_lbound,$sig_ubound,      my $reply=&compareterms($socket,$response,$answer);
         $ans_fmt,$unit,$calc,$id_list,      &disconnect($socket);
         $points,      if ($reply eq 'true') { return 1; }
         $randomseed,  
         $reterror) = @_;  
     return 7;      return 7;
 }  }
     
Removed from v.1.3  
changed lines
  Added in v.1.10

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>