--- loncom/homework/default_homework.lcpm 2001/02/19 20:31:53 1.17 +++ loncom/homework/default_homework.lcpm 2001/05/08 14:57:12 1.19 @@ -11,11 +11,11 @@ sub caparesponse_check { my $type=''; #done my $tol_type=''; # gets it's value from whether tol has a % or not done my $tol=''; #done - my $sig=''; - my $sig_lbound=''; - my $sig_ubound=''; + my $sig=''; #done lowerbnd,upperbnd + my $sig_lbound=''; #done + my $sig_ubound=''; #done my $ans_fmt=''; - my $units=''; + my $units=''; #done my $calc=''; my ($response,$expr)=@_; @@ -93,8 +93,13 @@ sub caparesponse_check_list { my $i=0; my $awards=''; for ($i=0; $i<@list;$i++) { - $aresult=&caparesponse_check($responselist[$i]." $unit", - $expr.';my $answer='.$list[$i].';'); + if ($unit eq '') { + $aresult=&caparesponse_check($responselist[$i], + $expr.';my $answer='.$list[$i].';'); + } else { + $aresult=&caparesponse_check($responselist[$i]." $unit", + $expr.';my $answer='.$list[$i].';'); + } my ($temp)=split /:/, $aresult; $awards.="$temp,"; $result.=$aresult; @@ -140,8 +145,10 @@ sub random { } sub tan { sin($_[0]) / cos($_[0]) } +sub atan { atan2($_[0], 1); } sub acos { atan2(sqrt(1 - $_[0] * $_[0]), $_[0] ); } sub asin { atan2($_[0], sqrt(1- $_[0] * $_[0]) ); } +sub log10 { log($_[0])/log(10); } sub html { if ( $external::target eq "web" ) {