[BACK]Return to default_homework.lcpm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/default_homework.lcpm between versions 1.9 and 1.10

version 1.9, 2000/10/30 20:36:18 version 1.10, 2000/11/21 18:36:37
Line 5 Line 5
 $RANDOMINIT=0;  $RANDOMINIT=0;
   
 sub caparesponse_check {  sub caparesponse_check {
   my $answer='';    my $answer='';  #done
   my $type='';    my $type='';    #done
   my $tol_type='';    my $tol_type=''; # gets it's value from whether tol has a % or not done
   my $tolerance='';    my $tol='';     #done
   my $sig_lbound='';    my $sig_lbound='';
   my $sig_ubound='';    my $sig_ubound='';
   my $ans_fmt='';    my $ans_fmt='';
Line 16  sub caparesponse_check { Line 16  sub caparesponse_check {
   my $calc='';    my $calc='';
   my ($response,$expr)=@_;    my ($response,$expr)=@_;
       
   ($answer,$type,$tol_type,$tolerance,$sig_lbound,$sig_ubound,$ans_fmt,    ($answer,$type,$tol,$sig_lbound,$sig_ubound,$ans_fmt,
    $units,$calc) = eval $expr.'return $answer,$type,$tol_type,$tolerance,$sig_lbound,$sig_ubound,$ans_fmt,$units,$calc';     $units,$calc) = eval $expr.'return $answer,$type,$tol,$sig_lbound,$sig_ubound,$ans_fmt,$units,$calc';
   
   #type's definitons come from capaParser.h    #type's definitons come from capaParser.h
   if ($type eq '' ) {    if ($type eq '' ) {
Line 32  sub caparesponse_check { Line 32  sub caparesponse_check {
     } else { return "ERROR: Unknown type of answer: $type" }      } else { return "ERROR: Unknown type of answer: $type" }
   }    }
   
       if ($tol eq '') {
       $tol=0.0;
       $tol_type=1; #TOL_ABSOLUTE
     } else {
       if ($tol =~ /%$/) {
         $tol=chop($tol);
         $tol_type=2; #TOL_PERCENTAGE
       } else {
         $tol_type=1; #TOL_ABSOLUTE
       }
     }
   my $result = &caparesponse_capa_check_answer($response,$answer,$type,    my $result = &caparesponse_capa_check_answer($response,$answer,$type,
        $tol_type,$tolerance,         $tol_type,$tol,
        $sig_lbound,$sig_ubound,         $sig_lbound,$sig_ubound,
        $ans_fmt, $units,$calc);         $ans_fmt, $units,$calc);
   
Line 52  sub caparesponse_check { Line 62  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:$response:$answer:";    return "$result:$tol:$tol_type";
 }  }
   
 sub tex {  sub tex {
Line 116  sub floor {return int($_[0]);  } Line 126  sub floor {return int($_[0]);  }
 sub format {  sub format {
   my ($value,$fmt)=@_;    my ($value,$fmt)=@_;
   $SCRIPT_RESULT.=sprintf('%.'.$fmt,$value);    $SCRIPT_RESULT.=sprintf('%.'.$fmt,$value);
     return $SCRIPT_RESULT;
 }  }
   
 sub map {  sub map {
Removed from v.1.9  
changed lines
  Added in v.1.10

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