version 1.123, 2006/12/15 22:11:43
|
version 1.127, 2008/03/05 16:06:39
|
Line 166 sub caparesponse_check {
|
Line 166 sub caparesponse_check {
|
$response=~s/[\s,]//g; |
$response=~s/[\s,]//g; |
} |
} |
if ($type eq 'float' && $unit=~/\$/) { |
if ($type eq 'float' && $unit=~/\$/) { |
if ($response!~/^\$/) { return ('NO_UNIT', undef); } |
if ($response!~/^\$|\$$/) { return ('NO_UNIT', undef); } |
$response=~s/\$//g; |
$response=~s/\$//g; |
} |
} |
if ($type eq 'float' && $unit=~/\,/ && (&check_commas($response)<0)) { |
if ($type eq 'float' && $unit=~/\,/ && (&check_commas($response)<0)) { |
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') { |
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 318 sub caparesponse_check_list {
|
Line 319 sub caparesponse_check_list {
|
$unit=~s/\s//; |
$unit=~s/\s//; |
if ($unit ne '') { |
if ($unit ne '') { |
foreach my $response (@$responses) { |
foreach my $response (@$responses) { |
foreach my $element (@$response) { |
foreach my $element (@$response) { |
|
$element =~ s/\s//g; |
$element .= " $unit"; |
$element .= " $unit"; |
} |
} |
} |
} |
Line 417 sub caparesponse_check_list {
|
Line 419 sub caparesponse_check_list {
|
return ($final_award,$final_msg); |
return ($final_award,$final_msg); |
} |
} |
|
|
|
sub cas { |
|
my ($system,$input)=@_; |
|
my $output; |
|
if ($system eq 'maxima') { |
|
$output=&maxima_eval($input); |
|
} |
|
return $output; |
|
} |
|
|
sub tex { |
sub tex { |
if ( $external::target eq "tex" ) { |
if ( $external::target eq "tex" ) { |
return $_[0]; |
return $_[0]; |