Return to lonmaxima.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/lonmaxima.pm between versions 1.16 and 1.25

version 1.16, 2007/06/15 21:49:50	version 1.25, 2008/08/21 12:08:32
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 (
'file','batch','stringout','translat','stout',	'\? ','\?','%i','%o','batch','block'
'stin','block','system','concat') {	,'compil','concat','describe','display2d','file','inchar'
	,'includ','lisp','load','outchar','plot','quit'
	,'read','reset','save','stin','stout','stringout'
	,'system','translat','ttyoff','with_stdout','writefile'
	) {
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 121 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 135 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=~/^\strue\s$/i) { return 'EXACT_ANS'; }	if ($reply=~/^\strue\s$/i) { return 'EXACT_ANS'; }
if ($reply=~/^\sfalse\s$/i) { return 'INCORRECT'; }	if ($reply=~/^\sfalse\s$/i) { return 'INCORRECT'; }
Line 111 sub maxima_run {	Line 143 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 166 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;
}	}

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

500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.

Removed from v.1.16
changed lines
	Added in v.1.25