--- loncom/homework/default_homework.lcpm 2011/06/08 20:38:47 1.158 +++ loncom/homework/default_homework.lcpm 2014/06/25 10:48:39 1.167 @@ -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.158 2011/06/08 20:38:47 www Exp $ +# $Id: default_homework.lcpm,v 1.167 2014/06/25 10:48:39 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -143,7 +143,6 @@ sub caparesponse_check { my $sig_lbound=''; #done my $sig_ubound=''; #done - #type's definitons come from capaParser.h #remove leading and trailing whitespace @@ -152,10 +151,8 @@ 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 @@ -179,7 +176,6 @@ 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 { @@ -199,7 +195,6 @@ 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; @@ -258,8 +253,6 @@ 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 "); return ($result,$reterror); } @@ -310,9 +303,8 @@ sub caparesponse_check_list { } } - &LONCAPA_INTERNAL_DEBUG("Initial final response :$responses->[0][-1]:"); 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 '') { #for numerical problems split off the unit my $part1; @@ -325,10 +317,18 @@ sub caparesponse_check_list { if (defined($part1) && defined($part2)) { $responses->[0][-1]=$part1; $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//; my $error; foreach my $response (@$responses) { @@ -359,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 @@ -414,14 +414,12 @@ sub caparesponse_check_list { } } } - # See if we have preprocessor - &LONCAPA_INTERNAL_DEBUG("Ordered preprocessor $preprocess"); - if ($preprocess=~/\S/) { + # 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'; - &LONCAPA_INTERNAL_DEBUG("Ordered processed: $response->[$j]"); } } @@ -464,13 +462,11 @@ sub caparesponse_check_list { } } # See if we have preprocessor - &LONCAPA_INTERNAL_DEBUG("Unordered preprocessor $preprocess"); - if ($preprocess=~/\S/) { + if (($preprocess=~/\S/) && ($type eq 'cs' || $type eq 'ci')) { if (defined(&$preprocess)) { no strict 'refs'; $response->[$j]=&$preprocess($response->[$j]); use strict 'refs'; - &LONCAPA_INTERNAL_DEBUG("Unordered processed: $response->[$j]"); } } @@ -820,6 +816,7 @@ 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) } @@ -1046,16 +1043,47 @@ sub format_significant_figures { my ($zeros) = ($xint =~ /(0+)$/); # return number to original magnitude my $numSig = $xint*10**($x10-$sig+$power); - # insert trailing zero's if have decimal point - $numSig =~ s/^(\d+)\.(\d+)(\e?(.*)?)$/$1\.$2$zeros$3/; - # put a decimal pt for number ending with 0 and length = # of sig fig - $numSig.='.' if (length($numSig) == $sig && $numSig =~ /0$/); - if (length($numSig) < $sig) { - $numSig.='.'.substr($zeros,0,($sig-length($numSig))); + if ($numSig =~ /^(\d+)\.(\d+)/) { + # insert trailing zero's if have decimal point + my @digarray = split('',$1.$2); + my $sigcount; + while (@digarray > 0) { + my $item = shift(@digarray); + if ($item) { + $sigcount = 1 + @digarray; + last; + } + } + if (($sigcount) && ($sig >= $sigcount)) { + $zeros = substr($zeros,0,($sig - $sigcount)); + } + $numSig =~ s/^(\d+)\.(\d+)(\e?(.*)?)$/$1\.$2$zeros$3/; + } else { + if ($numSig =~ /^(\d+)e([\+\-]\d+)$/i) { + my $pre_exp = $1; + my $exponent = $2; + $numSig = $pre_exp.'.'.$zeros.'E'.$exponent; + } elsif ($numSig =~ /0$/) { + # add decimal pt for number ending with 0 and length == # of sig figs + if (length($numSig) == $sig) { + $numSig.='.'; + } elsif (length($numSig) > $sig) { + # exponential form for number ending with 0 and length > # of sig figs + my $fmtsig = $sig-1; + if ($fmtsig) { + $numSig = sprintf('%.'.$fmtsig.'E',$numSig); + } + } elsif (length($numSig) < $sig) { + $numSig.='.'.substr($zeros,0,($sig-length($numSig))); + } + } else { + if (length($numSig) < $sig) { + $numSig.='.'.substr($zeros,0,($sig-length($numSig))); + } + } } # return number with sign return $sign.$numSig; - } sub map { @@ -1187,7 +1215,6 @@ sub middlename { return $middlename; } - sub lastname { my $lastname = &EXT('environment.lastname'); $lastname = '' if $lastname eq ""; @@ -1201,10 +1228,18 @@ sub sec { } sub submission { - my ($partid,$responseid,$subnumber)=@_; + my ($partid,$responseid,$subnumber,$encode)=@_; my $sub=''; if ($subnumber) { $sub=$subnumber.':'; } - return &EXT('user.resource.'.$sub.'resource.'.$partid.'.'.$responseid.'.submission'); + my $output = + &EXT('user.resource.'.$sub.'resource.'.$partid.'.'.$responseid.'.submission'); + if ($encode) { + $output =~ s/&/&/g; + $output =~ s//>/g; + $output =~ s/"/"/g; + } + return $output; } sub currentpart {