version 1.107, 2006/06/13 14:57:54
|
version 1.113, 2006/07/18 17:14:10
|
Line 152 sub caparesponse_check {
|
Line 152 sub caparesponse_check {
|
my $reterror=""; |
my $reterror=""; |
my $result; |
my $result; |
if ($type eq '9') { |
if ($type eq '9') { |
$result = &maxima_check($response,$answer,\$reterror); |
$result = &maxima_check(&maxima_cas_formula_fix($response),&maxima_cas_formula_fix($answer),\$reterror); |
} else { |
} else { |
|
if ($type eq '8') { # fml type |
|
$response = &capa_formula_fix($response); |
|
$answer = &capa_formula_fix($answer); |
|
} |
$result = &caparesponse_capa_check_answer($response,$answer,$type, |
$result = &caparesponse_capa_check_answer($response,$answer,$type, |
$tol_type,$tol, |
$tol_type,$tol, |
$sig_lbound,$sig_ubound, |
$sig_lbound,$sig_ubound, |
Line 184 sub caparesponse_check {
|
Line 188 sub caparesponse_check {
|
return ("$result:\nRetError $reterror:\nAnswer $answer:\nResponse $response:\n type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|\n$message",$reterror); |
return ("$result:\nRetError $reterror:\nAnswer $answer:\nResponse $response:\n type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|\n$message",$reterror); |
} |
} |
|
|
|
sub maxima_cas_formula_fix { |
|
my ($expression)=@_; |
|
return &implicit_multiplication($expression); |
|
} |
|
|
|
sub capa_formula_fix { |
|
my ($expression)=@_; |
|
return &implicit_multiplication($expression); |
|
} |
|
|
|
sub implicit_multiplication { |
|
my ($expression)=@_; |
|
# Escape scientific notation, so 3e8 does not become 3*e*8 |
|
# 3e8 -> 3&8; 3e-8 -> 3&-8; 3E+8 -> e&+8 |
|
$expression=~s/(\d+)e([\+\-]*\d+)/$1\&\($2\)/gsi; |
|
# 3x10^8 -> 3&8; 3*10^-8 -> 3&-8 |
|
$expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi; |
|
# Fill in multiplication signs |
|
# a b -> a*b |
|
$expression=~s/\s+/\*/gs; |
|
# 3a -> 3*a; 3( -> 3*(; 3A -> 3*a |
|
$expression=~s/(\d)([a-zA-Z\(])/$1\*$2/gs; |
|
# a3 -> a*3; |
|
$expression=~s/([a-zA-Z])(\d)/$1\*$2/gs; |
|
# )a -> )*a; )3 -> )*3 |
|
$expression=~s/\)(\w)/\)\*$1/gs; |
|
# 3&8 -> 3e8; 3&-4 -> 3e-4 |
|
$expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs; |
|
return $expression; |
|
} |
|
|
sub caparesponse_check_list { |
sub caparesponse_check_list { |
my $response=$LONCAPA::CAPAresponse_args{'response'}; |
my $response=$LONCAPA::CAPAresponse_args{'response'}; |
Line 816 sub class {
|
Line 850 sub class {
|
return $course; |
return $course; |
} |
} |
|
|
|
sub firstname { |
|
my $firstname = &EXT('environment.firstname'); |
|
$firstname = '' if $firstname eq ""; |
|
return $firstname; |
|
} |
|
|
|
sub lastname { |
|
my $lastname = &EXT('environment.lastname'); |
|
$lastname = '' if $lastname eq ""; |
|
return $lastname; |
|
} |
|
|
sub sec { |
sub sec { |
my $sec = &EXT('request.course.sec'); |
my $sec = &EXT('request.course.sec'); |
$sec = '' if $sec eq ""; |
$sec = '' if $sec eq ""; |