Diff for /loncom/homework/default_homework.lcpm between versions 1.12 and 1.16

version 1.12, 2000/11/29 00:51:57 version 1.16, 2001/01/24 17:01:49
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 67  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:$error:$answer:$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 {
     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 {

Removed from v.1.12  
changed lines
  Added in v.1.16


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