loncom/homework/default_homework.lcpm - diff

Return to default_homework.lcpm CVS log

Up to [LON-CAPA] / loncom / homework

version 1.140, 2008/09/13 02:08:32	version 1.142, 2008/11/26 18:11:52
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 =~ /\,/) {
	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 320 sub caparesponse_check_list {	Line 326 sub caparesponse_check_list {
$element =~ s/\s//g;	$element =~ s/\s//g;
}	}
my $appendunit=$unit;	my $appendunit=$unit;
if ($unit=~/\%/) {	if (($unit=~/\%/) && ($answerunit ne '%')) {
$element=$element/100;	$element=$element/100;
$appendunit=~s/\%//;	$appendunit=~s/\%//;
}	}