version 1.15, 2007/05/29 20:56:39
|
version 1.17, 2007/07/11 18:50:33
|
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; |
} |
} |
|
|