loncom/homework/default_homework.lcpm - diff

Return to default_homework.lcpm CVS log

Up to [LON-CAPA] / loncom / homework

version 1.141, 2008/09/27 07:26:45	version 1.144, 2009/04/17 01:00:15
Line 217 sub caparesponse_check {	Line 217 sub caparesponse_check {

my $reterror="";	my $reterror="";
my $result;	my $result;
if ((($type eq '9') \|\| ($type eq '8')) && ($response=~/\=/)) { return ('BAD_FORMULA','Please submit just an expression, not an equation.'); }	if (($type eq '9') \|\| ($type eq '8')) {
	if ($response=~/\=/) {
	return ('BAD_FORMULA','Please submit just an expression, not an equation.');
	} elsif ($response =~ /\,/ and $response !~ /^\s\{.\}\s*$/) {
	return ('BAD_FORMULA');
	}
	}
if ($type eq '9') {	if ($type eq '9') {
$result = &maxima_check(&maxima_cas_formula_fix($response),&maxima_cas_formula_fix($answer),\$reterror);	$result = &maxima_check(&maxima_cas_formula_fix($response),&maxima_cas_formula_fix($answer),\$reterror);
} else {	} else {
Line 430 sub cas {	Line 436 sub cas {
my $output;	my $output;
if ($system eq 'maxima') {	if ($system eq 'maxima') {
$output=&maxima_eval($input,$library);	$output=&maxima_eval($input,$library);
	} elsif ($system eq 'R') {
	$output=&r_eval($input,$library);
} else {	} else {
$output='Error: unrecognized CAS';	$output='Error: unrecognized CAS';
}	}