version 1.120, 2006/11/10 17:45:52
|
version 1.148, 2010/10/14 04:59:08
|
Line 157 sub caparesponse_check {
|
Line 157 sub caparesponse_check {
|
|
|
#&LONCAPA_INTERNAL_DEBUG(" type is $type "); |
#&LONCAPA_INTERNAL_DEBUG(" type is $type "); |
if ($type eq 'cs' || $type eq 'ci') { |
if ($type eq 'cs' || $type eq 'ci') { |
#for string answers make surec all places spaces occur, there is |
#for string answers make sure all places spaces occur, there is |
#really only 1 space, in both the answer and the response |
#really only 1 space, in both the answer and the response |
$answer=~s/ +/ /g; |
$answer=~s/ +/ /g; |
$response=~s/ +/ /g; |
$response=~s/ +/ /g; |
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')) { |
|
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 253 sub caparesponse_check {
|
Line 260 sub caparesponse_check {
|
|
|
&LONCAPA_INTERNAL_DEBUG("RetError $reterror: Answer $answer: Response $response: type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|"); |
&LONCAPA_INTERNAL_DEBUG("RetError $reterror: Answer $answer: Response $response: type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|"); |
&LONCAPA_INTERNAL_DEBUG(" $answer $response $result "); |
&LONCAPA_INTERNAL_DEBUG(" $answer $response $result "); |
return ($result,$reterror) |
return ($result,$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;3 b -> 3*b;3 4 -> 3*4 |
|
$expression=~s/(\w)\s+(\w)/$1\*$2/gs; |
|
# )( -> )*(; ) ( -> )*( |
|
$expression=~s/\)\s*\(/\)\*\(/gs; |
|
# 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A |
|
$expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs; |
|
# a ( -> a*( |
|
$expression=~s/(\w)\s+\(/$1\*\(/gs; |
|
# a3 -> a*3; |
|
$expression=~s/([a-zA-Z])(\d)/$1\*$2/gs; |
|
# )a -> )*a; )3 -> )*3; ) 3 -> )*3 |
|
$expression=~s/\)\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 $responses=$LONCAPA::CAPAresponse_args{'response'}; |
my $responses=$LONCAPA::CAPAresponse_args{'response'}; |
&LONCAPA_INTERNAL_DEBUG(" answer is ". |
|
&LONCAPA_INTERNAL_Dumper($LONCAPA::CAPAresponse_answer).":\n"); |
|
&LONCAPA_INTERNAL_DEBUG(" respons is ". |
|
&LONCAPA_INTERNAL_Dumper($responses).":\n"); |
|
&LONCAPA_INTERNAL_DEBUG("args ".join(':',%LONCAPA::CAPAresponse_args)); |
&LONCAPA_INTERNAL_DEBUG("args ".join(':',%LONCAPA::CAPAresponse_args)); |
my $type = $LONCAPA::CAPAresponse_args{'type'}; |
my $type = $LONCAPA::CAPAresponse_args{'type'}; |
&LONCAPA_INTERNAL_DEBUG("Got type :$type:\n"); |
my $answerunit=$LONCAPA::CAPAresponse_args{'unit'}; |
|
&LONCAPA_INTERNAL_DEBUG("Got type :$type: answer unit :$answerunit:\n"); |
|
|
my $num_input_lines = |
my $num_input_lines = |
scalar(@{$LONCAPA::CAPAresponse_answer->{'answers'}}); |
scalar(@{$LONCAPA::CAPAresponse_answer->{'answers'}}); |
Line 324 sub caparesponse_check_list {
|
Line 294 sub caparesponse_check_list {
|
$responses->[$which]=[$responses->[$which]]; |
$responses->[$which]=[$responses->[$which]]; |
} |
} |
} |
} |
&LONCAPA_INTERNAL_DEBUG(" parsed response is ". |
|
&LONCAPA_INTERNAL_Dumper($responses).":\n"); |
|
foreach my $which (0..($num_input_lines-1)) { |
foreach my $which (0..($num_input_lines-1)) { |
my $answer_size = |
my $answer_size = |
scalar(@{$LONCAPA::CAPAresponse_answer->{'answers'}[$which]}); |
scalar(@{$LONCAPA::CAPAresponse_answer->{'answers'}[$which]}); |
Line 341 sub caparesponse_check_list {
|
Line 309 sub caparesponse_check_list {
|
|
|
&LONCAPA_INTERNAL_DEBUG("Initial final response :$responses->[0][-1]:"); |
&LONCAPA_INTERNAL_DEBUG("Initial final response :$responses->[0][-1]:"); |
my $unit; |
my $unit; |
if ($type eq '' || $type eq 'float') { |
if ($type eq 'float' || $type eq '') { |
#for numerical problems split off the unit |
#for numerical problems split off the unit |
if ( $responses->[0][-1]=~ /(.*[^\s])\s+([^\s]+)/ ) { |
# if ( $responses->[0][-1]=~ /(.*[^\s])\s+([^\s]+)/ ) { |
|
if ( $responses->[0][-1]=~ /^([\d\.\,\s\$]*(?:(?:[xX\*]10[\^\*]*|[eE]*)[\+\-]*\d*)*(?:^|\S)\d+)([\$\s\w\^\*\/\(\)\+\-]*[^\d\.\s\,][\$\s\w\^\*\/\(\)\+\-]*)$/ ) { |
$responses->[0][-1]=$1; |
$responses->[0][-1]=$1; |
$unit=$2; |
$unit=&capa_formula_fix($2); |
|
&LONCAPA_INTERNAL_DEBUG("Found unit :$unit:"); |
} |
} |
} |
} |
&LONCAPA_INTERNAL_DEBUG("Final final response :$responses->[0][-1]:$unit:"); |
&LONCAPA_INTERNAL_DEBUG("Final final response :$responses->[0][-1]:$unit:"); |
$unit=~s/\s//; |
$unit=~s/\s//; |
if ($unit ne '') { |
foreach my $response (@$responses) { |
foreach my $response (@$responses) { |
foreach my $element (@$response) { |
foreach my $element (@$response) { |
if (($type eq 'float') || (($type eq '') && ($unit ne ''))) { |
$element .= " $unit"; |
$element =~ s/\s//g; |
} |
} |
} |
my $appendunit=$unit; |
|
# Deal with percentages |
|
# unit is unit entered by student, answerunit is unit by author |
|
# 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/)) { |
|
$appendunit=$answerunit; |
|
} |
|
if ($appendunit ne '') { |
|
$element .= " $appendunit"; |
|
} |
|
&LONCAPA_INTERNAL_DEBUG("Made response element :$element:"); |
|
} |
} |
} |
|
|
foreach my $thisanswer (@{ $LONCAPA::CAPAresponse_answer->{'answers'} }) { |
foreach my $thisanswer (@{ $LONCAPA::CAPAresponse_answer->{'answers'} }) { |
Line 365 sub caparesponse_check_list {
|
Line 357 sub caparesponse_check_list {
|
} |
} |
|
|
|
|
&LONCAPA_INTERNAL_DEBUG(&LONCAPA_INTERNAL_Dumper($responses)); |
# &LONCAPA_INTERNAL_DEBUG(&LONCAPA_INTERNAL_Dumper($responses)); |
my %memoized; |
my %memoized; |
if ($LONCAPA::CAPAresponse_answer->{'type'} eq 'ordered') { |
if ($LONCAPA::CAPAresponse_answer->{'type'} eq 'ordered') { |
for (my $i=0; $i<scalar(@$responses);$i++) { |
for (my $i=0; $i<scalar(@$responses);$i++) { |
Line 451 sub caparesponse_check_list {
|
Line 443 sub caparesponse_check_list {
|
return ($final_award,$final_msg); |
return ($final_award,$final_msg); |
} |
} |
|
|
|
sub cas { |
|
my ($system,$input,$library)=@_; |
|
my $output; |
|
my $dump; |
|
if ($system eq 'maxima') { |
|
$output=&maxima_eval($input,$library); |
|
} elsif ($system eq 'R') { |
|
($output,$dump)=&r_eval($input,$library,0); |
|
} else { |
|
$output='Error: unrecognized CAS'; |
|
} |
|
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]; |
Line 1043 sub sec {
|
Line 1079 sub sec {
|
return $sec; |
return $sec; |
} |
} |
|
|
|
sub submission { |
|
my ($partid,$responseid,$subnumber)=@_; |
|
my $sub=''; |
|
if ($subnumber) { $sub=$subnumber.':'; } |
|
return &EXT('user.resource.'.$sub.'resource.'.$partid.'.'.$responseid.'.submission'); |
|
} |
|
|
|
sub currentpart { |
|
return $external::part; |
|
} |
|
|
|
sub eval_time { |
|
my ($timestamp)=@_; |
|
unless ($timestamp) { return ''; } |
|
return &locallocaltime($timestamp); |
|
} |
|
|
sub open_date { |
sub open_date { |
my @dc = split(/\s+/,localtime(&EXT('resource.0.opendate'))); |
my ($partid)=@_; |
return '' if ($dc[0] eq "Wed" and $dc[2] == 31 and $dc[4] == 1969); |
unless ($partid) { $partid=0; } |
my @hm = split(/:/,$dc[3]); |
return &eval_time(&EXT('resource.'.$partid.'.opendate')); |
my $ampm = " am"; |
} |
if ($hm[0] > 12) { |
|
$hm[0]-=12; |
sub due_date { |
$ampm = " pm"; |
my ($partid)=@_; |
} |
unless ($partid) { $partid=0; } |
return $dc[0].', '.$dc[1].' '.$dc[2].', '.$dc[4].' at '.$hm[0].':'.$hm[1].$ampm; |
return &eval_time(&EXT('resource.'.$partid.'.duedate')); |
} |
|
|
|
sub due_date { |
|
my @dc = split(/\s+/,localtime(&EXT('resource.0.duedate'))); |
|
return '' if ($dc[0] eq "Wed" and $dc[2] == 31 and $dc[4] == 1969); |
|
my @hm = split(/:/,$dc[3]); |
|
my $ampm = " am"; |
|
if ($hm[0] > 12) { |
|
$hm[0]-=12; |
|
$ampm = " pm"; |
|
} |
|
return $dc[0].', '.$dc[1].' '.$dc[2].', '.$dc[4].' at '.$hm[0].':'.$hm[1].$ampm; |
|
} |
} |
|
|
sub answer_date { |
sub answer_date { |
my @dc = split(/\s+/,localtime(&EXT('resource.0.answerdate'))); |
my ($partid)=@_; |
return '' if ($dc[0] eq "Wed" and $dc[2] == 31 and $dc[4] == 1969); |
unless ($partid) { $partid=0; } |
my @hm = split(/:/,$dc[3]); |
return &eval_time(&EXT('resource.'.$partid.'.answerdate')); |
my $ampm = " am"; |
} |
if ($hm[0] > 12) { |
|
$hm[0]-=12; |
sub open_date_epoch { |
$ampm = " pm"; |
my ($partid)=@_; |
} |
unless ($partid) { $partid=0; } |
return $dc[0].', '.$dc[1].' '.$dc[2].', '.$dc[4].' at '.$hm[0].':'.$hm[1].$ampm; |
return &EXT('resource.'.$partid.'.opendate'); |
|
} |
|
|
|
sub due_date_epoch { |
|
my ($partid)=@_; |
|
unless ($partid) { $partid=0; } |
|
return &EXT('resource.'.$partid.'.duedate'); |
|
} |
|
|
|
sub answer_date_epoch { |
|
my ($partid)=@_; |
|
unless ($partid) { $partid=0; } |
|
return &EXT('resource.'.$partid.'.answerdate'); |
} |
} |
|
|
sub array_moments { |
sub array_moments { |