version 1.152.2.1, 2011/08/03 03:37:23
|
version 1.158, 2011/06/08 20:38:47
|
Line 270 sub caparesponse_check_list {
|
Line 270 sub caparesponse_check_list {
|
my $type = $LONCAPA::CAPAresponse_args{'type'}; |
my $type = $LONCAPA::CAPAresponse_args{'type'}; |
my $answerunit=$LONCAPA::CAPAresponse_args{'unit'}; |
my $answerunit=$LONCAPA::CAPAresponse_args{'unit'}; |
&LONCAPA_INTERNAL_DEBUG("Got type :$type: answer unit :$answerunit:\n"); |
&LONCAPA_INTERNAL_DEBUG("Got type :$type: answer unit :$answerunit:\n"); |
|
|
|
my $preprocess=$LONCAPA::CAPAresponse_args{'preprocess'}; |
|
$preprocess=~s/^\&//; |
|
|
my $num_input_lines = |
my $num_input_lines = |
scalar(@{$LONCAPA::CAPAresponse_answer->{'answers'}}); |
scalar(@{$LONCAPA::CAPAresponse_answer->{'answers'}}); |
|
|
Line 309 sub caparesponse_check_list {
|
Line 312 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; |
|
my ($allowalgebra)=(¶meter_setting('allowalgebra',¤tpart())=~/^(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 |
# if ( $responses->[0][-1]=~ /(.*[^\s])\s+([^\s]+)/ ) { |
my $part1; |
if ( $responses->[0][-1]=~ /^([\d\.\,\s\$]*(?:(?:[xX\*]10[\^\*]*|[eE]*)[\+\-]*\d*)*(?:^|\S)\d+)([\$\s\w\^\*\/\(\)\+\-]*[^\d\.\s\,][\$\s\w\^\*\/\(\)\+\-]*)$/ ) { |
my $part2; |
$responses->[0][-1]=$1; |
if ($allowalgebra) { |
$unit=&capa_formula_fix($2); |
($part1,$part2)=($responses->[0][-1]=~ /^(.*[^\s])\s+([^\s]+)$/); |
|
} else { |
|
($part1,$part2)=($responses->[0][-1]=~ /^([\d\.\,\s\$]*(?:(?:[xX\*]10[\^\*]*|[eE]*)[\+\-]*\d*)*(?:^|\S)\d+)([\$\s\w\^\*\/\(\)\+\-]*[^\d\.\s\,][\$\s\w\^\*\/\(\)\+\-]*)$/); |
|
} |
|
if (defined($part1) && defined($part2)) { |
|
$responses->[0][-1]=$part1; |
|
$unit=&capa_formula_fix($part2); |
&LONCAPA_INTERNAL_DEBUG("Found unit :$unit:"); |
&LONCAPA_INTERNAL_DEBUG("Found unit :$unit:"); |
} |
} |
} |
} |
Line 322 sub caparesponse_check_list {
|
Line 332 sub caparesponse_check_list {
|
$unit=~s/\s//; |
$unit=~s/\s//; |
my $error; |
my $error; |
foreach my $response (@$responses) { |
foreach my $response (@$responses) { |
foreach my $element (@$response) { |
foreach my $element (@$response) { |
|
# See if we have preprocessor |
|
if ($preprocess=~/\S/) { |
|
if (defined(&$preprocess)) { |
|
no strict 'refs'; |
|
$element=&$preprocess($element,$unit); |
|
use strict 'refs'; |
|
} |
|
} |
if (($type eq 'float') || (($type eq '') && ($unit ne ''))) { |
if (($type eq 'float') || (($type eq '') && ($unit ne ''))) { |
$element =~ s/\s//g; |
$element =~ s/\s//g; |
} |
} |
Line 341 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 |
|
if ($allowalgebra) { |
|
$element=&cas('maxima',$element); |
|
} |
if ($appendunit ne '') { |
if ($appendunit ne '') { |
$element .= " $appendunit"; |
$element .= " $appendunit"; |
} |
} |
Line 392 sub caparesponse_check_list {
|
Line 414 sub caparesponse_check_list {
|
} |
} |
} |
} |
} |
} |
|
# See if we have preprocessor |
|
&LONCAPA_INTERNAL_DEBUG("Ordered preprocessor $preprocess"); |
|
if ($preprocess=~/\S/) { |
|
if (defined(&$preprocess)) { |
|
no strict 'refs'; |
|
$response->[$j]=&$preprocess($response->[$j]); |
|
use strict 'refs'; |
|
&LONCAPA_INTERNAL_DEBUG("Ordered processed: $response->[$j]"); |
|
} |
|
} |
|
|
my ($award,$msg) = &caparesponse_check($answer->[$j], |
my ($award,$msg) = &caparesponse_check($answer->[$j], |
$response->[$j]); |
$response->[$j]); |
if ($type eq 'cs' || $type eq 'ci') { |
if ($type eq 'cs' || $type eq 'ci') { |
Line 430 sub caparesponse_check_list {
|
Line 463 sub caparesponse_check_list {
|
} |
} |
} |
} |
} |
} |
|
# See if we have preprocessor |
|
&LONCAPA_INTERNAL_DEBUG("Unordered preprocessor $preprocess"); |
|
if ($preprocess=~/\S/) { |
|
if (defined(&$preprocess)) { |
|
no strict 'refs'; |
|
$response->[$j]=&$preprocess($response->[$j]); |
|
use strict 'refs'; |
|
&LONCAPA_INTERNAL_DEBUG("Unordered processed: $response->[$j]"); |
|
} |
|
} |
|
|
my ($award,$msg) = &caparesponse_check($answer->[$j], |
my ($award,$msg) = &caparesponse_check($answer->[$j], |
$response->[$j]); |
$response->[$j]); |
if ($type eq 'cs' || $type eq 'ci') { |
if ($type eq 'cs' || $type eq 'ci') { |
Line 1125 sub class {
|
Line 1169 sub class {
|
return $course; |
return $course; |
} |
} |
|
|
|
sub classid { |
|
my $courseid = &EXT('request.course.id'); |
|
$courseid = '' if $courseid eq ""; |
|
return $courseid; |
|
} |
|
|
sub firstname { |
sub firstname { |
my $firstname = &EXT('environment.firstname'); |
my $firstname = &EXT('environment.firstname'); |
$firstname = '' if $firstname eq ""; |
$firstname = '' if $firstname eq ""; |
return $firstname; |
return $firstname; |
} |
} |
|
|
|
sub middlename { |
|
my $middlename = &EXT('environment.middlename'); |
|
$middlename = '' if $middlename eq ""; |
|
return $middlename; |
|
} |
|
|
|
|
sub lastname { |
sub lastname { |
my $lastname = &EXT('environment.lastname'); |
my $lastname = &EXT('environment.lastname'); |
Line 1196 sub answer_date_epoch {
|
Line 1253 sub answer_date_epoch {
|
return &EXT('resource.'.$partid.'.answerdate'); |
return &EXT('resource.'.$partid.'.answerdate'); |
} |
} |
|
|
|
sub parameter_setting { |
|
my ($which,$partid)=@_; |
|
unless ($partid) { $partid=0; } |
|
return &EXT('resource.'.$partid.'.'.$which); |
|
} |
|
|
|
sub stored_data { |
|
my ($which,$partid)=@_; |
|
unless ($partid) { $partid=0; } |
|
return &EXT('user.resource.resource.'.$partid.'.'.$which); |
|
} |
|
|
|
sub wrong_bubbles { |
|
my ($correct,$lower,$upper,$step,@given)=@_; |
|
my @array=(); |
|
my %hash=(); |
|
foreach my $new (@given) { |
|
$hash{$new}=1; |
|
} |
|
my $num=int(¶meter_setting('numbubbles',¤tpart())); |
|
unless ($num) { $num=8; } |
|
if ($num>1) { |
|
for (my $i=0;$i<=500;$i++) { |
|
my $new=&random($lower,$upper,$step); |
|
if ($hash{$new}) { next; } |
|
if (abs($new-$correct)<$step) { next; } |
|
$hash{$new}=1; |
|
@array=keys(%hash); |
|
if ($#array+2>=$num) { last; } |
|
} |
|
} |
|
return @array; |
|
} |
|
|
sub array_moments { |
sub array_moments { |
my @input=@_; |
my @input=@_; |
my (@output,$N); |
my (@output,$N); |