version 1.61, 2003/04/30 21:10:50
|
version 1.70, 2004/03/12 16:55:35
|
Line 42 $"=' ';
|
Line 42 $"=' ';
|
sub caparesponse_check { |
sub caparesponse_check { |
#not properly used yet: calc |
#not properly used yet: calc |
#not to be used: $ans_fmt |
#not to be used: $ans_fmt |
my ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc,$samples) = |
my ($type,$tol,$sig,$ans_fmt,$unit,$calc,$samples) = |
eval $_[1]. |
eval $_[2]. |
';return ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc,$samples);'; |
';return ($__LC__type,$__LC__tol,$__LC__sig,$__LC__ans_fmt,$__LC__unit,$__LC__calc,$__LC__samples);'; |
|
|
my $tol_type=''; # gets it's value from whether tol has a % or not done |
my $tol_type=''; # gets it's value from whether tol has a % or not done |
my $sig_lbound=''; #done |
my $sig_lbound=''; #done |
my $sig_ubound=''; #done |
my $sig_ubound=''; #done |
my ($response,$expr)=@_; |
my ($answer,$response,$expr)=@_; |
|
|
|
|
#type's definitons come from capaParser.h |
#type's definitons come from capaParser.h |
Line 62 sub caparesponse_check {
|
Line 62 sub caparesponse_check {
|
$message .="no ws in :$response:\n"; |
$message .="no ws in :$response:\n"; |
} |
} |
|
|
|
if (length($response) > 500) { return "TOO_LONG: Answer too long"; } |
|
|
if ($type eq '' ) { |
if ($type eq '' ) { |
$message .= "Didn't find a type :$type:$expr: defaulting\n"; |
$message .= "Didn't find a type :$type:$expr: defaulting\n"; |
if ( $answer eq ($answer *1.0)) { $type = 2; |
if ( $answer eq ($answer *1.0)) { $type = 2; |
Line 134 sub get_array_args {
|
Line 136 sub get_array_args {
|
my ($expr,$arg)=@_; |
my ($expr,$arg)=@_; |
# do these first, because who knows what varname the instructor might have used |
# do these first, because who knows what varname the instructor might have used |
# but it probably isn't $CAPARESPONSE_CHECK_LIST_answer |
# but it probably isn't $CAPARESPONSE_CHECK_LIST_answer |
my $CAPARESPONSE_CHECK_LIST_answer = eval $expr.';return $'.$arg; #' |
my $CAPARESPONSE_CHECK_LIST_answer = eval $expr.';return $'.$arg; #' stupid emacs |
my $GET_ARRAY_ARGS_result; |
my $GET_ARRAY_ARGS_result="expr is $expr\narg is $arg\nfirst answer guess is $CAPARESPONSE_CHECK_LIST_answer\n"; |
my @GET_ARRAY_ARGS_list; |
my @GET_ARRAY_ARGS_list; |
if ($CAPARESPONSE_CHECK_LIST_answer =~ /^\s*[\$\@]/) { |
if ($CAPARESPONSE_CHECK_LIST_answer =~ /^\s*[\$\@]/) { |
(@GET_ARRAY_ARGS_list) = eval $CAPARESPONSE_CHECK_LIST_answer; |
(@GET_ARRAY_ARGS_list) = eval $CAPARESPONSE_CHECK_LIST_answer; |
Line 151 sub get_array_args {
|
Line 153 sub get_array_args {
|
|
|
sub caparesponse_check_list { |
sub caparesponse_check_list { |
my ($response,$expr)=@_; |
my ($response,$expr)=@_; |
$expr =~ s/\\/\\\\/g; |
# $expr =~ s/\\/\\\\/g; |
$expr =~ s/\'/\\\'/g; |
# $expr =~ s/\'/\\\'/g; |
my ($result,@list) = &get_array_args($expr,'answer'); |
# my ($result,@list) = &get_array_args($expr,'answer'); |
|
# $expr =~ s/\\\'/\'/g; |
|
# $expr =~ s/\\\\/\\/g; |
|
my ($result,@list); |
|
@list=@CAPARESPONSE_CHECK_LIST_answer; |
my $aresult=''; |
my $aresult=''; |
my $current_answer; |
my $current_answer; |
my $answers=join(':',@list); |
my $answers=join(':',@list); |
$result.="Got response :$answers:\n"; |
$result.="Got response :$answers:\n"; |
my @responselist; |
my @responselist; |
my $type =eval $expr.';return $answer;'; |
my $type =eval $expr.';return $__LC__type;'; |
|
$result.="Got type :$type:\n"; |
if ($type ne '' && $#list > 0) { |
if ($type ne '' && $#list > 0) { |
(@responselist)=split /,/,$response; |
(@responselist)=split /,/,$response; |
} else { |
} else { |
Line 167 sub caparesponse_check_list {
|
Line 174 sub caparesponse_check_list {
|
} |
} |
my $unit=''; |
my $unit=''; |
$result.="Initial final response :$responselist['-1']:\n"; |
$result.="Initial final response :$responselist['-1']:\n"; |
if ($type eq '') { |
if ($type eq '' || $type eq 'float') { |
#for numerical problems split off the unit |
#for numerical problems split off the unit |
if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) { |
if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) { |
$responselist['-1']=$1; |
$responselist['-1']=$1; |
Line 182 sub caparesponse_check_list {
|
Line 189 sub caparesponse_check_list {
|
for ($i=0; $i<@list;$i++) { |
for ($i=0; $i<@list;$i++) { |
$result.="trying answer :$list[$i]:\n"; |
$result.="trying answer :$list[$i]:\n"; |
my $thisanswer=$list[$i]; |
my $thisanswer=$list[$i]; |
$thisanswer=~ s/\\/\\\\/g; |
# $thisanswer=~ s/\\/\\\\/g; |
$thisanswer =~ s/\'/\\\'/g; |
# $thisanswer =~ s/\'/\\\'/g; |
|
$result.="trying answer :$thisanswer:\n"; |
if ($unit eq '') { |
if ($unit eq '') { |
$aresult=&caparesponse_check($responselist[$i], |
$aresult=&caparesponse_check($thisanswer,$responselist[$i], |
$expr.';my $answer=\''.$thisanswer.'\';'); |
$expr); |
} else { |
} else { |
$aresult=&caparesponse_check($responselist[$i]." $unit", |
$aresult=&caparesponse_check($thisanswer,$responselist[$i]." $unit", |
$expr.';my $answer=\''.$thisanswer.'\';'); |
$expr); |
} |
} |
my ($temp)=split /:/, $aresult; |
my ($temp)=split /:/, $aresult; |
$awards.="$temp,"; |
$awards.="$temp,"; |
Line 483 sub format {
|
Line 491 sub format {
|
my ($value,$fmt)=@_; |
my ($value,$fmt)=@_; |
my $dollarmode; |
my $dollarmode; |
if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } |
if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } |
|
$fmt=~s/e/E/g; |
my $result=sprintf('%.'.$fmt,$value); |
my $result=sprintf('%.'.$fmt,$value); |
$result=~s/(E[+-]*)0/$1/; |
$result=~s/(E[+-]*)0/$1/; |
if ($dollarmode) {$result=&dollarmode($result);} |
if ($dollarmode) {$result=&dollarmode($result);} |
Line 490 sub format {
|
Line 499 sub format {
|
} |
} |
|
|
sub prettyprint { |
sub prettyprint { |
my ($value,$fmt)=@_; |
my ($value,$fmt,$target)=@_; |
my $result; |
my $result; |
my $dollarmode; |
my $dollarmode; |
|
if (!$target) { $target = $external::target; } |
if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } |
if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } |
if ($fmt) { $value=sprintf('%.'.$fmt,$value); } |
if ($fmt) { $value=sprintf('%.'.$fmt,$value); } |
if ($value =~ /([0-9\.\-\+]+)E([0-9\-\+]+)/ ) { |
if ($value =~ /([0-9\.\-\+]+)E([0-9\-\+]+)/i ) { |
my $frac=$1; |
my $frac=$1; |
if ($dollarmode) { $frac=&dollarformat($frac); } |
if ($dollarmode) { $frac=&dollarformat($frac); } |
my $exponent=$2; |
my $exponent=$2; |
$exponent=~s/^\+0*//; |
$exponent=~s/^\+0*//; |
$exponent=~s/^-0*/-/; |
$exponent=~s/^-0*/-/; |
|
$exponent=~s/^-0*/-/; |
|
if ($exponent eq '-') { undef($exponent); } |
if ($exponent) { |
if ($exponent) { |
if ($external::target eq 'web') { |
if ($target eq 'web') { |
$result=$frac.'×10<sup>'.$exponent.'</sup>'; |
$result=$frac.'×10<sup>'.$exponent.'</sup>'; |
} elsif ($external::target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result='\ensuremath{'.$frac.'\times 10^{'.$exponent.'}}'; |
$result='\ensuremath{'.$frac.'\times 10^{'.$exponent.'}}'; |
} else { |
} else { |
$result=$value; |
$result=$value; |
Line 514 sub prettyprint {
|
Line 526 sub prettyprint {
|
} |
} |
} else { |
} else { |
$result=$value; |
$result=$value; |
if ($dollarmode) { $result=&dollarformat($result); } |
if ($dollarmode) { $result=&dollarformat($result,$target); } |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
sub dollarformat { |
sub dollarformat { |
my ($number) = @_; |
my ($number,$target) = @_; |
|
if (!$target) { $target = $external::target; } |
if ($number =~ /\./) { |
if ($number =~ /\./) { |
while ($number =~ /([^\.,]+)([^\.,][^\.,][^\.,])([,0-9]*\.[0-9]*$)/) { |
while ($number =~ /([^\.,]+)([^\.,][^\.,][^\.,])([,0-9]*\.[0-9]*$)/) { |
$number = $1.','.$2.$3; |
$number = $1.','.$2.$3; |
Line 530 sub dollarformat {
|
Line 543 sub dollarformat {
|
$number = $1.','.$2.$3; |
$number = $1.','.$2.$3; |
} |
} |
} |
} |
if ($external::target eq 'tex') { |
if ($target eq 'tex') { |
$number='\$'.$number; #' stupid emacs |
$number='\$'.$number; #' stupid emacs |
} else { |
} else { |
$number='$'.$number; #' stupid emacs |
$number='$'.$number; #' stupid emacs |