[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.31 and 1.36

version 1.31, 2001/07/19 21:26:22 version 1.36, 2001/08/23 16:44:22
Line 13  $rad2deg=180.0/$pi; Line 13  $rad2deg=180.0/$pi;
 $deg2rad=$pi/180.0;  $deg2rad=$pi/180.0;
   
 sub caparesponse_check {  sub caparesponse_check {
   my $answer='';  #done    #not properly used yet: calc
   my $type='';    #done    #not to be used: $ans_fmt
     my ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc) = 
    eval $_[1].';return ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc);';
   
   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 $sig='';     #done lowerbnd,upperbnd  
   my $sig_lbound=''; #done    my $sig_lbound=''; #done
   my $sig_ubound=''; #done    my $sig_ubound=''; #done
   my $ans_fmt='';  
   my $unit='';     #done  
   my $calc='';  
   my ($response,$expr)=@_;    my ($response,$expr)=@_;
   
   ($answer,$type,$tol,$sig,$ans_fmt,  
    $unit,$calc) = eval $expr.';return ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc);';  
   #type's definitons come from capaParser.h    #type's definitons come from capaParser.h
   my $message='';    my $message='';
     #remove leading and trailing whitespace
     if ($response=~ /^\s|\s$/) {
       $response=~ s:^\s+|\s+$::g;
       $message .="Removed ws now :$response:<br />";
     } else {
       $message .="no ws in :$response:<br />";
     }
   
   if ($type eq '' ) {    if ($type eq '' ) {
     $message .= "Didn't find a type :$type:$expr: defaulting<br />";      $message .= "Didn't find a type :$type:$expr: defaulting<br />";
     if ( $answer eq ($answer *1.0)) { $type = 2;      if ( $answer eq ($answer *1.0)) { $type = 2;
Line 79  sub caparesponse_check { Line 84  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:<br />Error $error:<br />Answer $answer:<br />Response $response:<br /> type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$units<br />$message$expr";    return "$result:<br />Error $error:<br />Answer $answer:<br />Response $response:<br /> type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|<br />$message$expr";
 }  }
   
 sub caparesponse_check_list {  sub caparesponse_check_list {
Line 99  sub caparesponse_check_list { Line 104  sub caparesponse_check_list {
   my $current_answer;    my $current_answer;
   $result.="Got response :$CAPARESPONSE_CHECK_LIST_answer:$list[0]:<br />";    $result.="Got response :$CAPARESPONSE_CHECK_LIST_answer:$list[0]:<br />";
   my @responselist;    my @responselist;
     my $type =eval $expr.';return $answer;';
   if ($type ne '' && $#list > 0) {    if ($type ne '' && $#list > 0) {
     (@responselist)=split /,/,$response;      (@responselist)=split /,/,$response;
   } else {    } else {
Line 258  sub random_noncentral_f { Line 264  sub random_noncentral_f {
 }  }
   
 sub random_multivariate_normal {  sub random_multivariate_normal {
   my ($item_cnt,$seed,@mean) = @_;    my ($item_cnt,$seed,$mean,$covar) = @_;
   return "Number of deviates must be greater than 0" if $item_cnt <= 0;  
   my (@covar,@retArray);  
   my $ind = 0;  
   while ($ind<$item_cnt) {  
      push @covar, pop (@mean);  
      $ind++;  
   }  
   &random_set_seed_from_phrase($seed);    &random_set_seed_from_phrase($seed);
   @retArray=&math_random_multivariate_normal($item_cnt,@mean,@covar);    @retArray=&math_random_multivariate_normal($item_cnt,@$mean,@$covar);
   return @retArray;    return @retArray;
 }  }
   
Removed from v.1.31  
changed lines
  Added in v.1.36

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