[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.52 and 1.62

version 1.52, 2002/09/26 20:46:48 version 1.62, 2003/05/23 07:04:44
Line 62  sub caparesponse_check { Line 62  sub caparesponse_check {
     $message .="no ws in :$response:\n";      $message .="no ws in :$response:\n";
   }    }
   
     if (length($response) > 500) { return "TOO_LONG: Answer too long"; }
   
   if ($type eq '' ) {    if ($type eq '' ) {
     $message .= "Didn't find a type :$type:$expr: defaulting\n";      $message .= "Didn't find a type :$type:$expr: defaulting\n";
     if ( $answer eq ($answer *1.0)) { $type = 2;      if ( $answer eq ($answer *1.0)) { $type = 2;
Line 82  sub caparesponse_check { Line 84  sub caparesponse_check {
   #formula type setup the sample points    #formula type setup the sample points
   if ($type eq '8') {    if ($type eq '8') {
     ($id_list,$points)=split(/@/,$samples);      ($id_list,$points)=split(/@/,$samples);
     $message.="Found :$points: points\n";      $message.="Found :$id_list:$points: points in $samples\n";
   }    }
   if ($tol eq '') {    if ($tol eq '') {
     $tol=0.0;      $tol=0.0;
Line 101  sub caparesponse_check { Line 103  sub caparesponse_check {
     $sig_ubound =15; #SIG_UB_DEFAULT      $sig_ubound =15; #SIG_UB_DEFAULT
   } else {    } else {
     ($sig_lbound,$sig_ubound) = split /,/,$sig;      ($sig_lbound,$sig_ubound) = split /,/,$sig;
     if (!$sig_lbound) {      if (!defined($sig_lbound)) {
       $sig_lbound = 0; #SIG_LB_DEFAULT        $sig_lbound = 0; #SIG_LB_DEFAULT
       $sig_ubound =15; #SIG_UB_DEFAULT        $sig_ubound =15; #SIG_UB_DEFAULT
     }      }
     if (!$sig_ubound) { $sig_ubound=$sig_lbound; }      if (!defined($sig_ubound)) { $sig_ubound=$sig_lbound; }
   }    }
   my $result = &caparesponse_capa_check_answer($response,$answer,$type,    my $result = &caparesponse_capa_check_answer($response,$answer,$type,
        $tol_type,$tol,         $tol_type,$tol,
Line 142  sub get_array_args { Line 144  sub get_array_args {
   }    }
   $GET_ARRAY_ARGS_result.="error:$@:\n";    $GET_ARRAY_ARGS_result.="error:$@:\n";
   # if the eval fails just use what is in the answer exactly    # if the eval fails just use what is in the answer exactly
   if (!defined(@GET_ARRAY_ARGS_list) || !defined($GET_ARRAY_ARGS_list[0])) {    if (!(@GET_ARRAY_ARGS_list) || !defined($GET_ARRAY_ARGS_list[0])) {
     $GET_ARRAY_ARGS_result.="list zero is undefined\n";      $GET_ARRAY_ARGS_result.="list zero is undefined\n";
     $GET_ARRAY_ARGS_list[0]=$CAPARESPONSE_CHECK_LIST_answer;      $GET_ARRAY_ARGS_list[0]=$CAPARESPONSE_CHECK_LIST_answer;
   }    }
Line 151  sub get_array_args { Line 153  sub get_array_args {
   
 sub caparesponse_check_list {  sub caparesponse_check_list {
   my ($response,$expr)=@_;    my ($response,$expr)=@_;
   my $result;    $expr =~ s/\\/\\\\/g;
     $expr =~ s/\'/\\\'/g;
   my ($result,@list) = &get_array_args($expr,'answer');    my ($result,@list) = &get_array_args($expr,'answer');
   my $aresult='';    my $aresult='';
   my $current_answer;    my $current_answer;
Line 180  sub caparesponse_check_list { Line 183  sub caparesponse_check_list {
   my $awards='';    my $awards='';
   for ($i=0; $i<@list;$i++) {    for ($i=0; $i<@list;$i++) {
     $result.="trying answer :$list[$i]:\n";      $result.="trying answer :$list[$i]:\n";
       my $thisanswer=$list[$i];
       $thisanswer=~ s/\\/\\\\/g;
       $thisanswer =~ s/\'/\\\'/g;
     if ($unit eq '') {      if ($unit eq '') {
       $aresult=&caparesponse_check($responselist[$i],        $aresult=&caparesponse_check($responselist[$i],
      $expr.';my $answer=\''.$list[$i].'\';');       $expr.';my $answer=\''.$thisanswer.'\';');
     } else {      } else {
       $aresult=&caparesponse_check($responselist[$i]." $unit",        $aresult=&caparesponse_check($responselist[$i]." $unit",
    $expr.';my $answer=\''.$list[$i].'\';');     $expr.';my $answer=\''.$thisanswer.'\';');
     }      }
     my ($temp)=split /:/, $aresult;      my ($temp)=split /:/, $aresult;
     $awards.="$temp,";      $awards.="$temp,";
Line 197  sub caparesponse_check_list { Line 203  sub caparesponse_check_list {
   
 sub tex {  sub tex {
   if ( $external::target eq "tex" ) {    if ( $external::target eq "tex" ) {
     return @_[0];      return $_[0];
   } else {    } else {
     return @_[1];      return $_[1];
   }    }
 }  }
   
 sub var_in_tex {  sub var_in_tex {
   if ( $external::target eq "tex" ) {    if ( $external::target eq "tex" ) {
     return @_[0];      return $_[0];
   } else {    } else {
     return "";      return "";
   }    }
Line 213  sub var_in_tex { Line 219  sub var_in_tex {
   
 sub web {  sub web {
   if ( $external::target eq "tex" ) {    if ( $external::target eq "tex" ) {
     return @_[1];      return $_[1];
   } else {    } else {
     if ( $external::target eq "web" || $external::target eq "answer") {      if ( $external::target eq "web" || $external::target eq "answer") {
       return @_[2];        return $_[2];
     } else {      } else {
       return @_[0];        return $_[0];
     }      }
   }    }
 }  }
Line 229  sub html { Line 235  sub html {
   }    }
 }  }
   
 sub problem {  
   return '1';  
 }  
   
 sub hinton {  sub hinton {
   return 0;    return 0;
 }  }
   
 sub random {  sub random {
   my ($start,$end,$step)=@_;      my ($start,$end,$step)=@_;
   if ( ! $hidden::RANDOMINIT ) {      if ( ! $hidden::RANDOMINIT ) {
     &random_set_seed_from_phrase($external::randomseed);   if ($external::randomseed == 0) { $external::randomseed=1; }
     $hidden::RANDOMINIT=1;   if ($external::randomseed =~/,/) {
   }      my ($num1,$num2)=split(/,/,$seed);
   if (!defined($step)) { $step=1; }      &random_set_seed(abs($num1),abs($num2));
   my $num=1+int(($end-$start)/$step);   } else {
   my $result=$start + int(&math_random_uniform() * $num)*$step;      &random_set_seed(1,int(abs($external::randomseed)));
   return $result;   }
    &math_random_uniform();
    $hidden::RANDOMINIT=1;
       }
       if (!defined($step)) { $step=1; }
       my $num=1+int(($end-$start)/$step);
       my $result=$start + int(&math_random_uniform() * $num)*$step;
       return $result;
 }  }
   
 sub random_normal {  sub random_normal {
Line 417  sub log { log(shift) } Line 426  sub log { log(shift) }
 sub atan2 { atan2($_[0],$_[1]) }  sub atan2 { atan2($_[0],$_[1]) }
 sub sqrt { sqrt(shift) }  sub sqrt { sqrt(shift) }
   
 sub tan  { sin($_[0]) / cos($_[0]) }  sub tan  { CORE::sin($_[0]) / CORE::cos($_[0]) }
 #sub atan { atan2($_[0], 1); }  #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 log10 { CORE::log($_[0])/CORE::log(10); }
   
 sub factorial {  sub factorial {
     my $input = int(shift);      my $input = CORE::int(shift);
     return "Error - unable to take factorial of an negative number ($input)" if $input < 0;      return "Error - unable to take factorial of an negative number ($input)" if $input < 0;
     return "Error - factorial result is greater than system limit ($input)" if $input > 170;      return "Error - factorial result is greater than system limit ($input)" if $input > 170;
     return 1 if $input == 0;      return 1 if $input == 0;
Line 468  sub sub_string { Line 477  sub sub_string {
 }  }
   
 sub pow   {return $_[0] ** $_[1]; }  sub pow   {return $_[0] ** $_[1]; }
 sub ceil  {return (($_[0]-int($_[0]))== 0.0) ? $_[0] : (($_[0] > 0) ? (int($_[0])+ 1) : int($_[0])); }  sub ceil  {return (($_[0]-CORE::int($_[0]))== 0.0) ? $_[0] : (($_[0] > 0) ? (CORE::int($_[0])+ 1) : CORE::int($_[0])); }
 sub floor  {return (($_[0]-int($_[0]))== 0.0) ? $_[0] : (($_[0] > 0) ? int($_[0]) : (int($_[0])-1)); }  sub floor  {return (($_[0]-CORE::int($_[0]))== 0.0) ? $_[0] : (($_[0] > 0) ? CORE::int($_[0]) : (CORE::int($_[0])-1)); }
 #sub floor {return int($_[0]); }  #sub floor {return int($_[0]); }
   
 sub format {  sub format {
Line 565  sub map { Line 574  sub map {
     }      }
  }   }
     }      }
     &random_set_seed(@seed);      &random_set_seed(@oldseed);
     return '';      return '';
 }  }
   
Line 712  sub array_moments { Line 721  sub array_moments {
     $kurt+=$x**4;      $kurt+=$x**4;
   }    }
   $output[2]=$var/($N-1);    $output[2]=$var/($N-1);
   $sdev=sqrt($output[2]);    $sdev=CORE::sqrt($output[2]);
   if ($sdev == 0) {    if ($sdev == 0) {
      $output[3]="inf-variance=0";       $output[3]="inf-variance=0";
      $output[4]="inf-variance=0";       $output[4]="inf-variance=0";
Removed from v.1.52  
changed lines
  Added in v.1.62

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