version 1.16, 2007/06/15 21:49:50
|
version 1.24, 2008/08/21 11:11:31
|
Line 62 sub blacklisted {
|
Line 62 sub blacklisted {
|
my ($cmd)=@_; |
my ($cmd)=@_; |
foreach my $forbidden ('save','load','plot','lisp','includ','compil', |
foreach my $forbidden ('save','load','plot','lisp','includ','compil', |
'file','batch','stringout','translat','stout', |
'file','batch','stringout','translat','stout', |
'stin','block','system','concat') { |
'stin','block','system','concat','read','inchar', |
|
'outchar','ttyoff','with_stdout','writefile', |
|
'reset','quit','\? ','\?','display2d','%i','%o','describe') { |
if ($cmd=~/$forbidden/s) { return 1; } |
if ($cmd=~/$forbidden/s) { return 1; } |
} |
} |
return 0; |
return 0; |
} |
} |
|
|
|
sub maxima_allowed_libraries { |
|
return ( |
|
"absimp","affine","atensor","atrig1","augmented_lagrangian","contrib_ode","ctensor","descriptive","diag", |
|
"eigen","facexp","fft","fourie","functs","ggf","grobner","impdiff","ineq","interpol","itensor","lapack", |
|
"lbfgs","lindstedt","linearalgebra","lsquares","makeOrders","mnewton","mchrpl","ntrig","orthopoly", |
|
"quadpack","rducon","romberg","scifac","simplex","solve_rec","sqdnst","stats","sterling","sym","units", |
|
"vect","zeilberger"); |
|
} |
|
|
|
sub maxima_is_allowed_library { |
|
my ($library)=@_; |
|
foreach my $allowed_library (&maxima_allowed_libraries()) { |
|
if ($library eq $allowed_library) { return 1; } |
|
} |
|
return 0; |
|
} |
|
|
sub runscript { |
sub runscript { |
my ($socket,$fullscript)=@_; |
my ($socket,$fullscript,$libraries)=@_; |
if (&blacklisted($fullscript)) { return 'Error: blacklisted'; } |
if (&blacklisted($fullscript)) { return 'Error: blacklisted'; } |
my $reply; |
my $reply; |
$fullscript=~s/[\n\r\l]//gs; |
$fullscript=~s/[\n\r\l]//gs; |
|
if ($libraries) { |
|
foreach my $library (split(/\s*\,\s*/,$libraries)) { |
|
unless ($library=~/\w/) { next; } |
|
if (&maxima_is_allowed_library($library)) { |
|
$reply=&maximareply($socket,'load('.$library.')$'."\n"); |
|
if ($reply=~/^Error\:/) { return $reply; } |
|
} else { |
|
return 'Error: blacklisted'; |
|
} |
|
} |
|
} |
foreach my $line (split(/\;/s,$fullscript)) { |
foreach my $line (split(/\;/s,$fullscript)) { |
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; } |
Line 89 sub maxima_cas_formula_fix {
|
Line 119 sub maxima_cas_formula_fix {
|
} |
} |
|
|
sub maxima_run { |
sub maxima_run { |
my ($script,$submission,$argument) = @_; |
my ($script,$submission,$argument,$libraries) = @_; |
my $socket=&connect(); |
my $socket=&connect(); |
my @submissionarray=split(/\s*\,\s*/,$submission); |
my @submissionarray=split(/\s*\,\s*/,$submission); |
for (my $i=0;$i<=$#submissionarray;$i++) { |
for (my $i=0;$i<=$#submissionarray;$i++) { |
Line 103 sub maxima_run {
|
Line 133 sub maxima_run {
|
my $fixedargument=&maxima_cas_formula_fix($argumentarray[$i]); |
my $fixedargument=&maxima_cas_formula_fix($argumentarray[$i]); |
$script=~s/LONCAPALIST\[$n\]/$fixedargument/gs; |
$script=~s/LONCAPALIST\[$n\]/$fixedargument/gs; |
} |
} |
my $reply=&runscript($socket,$script); |
my $reply=&runscript($socket,$script,$libraries); |
&disconnect($socket); |
&disconnect($socket); |
if ($reply=~/^\s*true\s*$/i) { return 'EXACT_ANS'; } |
if ($reply=~/^\s*true\s*$/i) { return 'EXACT_ANS'; } |
if ($reply=~/^\s*false\s*$/i) { return 'INCORRECT'; } |
if ($reply=~/^\s*false\s*$/i) { return 'INCORRECT'; } |
Line 111 sub maxima_run {
|
Line 141 sub maxima_run {
|
} |
} |
|
|
sub maxima_eval { |
sub maxima_eval { |
my ($script) = @_; |
my ($script,$libraries) = @_; |
my $socket=&connect(); |
my $socket=&connect(); |
my $reply=&runscript($socket,$script); |
my $reply=&runscript($socket,$script,$libraries); |
&disconnect($socket); |
&disconnect($socket); |
return $reply; |
return $reply; |
} |
} |
Line 134 sub maxima_check {
|
Line 164 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; } |
|
# 11 maps to 'BAD_FORMULA' |
|
if ($reply=~/^Error\:/) { return 11; } |
|
# 7 maps to 'INCORRECT' |
return 7; |
return 7; |
} |
} |
|
|