--- loncom/homework/default_homework.lcpm 2012/11/22 02:15:42 1.152.2.3 +++ loncom/homework/default_homework.lcpm 2011/06/08 01:39:28 1.157 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run() # -# $Id: default_homework.lcpm,v 1.152.2.3 2012/11/22 02:15:42 raeburn Exp $ +# $Id: default_homework.lcpm,v 1.157 2011/06/08 01:39:28 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -143,6 +143,7 @@ sub caparesponse_check { my $sig_lbound=''; #done my $sig_ubound=''; #done + #type's definitons come from capaParser.h #remove leading and trailing whitespace @@ -151,8 +152,10 @@ sub caparesponse_check { } if ($response=~ /^\s|\s$/) { $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') { #for string answers make sure all places spaces occur, there is #really only 1 space, in both the answer and the response @@ -176,6 +179,7 @@ sub caparesponse_check { if (length($response) > 500) { return ('TOO_LONG',undef); } if ($type eq '' ) { + &LONCAPA_INTERNAL_DEBUG("Didn't find a type :$type: defaulting"); if ( $answer eq ($answer *1.0)) { $type = 2; } else { $type = 3; } } else { @@ -195,6 +199,7 @@ sub caparesponse_check { #formula type setup the sample points if ($type eq '8') { ($id_list,$points)=split(/@/,$samples); + &LONCAPA_INTERNAL_DEBUG("Found :$id_list:$points: points in $samples"); } if ($tol eq '') { $tol=0.0; @@ -253,8 +258,8 @@ sub caparesponse_check { elsif ($result =='15') { $result='UNIT_IRRECONCIBLE'; } 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 "); + &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); } @@ -265,7 +270,7 @@ sub caparesponse_check_list { my $type = $LONCAPA::CAPAresponse_args{'type'}; my $answerunit=$LONCAPA::CAPAresponse_args{'unit'}; &LONCAPA_INTERNAL_DEBUG("Got type :$type: answer unit :$answerunit:\n"); - + my $preprocess=$LONCAPA::CAPAresponse_args{'preprocess'}; $preprocess=~s/^\&//; @@ -305,31 +310,25 @@ sub caparesponse_check_list { } } + &LONCAPA_INTERNAL_DEBUG("Initial final response :$responses->[0][-1]:"); my $unit; - my ($allowalgebra)=($LONCAPA::CAPAresponse_args{'allowalgebra'}=~/^(yes|1|on)$/i); + my ($allowalgebra)=(¶meter_setting('allowalgebra',¤tpart())=~/^(yes|1|on)$/i); if ($type eq 'float' || $type eq '') { #for numerical problems split off the unit - my ($part1,$part2); + my $part1; + my $part2; if ($allowalgebra) { - ($part1,$part2)=($responses->[0][-1]=~ /^(.*[^\s])\s+([^\s]+)$/); + ($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); - 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("Found unit :$unit:"); } } + &LONCAPA_INTERNAL_DEBUG("Final final response :$responses->[0][-1]:$unit:"); $unit=~s/\s//; my $error; foreach my $response (@$responses) { @@ -338,7 +337,7 @@ sub caparesponse_check_list { if ($preprocess=~/\S/) { if (defined(&$preprocess)) { no strict 'refs'; - $element=&$preprocess($element,$unit); + $element=&$preprocess($element); use strict 'refs'; } } @@ -360,7 +359,7 @@ sub caparesponse_check_list { $appendunit='%'.$appendunit; } # Zero does not need a dimension - if (($element =~ /^[0\.]+$/) && ($unit!~/\w/) && ($answerunit=~/\w/)) { + if (($element==0) && ($unit!~/\w/) && ($answerunit=~/\w/)) { $appendunit=$answerunit; } # Do the math for the student if allowed @@ -415,15 +414,6 @@ sub caparesponse_check_list { } } } - # See if we have preprocessor for string responses - if (($preprocess=~/\S/) && ($type eq 'cs' || $type eq 'ci')) { - if (defined(&$preprocess)) { - no strict 'refs'; - $response->[$j]=&$preprocess($response->[$j]); - use strict 'refs'; - } - } - my ($award,$msg) = &caparesponse_check($answer->[$j], $response->[$j]); if ($type eq 'cs' || $type eq 'ci') { @@ -462,15 +452,6 @@ sub caparesponse_check_list { } } } - # See if we have preprocessor - if (($preprocess=~/\S/) && ($type eq 'cs' || $type eq 'ci')) { - if (defined(&$preprocess)) { - no strict 'refs'; - $response->[$j]=&$preprocess($response->[$j]); - use strict 'refs'; - } - } - my ($award,$msg) = &caparesponse_check($answer->[$j], $response->[$j]); if ($type eq 'cs' || $type eq 'ci') { @@ -817,7 +798,6 @@ sub cos { CORE::cos(shift) } sub exp { CORE::exp(shift) } sub int { CORE::int(shift) } sub log { CORE::log(shift) } -sub ln { CORE::log(shift) } sub atan2 { CORE::atan2($_[0],$_[1]) } sub sqrt { CORE::sqrt(shift) } @@ -1184,6 +1164,7 @@ sub middlename { $middlename = '' if $middlename eq ""; return $middlename; } + sub lastname { my $lastname = &EXT('environment.lastname');