version 1.158, 2011/06/08 20:38:47
|
version 1.161, 2011/10/06 17:15:40
|
Line 143 sub caparesponse_check {
|
Line 143 sub caparesponse_check {
|
my $sig_lbound=''; #done |
my $sig_lbound=''; #done |
my $sig_ubound=''; #done |
my $sig_ubound=''; #done |
|
|
|
|
#type's definitons come from capaParser.h |
#type's definitons come from capaParser.h |
|
|
#remove leading and trailing whitespace |
#remove leading and trailing whitespace |
Line 152 sub caparesponse_check {
|
Line 151 sub caparesponse_check {
|
} |
} |
if ($response=~ /^\s|\s$/) { |
if ($response=~ /^\s|\s$/) { |
$response=~ s:^\s+|\s+$::g; |
$response=~ s:^\s+|\s+$::g; |
&LONCAPA_INTERNAL_DEBUG("Removed ws now :$response:"); |
|
} |
} |
|
|
#&LONCAPA_INTERNAL_DEBUG(" type is $type "); |
|
if ($type eq 'cs' || $type eq 'ci') { |
if ($type eq 'cs' || $type eq 'ci') { |
#for string answers make sure 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 |
Line 179 sub caparesponse_check {
|
Line 176 sub caparesponse_check {
|
if (length($response) > 500) { return ('TOO_LONG',undef); } |
if (length($response) > 500) { return ('TOO_LONG',undef); } |
|
|
if ($type eq '' ) { |
if ($type eq '' ) { |
&LONCAPA_INTERNAL_DEBUG("Didn't find a type :$type: defaulting"); |
|
if ( $answer eq ($answer *1.0)) { $type = 2; |
if ( $answer eq ($answer *1.0)) { $type = 2; |
} else { $type = 3; } |
} else { $type = 3; } |
} else { |
} else { |
Line 199 sub caparesponse_check {
|
Line 195 sub caparesponse_check {
|
#formula type setup the sample points |
#formula type setup the sample points |
if ($type eq '8') { |
if ($type eq '8') { |
($id_list,$points)=split(/@/,$samples); |
($id_list,$points)=split(/@/,$samples); |
&LONCAPA_INTERNAL_DEBUG("Found :$id_list:$points: points in $samples"); |
|
} |
} |
if ($tol eq '') { |
if ($tol eq '') { |
$tol=0.0; |
$tol=0.0; |
Line 258 sub caparesponse_check {
|
Line 253 sub caparesponse_check {
|
elsif ($result =='15') { $result='UNIT_IRRECONCIBLE'; } |
elsif ($result =='15') { $result='UNIT_IRRECONCIBLE'; } |
else {$result = "ERROR: Unknown Result:$result:$@:";} |
else {$result = "ERROR: Unknown Result:$result:$@:";} |
|
|
&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 "); |
|
return ($result,$reterror); |
return ($result,$reterror); |
} |
} |
|
|
Line 310 sub caparesponse_check_list {
|
Line 303 sub caparesponse_check_list {
|
} |
} |
} |
} |
|
|
&LONCAPA_INTERNAL_DEBUG("Initial final response :$responses->[0][-1]:"); |
|
my $unit; |
my $unit; |
my ($allowalgebra)=(¶meter_setting('allowalgebra',¤tpart())=~/^(yes|1|on)$/i); |
my ($allowalgebra)=($LONCAPA::CAPAresponse_args{'allowalgebra'}=~/^(yes|1|on)$/i); |
if ($type eq 'float' || $type eq '') { |
if ($type eq 'float' || $type eq '') { |
#for numerical problems split off the unit |
#for numerical problems split off the unit |
my $part1; |
my $part1; |
Line 325 sub caparesponse_check_list {
|
Line 317 sub caparesponse_check_list {
|
if (defined($part1) && defined($part2)) { |
if (defined($part1) && defined($part2)) { |
$responses->[0][-1]=$part1; |
$responses->[0][-1]=$part1; |
$unit=&capa_formula_fix($part2); |
$unit=&capa_formula_fix($part2); |
&LONCAPA_INTERNAL_DEBUG("Found unit :$unit:"); |
my $customunits=$LONCAPA::CAPAresponse_args{'customunits'}; |
|
if ($customunits =~ /\S/) { |
|
foreach my $replacement (split(/\s*\,\s*/,$customunits)) { |
|
my ($which,$what)=split(/\s*\=\s*/,$replacement); |
|
if ((defined($which)) && (defined($what))) { |
|
$what=&capa_formula_fix($what); |
|
$unit=~s/$which/\($what\)/g; |
|
} |
|
} |
|
} |
} |
} |
} |
} |
&LONCAPA_INTERNAL_DEBUG("Final final response :$responses->[0][-1]:$unit:"); |
|
$unit=~s/\s//; |
$unit=~s/\s//; |
my $error; |
my $error; |
foreach my $response (@$responses) { |
foreach my $response (@$responses) { |
Line 359 sub caparesponse_check_list {
|
Line 359 sub caparesponse_check_list {
|
$appendunit='%'.$appendunit; |
$appendunit='%'.$appendunit; |
} |
} |
# Zero does not need a dimension |
# Zero does not need a dimension |
if (($element==0) && ($unit!~/\w/) && ($answerunit=~/\w/)) { |
if (($element =~ /^[0\.]+$/) && ($unit!~/\w/) && ($answerunit=~/\w/)) { |
$appendunit=$answerunit; |
$appendunit=$answerunit; |
} |
} |
# Do the math for the student if allowed |
# Do the math for the student if allowed |
Line 414 sub caparesponse_check_list {
|
Line 414 sub caparesponse_check_list {
|
} |
} |
} |
} |
} |
} |
# See if we have preprocessor |
# See if we have preprocessor for string responses |
&LONCAPA_INTERNAL_DEBUG("Ordered preprocessor $preprocess"); |
if (($preprocess=~/\S/) && ($type eq 'cs' || $type eq 'ci')) { |
if ($preprocess=~/\S/) { |
|
if (defined(&$preprocess)) { |
if (defined(&$preprocess)) { |
no strict 'refs'; |
no strict 'refs'; |
$response->[$j]=&$preprocess($response->[$j]); |
$response->[$j]=&$preprocess($response->[$j]); |
use strict 'refs'; |
use strict 'refs'; |
&LONCAPA_INTERNAL_DEBUG("Ordered processed: $response->[$j]"); |
|
} |
} |
} |
} |
|
|
Line 464 sub caparesponse_check_list {
|
Line 462 sub caparesponse_check_list {
|
} |
} |
} |
} |
# See if we have preprocessor |
# See if we have preprocessor |
&LONCAPA_INTERNAL_DEBUG("Unordered preprocessor $preprocess"); |
if (($preprocess=~/\S/) && ($type eq 'cs' || $type eq 'ci')) { |
if ($preprocess=~/\S/) { |
|
if (defined(&$preprocess)) { |
if (defined(&$preprocess)) { |
no strict 'refs'; |
no strict 'refs'; |
$response->[$j]=&$preprocess($response->[$j]); |
$response->[$j]=&$preprocess($response->[$j]); |
use strict 'refs'; |
use strict 'refs'; |
&LONCAPA_INTERNAL_DEBUG("Unordered processed: $response->[$j]"); |
|
} |
} |
} |
} |
|
|
Line 1187 sub middlename {
|
Line 1183 sub middlename {
|
return $middlename; |
return $middlename; |
} |
} |
|
|
|
|
sub lastname { |
sub lastname { |
my $lastname = &EXT('environment.lastname'); |
my $lastname = &EXT('environment.lastname'); |
$lastname = '' if $lastname eq ""; |
$lastname = '' if $lastname eq ""; |