Diff for /loncom/homework/lonmaxima.pm between versions 1.6 and 1.16

version 1.6, 2006/12/11 17:37:43 version 1.16, 2007/06/15 21:49:50
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;  use LONCAPA;
   
 sub connect {  sub connect {
Line 59  sub maximareply { Line 60  sub maximareply {
   
 sub blacklisted {  sub blacklisted {
     my ($cmd)=@_;      my ($cmd)=@_;
     foreach my $forbidden ('save','load','plot','lisp','includ','compil','file','batch','stringout','translat','stout','stin','block','system') {      foreach my $forbidden ('save','load','plot','lisp','includ','compil',
      'file','batch','stringout','translat','stout',
      'stin','block','system','concat') {
  if ($cmd=~/$forbidden/s) { return 1; }   if ($cmd=~/$forbidden/s) { return 1; }
     }       } 
     return 0;      return 0;
Line 68  sub blacklisted { Line 71  sub blacklisted {
 sub runscript {  sub runscript {
     my ($socket,$fullscript)=@_;      my ($socket,$fullscript)=@_;
     if (&blacklisted($fullscript)) { return 'Error: blacklisted'; }      if (&blacklisted($fullscript)) { return 'Error: blacklisted'; }
     return &maximareply($socket,$fullscript);      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/^\s*//gs;
       $reply=~s/\s*$//gs;
       &Apache::lonxml::debug("maxima $fullscript \n reply $reply");
       return $reply;
   }
   
   sub maxima_cas_formula_fix {
      my ($expression)=@_;
      return &Apache::response::implicit_multiplication($expression);
 }  }
   
 sub maxima_run {  sub maxima_run {
     my ($script,$submission,$arguments) = @_;      my ($script,$submission,$argument) = @_;
     my $socket=&connect();      my $socket=&connect();
     my $fullscript=$script;      my @submissionarray=split(/\s*\,\s*/,$submission);
     my $reply=&runscript($socket,$fullscript);      for (my $i=0;$i<=$#submissionarray;$i++) {
 #    &Apache::lonnet::logthis('Script:'.$fullscript);          my $n=$i+1;
 #    &Apache::lonnet::logthis('Sub:'.$submission);          my $fixedsubmission=&maxima_cas_formula_fix($submissionarray[$i]);
 #    &Apache::lonnet::logthis('Arg:'.$arguments);          $script=~s/RESPONSE\[$n\]/$fixedsubmission/gs;
       }
       my @argumentarray=@{$argument};
       for (my $i=0;$i<=$#argumentarray;$i++) {
           my $n=$i+1;
           my $fixedargument=&maxima_cas_formula_fix($argumentarray[$i]);
           $script=~s/LONCAPALIST\[$n\]/$fixedargument/gs;
       }
       my $reply=&runscript($socket,$script);
     &disconnect($socket);      &disconnect($socket);
     if ($reply=~/^\s*true\s*$/) { return 'EXACT_ANS'; }      if ($reply=~/^\s*true\s*$/i) { return 'EXACT_ANS'; }
     if ($reply=~/^\s*false\s*/) { return 'INCORRECT'; }       if ($reply=~/^\s*false\s*$/i) { return 'INCORRECT'; } 
     return 'BAD_FORMULA';      return 'BAD_FORMULA';
 }  }
   
   sub maxima_eval {
       my ($script) = @_;
       my $socket=&connect();
       my $reply=&runscript($socket,$script);
       &disconnect($socket);
       return $reply;
   }
   
   
 sub compareterms {  sub compareterms {
     my ($socket,$terma,$termb)=@_;      my ($socket,$terma,$termb)=@_;
     my $difference=$terma.'-'.$termb;      my $difference=$terma.'-('.$termb.')';
     if (&blacklisted($difference)) { return 'Error: blacklisted'; }      if (&blacklisted($difference)) { return 'Error: blacklisted'; }
     my $reply=&maximareply($socket,'trigsimp(trigreduce('.$difference.'));');      my $reply=&maximareply($socket,'trigsimp(trigreduce('.$difference.'));');
     if ($reply=~/^\s*0\s*$/) { return 'true'; }      if ($reply=~/^\s*0\s*$/) { return 'true'; }

Removed from v.1.6  
changed lines
  Added in v.1.16


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