Diff for /loncom/homework/lonmaxima.pm between versions 1.8 and 1.13

version 1.8, 2006/12/15 21:10:13 version 1.13, 2007/04/19 17:40:43
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 78  sub runscript { Line 79  sub runscript {
     return $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,$argument) = @_;      my ($script,$submission,$argument) = @_;
     my $socket=&connect();      my $socket=&connect();
     my $fullscript='';      my @submissionarray=split(/\s*\,\s*/,$submission);
     my $submission_index=1;      for (my $i=0;$i<=$#submissionarray;$i++) {
     foreach my $submission_component (split(/\s*\,\s*/,$submission)) {          my $n=$i+1;
  $fullscript.="RESPONSE[$submission_index]:$submission_component;\n";          my $fixedsubmission=&maxima_cas_formula_fix($submissionarray[$i]);
  $submission_index++;          $script=~s/RESPONSE\[$n\]/$fixedsubmission/gs;
     }      }
     my $argument_index=1;      my @argumentarray=@{$argument};
     foreach my $argument_component (@{$argument}) {      for (my $i=0;$i<=$#argumentarray;$i++) {
  $fullscript.="LONCAPALIST[$argument_index]:$argument_component;\n";          my $n=$i+1;
  $argument_index++;          my $fixedargument=&maxima_cas_formula_fix($argumentarray[$i]);
           $script=~s/LONCAPALIST\[$n\]/$fixedargument/gs;
     }      }
     $fullscript.=$script;      my $reply=&runscript($socket,$script);
     my $reply=&runscript($socket,$fullscript);  
     &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;

Removed from v.1.8  
changed lines
  Added in v.1.13


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