--- loncom/homework/default_homework.lcpm 2001/01/24 17:01:49 1.16
+++ loncom/homework/default_homework.lcpm 2001/02/20 23:46:25 1.18
@@ -71,7 +71,7 @@ sub caparesponse_check {
elsif ($result =='12') { $result='WANTED_NUMERIC'; }
else {$result = "ERROR: Unknown Result:$result:$@:";}
- return "$result:
Error $error:
Answer $answer:
Response $response:
$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$units
";
+ return "$result:
Error $error:
Answer $answer:
Response $response:
$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$units
";
}
sub caparesponse_check_list {
@@ -83,12 +83,12 @@ sub caparesponse_check_list {
my (@list) = eval $answer;
my (@responselist)=split /,/,$response;
my $unit='';
- $result.="Final response :$responselist['-1']:
";
+ $result.="Final response :$responselist['-1']:
";
if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) {
$responselist['-1']=$1;
$unit=$2;
}
- $result.="Final response :$responselist['-1']:
";
+ $result.="Final response :$responselist['-1']:
";
$unit=~s/\s//;
my $i=0;
my $awards='';
@@ -100,7 +100,7 @@ sub caparesponse_check_list {
$result.=$aresult;
}
chop $awards;
- return "$awards:
$result";
+ return "$awards:
$result";
}
sub tex {
@@ -140,8 +140,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" ) {