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

Diff for /loncom/homework/lonmaxima.pm between versions 1.15 and 1.18

version 1.15, 2007/05/29 20:56:39 version 1.18, 2007/08/03 20:55:10
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',      foreach my $forbidden ('save','plot','lisp','includ','compil',
    'file','batch','stringout','translat','stout',     'file','batch','stringout','translat','stout',
    'stin','block','system','concat') {     'stin','block','system','concat') {
  if ($cmd=~/$forbidden/s) { return 1; }   if ($cmd=~/$forbidden/s) { return 1; }
Line 121  sub maxima_eval { Line 121  sub maxima_eval {
   
 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 134  sub maxima_check { Line 134  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.15  
changed lines
  Added in v.1.18

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