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

version 1.11, 2000/11/22 00:00:54 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
   my $type='';    #done    my $type='';    #done
   my $tol_type=''; # gets it's value from whether tol has a % or not done    my $tol_type=''; # gets it's value from whether tol has a % or not done
   my $tol='';     #done    my $tol='';     #done
     my $sig='';
   my $sig_lbound='';    my $sig_lbound='';
   my $sig_ubound='';    my $sig_ubound='';
   my $ans_fmt='';    my $ans_fmt='';
Line 16  sub caparesponse_check { Line 19  sub caparesponse_check {
   my $calc='';    my $calc='';
   my ($response,$expr)=@_;    my ($response,$expr)=@_;
       
   ($answer,$type,$tol,$sig_lbound,$sig_ubound,$ans_fmt,    ($answer,$type,$tol,$sig,$ans_fmt,
    $units,$calc) = eval $expr.'return $answer,$type,$tol,$sig_lbound,$sig_ubound,$ans_fmt,$units,$calc';     $units,$calc) = eval $expr.';return $answer,$type,$tol,$sig,$ans_fmt,$units,$calc';
   
   #type's definitons come from capaParser.h    #type's definitons come from capaParser.h
   if ($type eq '' ) {    if ($type eq '' ) {
     if ( $answer eq ($answer *1.0)) { $type = 2;      if ( $answer eq ($answer *1.0)) { $type = 2;
Line 37  sub caparesponse_check { Line 39  sub caparesponse_check {
     $tol_type=1; #TOL_ABSOLUTE      $tol_type=1; #TOL_ABSOLUTE
   } else {    } else {
     if ($tol =~ /%$/) {      if ($tol =~ /%$/) {
       $tol=chop($tol);        chop $tol;
       $tol_type=2; #TOL_PERCENTAGE        $tol_type=2; #TOL_PERCENTAGE
     } else {      } else {
       $tol_type=1; #TOL_ABSOLUTE        $tol_type=1; #TOL_ABSOLUTE
     }      }
   }    }
   
     if ($sig eq '') {
       $sig_lbound = 0; #SIG_LB_DEFAULT
       $sig_ubound =15; #SIG_UB_DEFAULT
     } else {
       ($sig_lbound,$sig_ubound) = split /,/,$sig;
     }
   my $result = &caparesponse_capa_check_answer($response,$answer,$type,    my $result = &caparesponse_capa_check_answer($response,$answer,$type,
        $tol_type,$tol,         $tol_type,$tol,
        $sig_lbound,$sig_ubound,         $sig_lbound,$sig_ubound,
        $ans_fmt, $units,$calc);         $ans_fmt,$units,$calc);
   
   if    ($result == '1') { $result='EXACT_ANS'; }     if    ($result == '1') { $result='EXACT_ANS'; } 
   elsif ($result == '2') { $result='APPROX_ANS'; }    elsif ($result == '2') { $result='APPROX_ANS'; }
Line 60  sub caparesponse_check { Line 69  sub caparesponse_check {
   elsif ($result =='10') { $result='SUB_RECORDED'; }    elsif ($result =='10') { $result='SUB_RECORDED'; }
   elsif ($result =='11') { $result='BAD_FORMULA'; }    elsif ($result =='11') { $result='BAD_FORMULA'; }
   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:$tol:$tol_type";    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 {
     my ($response,$expr)=@_;
     my $result='';
     my $aresult='';
     my $current_answer;
     my $answer = eval $expr.';return $answer';
     my (@list) = eval $answer;
     my (@responselist)=split /,/,$response;
     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//;
     my $i=0;
     my $awards='';
     for ($i=0; $i<@list;$i++) {
       $aresult=&caparesponse_check($responselist[$i]." $unit",
    $expr.';my $answer='.$list[$i].';');
       my ($temp)=split /:/, $aresult;
       $awards.="$temp,";
       $result.=$aresult;
     }
     chop $awards;
     return "$awards:<br />$result";
 }  }
   
 sub tex {  sub tex {
Line 102  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.11  
changed lines
  Added in v.1.18


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