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

Diff for /loncom/homework/lonmaxima.pm between versions 1.4 and 1.7

version 1.4, 2006/06/12 14:22:01 version 1.7, 2006/12/11 22:02:13
Line 65  sub blacklisted { Line 65  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_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]:$submission_component;\n";
    $submission_index++;
       }
       my $argument_index=1;
       foreach my $argument_component (split(/\s*\,\s*/,$argument)) {
    $fullscript.="LONCAPALIST[$argument_index]:$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 76  sub compareterms { Line 111  sub compareterms {
 }  }
   
 sub maxima_check {  sub maxima_check {
     my ($response,$answer,$type,      my ($response,$answer,$reterror) = @_;
         $tol_type,$tol,  
         $sig_lbound,$sig_ubound,  
         $ans_fmt,$unit,$calc,$id_list,  
         $points,  
         $randomseed,  
         $reterror) = @_;  
     my $socket=&connect();      my $socket=&connect();
     my $reply=&compareterms($socket,$response,$answer);      my $reply=&compareterms($socket,$response,$answer);
     &disconnect($socket);      &disconnect($socket);
Removed from v.1.4  
changed lines
  Added in v.1.7

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