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

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

version 1.10, 2006/12/18 21:12:51 version 1.21, 2007/08/14 21:54:54
Line 60  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','read','inchar',
      'outchar','ttyoff','with_stdout','writefile',
      'reset') {
  if ($cmd=~/$forbidden/s) { return 1; }   if ($cmd=~/$forbidden/s) { return 1; }
     }       } 
     return 0;      return 0;
Line 75  sub runscript { Line 79  sub runscript {
  if ($line=~/\w/) { $reply=&maximareply($socket,$line.";\n"); }   if ($line=~/\w/) { $reply=&maximareply($socket,$line.";\n"); }
  if ($reply=~/^Error\:/) { return $reply; }   if ($reply=~/^Error\:/) { return $reply; }
     }      }
     $reply=~s/\W//gs;      $reply=~s/^\s*//gs;
       $reply=~s/\s*$//gs;
       &Apache::lonxml::debug("maxima $fullscript \n reply $reply");
     return $reply;      return $reply;
 }  }
   
Line 87  sub maxima_cas_formula_fix { Line 93  sub maxima_cas_formula_fix {
 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]:".&maxima_cas_formula_fix($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]:".&maxima_cas_formula_fix($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.')';
     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'; }
Line 121  sub maxima_check { Line 136  sub maxima_check {
     my $socket=&connect();      my $socket=&connect();
     my $reply=&compareterms($socket,$response,$answer);      my $reply=&compareterms($socket,$response,$answer);
     &disconnect($socket);      &disconnect($socket);
       # integer to string mappings come from capaParser.h
       # 1 maps to 'EXACT_ANS'
     if ($reply eq 'true') { return 1; }      if ($reply eq 'true') { return 1; }
       # 7 maps to 'INCORRECT'
     return 7;      return 7;
 }  }
     
Removed from v.1.10  
changed lines
  Added in v.1.21

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