version 1.140, 2008/09/13 02:08:32
|
version 1.147, 2010/01/06 16:59:30
|
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 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=~/\%/) { |
# Deal with percentages |
$element=$element/100; |
# unit is unit entered by student, answerunit is unit by author |
$appendunit=~s/\%//; |
# Deprecated: divide answer by 100 if student entered percent, |
} |
# but author did not. Too much confusion |
|
# if (($unit=~/\%/) && ($answerunit ne '%')) { |
|
# $element=$element/100; |
|
# $appendunit=~s/\%//; |
|
# } |
|
# Author entered percent, student did not |
|
if (($unit!~/\%/) && ($answerunit=~/\%/)) { |
|
$element=$element*100; |
|
$appendunit='%'.$appendunit; |
|
} |
|
# Zero does not need a dimension |
if (($element==0) && ($unit!~/\w/) && ($answerunit=~/\w/)) { |
if (($element==0) && ($unit!~/\w/) && ($answerunit=~/\w/)) { |
$appendunit=$answerunit; |
$appendunit=$answerunit; |
} |
} |
Line 428 sub caparesponse_check_list {
|
Line 444 sub caparesponse_check_list {
|
sub cas { |
sub cas { |
my ($system,$input,$library)=@_; |
my ($system,$input,$library)=@_; |
my $output; |
my $output; |
|
my $dump; |
if ($system eq 'maxima') { |
if ($system eq 'maxima') { |
$output=&maxima_eval($input,$library); |
$output=&maxima_eval($input,$library); |
|
} elsif ($system eq 'R') { |
|
($output,$dump)=&r_eval($input,$library,0); |
} else { |
} else { |
$output='Error: unrecognized CAS'; |
$output='Error: unrecognized CAS'; |
} |
} |
return $output; |
return $output; |
} |
} |
|
|
|
sub cas_hashref { |
|
my ($system,$input,$library)=@_; |
|
if ($system eq 'maxima') { |
|
return 'Error: unsupported CAS'; |
|
} elsif ($system eq 'R') { |
|
return &r_eval($input,$library,1); |
|
} else { |
|
return 'Error: unrecognized CAS'; |
|
} |
|
} |
|
|
|
# |
|
# cas_hashref_entry takes a list of indices and gets the entry in a hash generated by Rreturn. |
|
# Call: cas_hashref_entry(Rvalue, index1, index2, ...) where Rvalue is a hash returned by Rreturn. |
|
# Rentry will return the first scalar value it encounters (ignoring excess indices). |
|
# If an invalid key is given, it returns undef. |
|
# |
|
sub cas_hashref_entry { |
|
return &Rentry(@_); |
|
} |
|
|
|
# |
|
# cas_hashref_array takes a list of indices and gets a column array from a hash generated by Rreturn. |
|
# Call: cas_hashref_array(Rvalue, index1, index2, ...) where Rvalue is a hash returned by Rreturn. |
|
# If an invalid key is given, it returns undef. |
|
# |
|
sub cas_hashref_array { |
|
return &Rarray(@_); |
|
} |
|
|
sub tex { |
sub tex { |
if ( $external::target eq "tex" ) { |
if ( $external::target eq "tex" ) { |
return $_[0]; |
return $_[0]; |