version 1.35, 2017/03/07 01:56:56
|
version 1.38, 2017/06/12 00:22:35
|
Line 118 sub runscript {
|
Line 118 sub runscript {
|
sub maxima_cas_formula_fix { |
sub maxima_cas_formula_fix { |
my ($expression)=@_; |
my ($expression)=@_; |
$expression=&Apache::response::implicit_multiplication($expression); |
$expression=&Apache::response::implicit_multiplication($expression); |
$expression=~s/([^\w\%])pi/$1\%pi/gs; |
$expression=~s/(^|[^\w\%])pi(\W|$)/$1\%pi$2/gs; |
return $expression; |
return $expression; |
} |
} |
|
|
Line 166 sub compareterms {
|
Line 166 sub compareterms {
|
sub maxima_check { |
sub maxima_check { |
my ($response,$answer,$reterror) = @_; |
my ($response,$answer,$reterror) = @_; |
my $socket=&connect(); |
my $socket=&connect(); |
my $reply=&compareterms($socket,$response,$answer); |
my $reply=&maximareply($socket,$response.';'); |
|
unless ($reply=~/^Error\:/) { |
|
$reply=&compareterms($socket,$response,$answer); |
|
} |
&disconnect($socket); |
&disconnect($socket); |
# integer to string mappings come from capaParser.h |
# integer to string mappings come from capaParser.h |
# 1 maps to 'EXACT_ANS' |
# 1 maps to 'EXACT_ANS' |