Diff for /loncom/homework/default_homework.lcpm between versions 1.14 and 1.18

version 1.14, 2001/01/03 00:14:47 version 1.18, 2001/02/20 23:46:25
Line 2 Line 2
 # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()  # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()
 #   # 
 #  #
   #init some globals
 $RANDOMINIT=0;  $RANDOMINIT=0;
   $pi=atan2(1,1)*4;
   
 sub caparesponse_check {  sub caparesponse_check {
   my $answer='';  #done    my $answer='';  #done
Line 69  sub caparesponse_check { Line 71  sub caparesponse_check {
   elsif ($result =='12') { $result='WANTED_NUMERIC'; }    elsif ($result =='12') { $result='WANTED_NUMERIC'; }
   else  {$result = "ERROR: Unknown Result:$result:$@:";}    else  {$result = "ERROR: Unknown Result:$result:$@:";}
   
   return "$result:$error:$answer:$response:$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$units";    return "$result:<br />Error $error:<br />Answer $answer:<br />Response $response:<br />$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$units<br />";
 }  }
   
 sub caparesponse_check_list {  sub caparesponse_check_list {
   my ($response,$expr)=@_;    my ($response,$expr)=@_;
   my $result='';    my $result='';
     my $aresult='';
   my $current_answer;    my $current_answer;
   my $answer = eval $expr.';return $answer';    my $answer = eval $expr.';return $answer';
   my (@list) = eval $answer;    my (@list) = eval $answer;
   my (@responselist)=split /,/,$response;    my (@responselist)=split /,/,$response;
   ($responselist['-1'],my $unit)= split /\s/, $responselist['-1'], 2;    my $unit='';
     $result.="Final response :$responselist['-1']:<br />";
     if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) {
       $responselist['-1']=$1;
       $unit=$2;
     }
     $result.="Final response :$responselist['-1']:<br />";
   $unit=~s/\s//;    $unit=~s/\s//;
   my $i=0;    my $i=0;
   my $awards='';    my $awards='';
   for ($i=0; $i<@list;$i++) {    for ($i=0; $i<@list;$i++) {
     $result.=&caparesponse_check($responselist[$i]." $unit",      $aresult=&caparesponse_check($responselist[$i]." $unit",
  $expr.';my $answer='.$list[$i].';');   $expr.';my $answer='.$list[$i].';');
     my ($temp)=split /:/, $result;      my ($temp)=split /:/, $aresult;
     $awards.="$temp,";      $awards.="$temp,";
       $result.=$aresult;
   }    }
   chop $awards;    chop $awards;
   return "$awards:$result";    return "$awards:<br />$result";
 }  }
   
 sub tex {  sub tex {
Line 130  sub random { Line 140  sub random {
 }  }
   
 sub tan  { sin($_[0]) / cos($_[0]) }  sub tan  { sin($_[0]) / cos($_[0]) }
   sub atan { atan2($_[0], 1); }
 sub acos { atan2(sqrt(1 - $_[0] * $_[0]), $_[0] ); }  sub acos { atan2(sqrt(1 - $_[0] * $_[0]), $_[0] ); }
 sub asin { atan2($_[0], sqrt(1- $_[0] * $_[0]) );  }  sub asin { atan2($_[0], sqrt(1- $_[0] * $_[0]) );  }
   sub log10 { log($_[0])/log(10); }
   
 sub html {  sub html {
   if ( $external::target eq "web" ) {    if ( $external::target eq "web" ) {

Removed from v.1.14  
changed lines
  Added in v.1.18


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>