[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.60 and 1.66

version 1.60, 2003/03/25 23:05:03 version 1.66, 2003/09/25 18:48:40
Line 42  $"=' '; Line 42  $"=' ';
 sub caparesponse_check {  sub caparesponse_check {
   #not properly used yet: calc    #not properly used yet: calc
   #not to be used: $ans_fmt    #not to be used: $ans_fmt
   my ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc,$samples) =    my ($type,$tol,$sig,$ans_fmt,$unit,$calc,$samples) =
     eval $_[1].      eval $_[2].
       ';return ($answer,$type,$tol,$sig,$ans_fmt,$unit,$calc,$samples);';        ';return ($type,$tol,$sig,$ans_fmt,$unit,$calc,$samples);';
   
   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 $sig_lbound=''; #done    my $sig_lbound=''; #done
   my $sig_ubound=''; #done    my $sig_ubound=''; #done
   my ($response,$expr)=@_;    my ($answer,$response,$expr)=@_;
   
   
   #type's definitons come from capaParser.h    #type's definitons come from capaParser.h
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 134  sub get_array_args { Line 136  sub get_array_args {
   my ($expr,$arg)=@_;    my ($expr,$arg)=@_;
   # do these first, because who knows what varname the instructor might have used    # do these first, because who knows what varname the instructor might have used
   # but it probably isn't $CAPARESPONSE_CHECK_LIST_answer    # but it probably isn't $CAPARESPONSE_CHECK_LIST_answer
   my $CAPARESPONSE_CHECK_LIST_answer = eval $expr.';return $'.$arg; #'    my $CAPARESPONSE_CHECK_LIST_answer = eval $expr.';return $'.$arg; #' stupid emacs
   my $GET_ARRAY_ARGS_result;    my $GET_ARRAY_ARGS_result="expr is $expr\narg is $arg\nfirst answer guess is $CAPARESPONSE_CHECK_LIST_answer\n";
   my @GET_ARRAY_ARGS_list;    my @GET_ARRAY_ARGS_list;
   if ($CAPARESPONSE_CHECK_LIST_answer =~ /^\s*[\$\@]/) {    if ($CAPARESPONSE_CHECK_LIST_answer =~ /^\s*[\$\@]/) {
     (@GET_ARRAY_ARGS_list) = eval $CAPARESPONSE_CHECK_LIST_answer;      (@GET_ARRAY_ARGS_list) = eval $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)=@_;
   $expr =~ s/\\/\\\\/g;  #  $expr =~ s/\\/\\\\/g;
   $expr =~ s/\'/\\\'/g;  #  $expr =~ s/\'/\\\'/g;
   my ($result,@list) = &get_array_args($expr,'answer');  #  my ($result,@list) = &get_array_args($expr,'answer');
   #  $expr =~ s/\\\'/\'/g;
   #  $expr =~ s/\\\\/\\/g;
     my ($result,@list);
     @list=@CAPARESPONSE_CHECK_LIST_answer;
   my $aresult='';    my $aresult='';
   my $current_answer;    my $current_answer;
   my $answers=join(':',@list);    my $answers=join(':',@list);
   $result.="Got response :$answers:\n";    $result.="Got response :$answers:\n";
   my @responselist;    my @responselist;
   my $type =eval $expr.';return $answer;';    my $type =eval $expr.';return $type;';
   if ($type ne '' && $#list > 0) {    if ($type ne '' && $#list > 0) {
     (@responselist)=split /,/,$response;      (@responselist)=split /,/,$response;
   } else {    } else {
Line 167  sub caparesponse_check_list { Line 173  sub caparesponse_check_list {
   }    }
   my $unit='';    my $unit='';
   $result.="Initial final response :$responselist['-1']:\n";    $result.="Initial final response :$responselist['-1']:\n";
   if ($type eq '') {    if ($type eq '' || $type eq 'float') {
     #for numerical problems split off the unit      #for numerical problems split off the unit
     if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) {      if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) {
       $responselist['-1']=$1;        $responselist['-1']=$1;
Line 182  sub caparesponse_check_list { Line 188  sub caparesponse_check_list {
   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];      my $thisanswer=$list[$i];
     $thisanswer=~ s/\\/\\\\/g;  #    $thisanswer=~ s/\\/\\\\/g;
     $thisanswer =~ s/\'/\\\'/g;  #    $thisanswer =~ s/\'/\\\'/g;
       $result.="trying answer :$thisanswer:\n";
     if ($unit eq '') {      if ($unit eq '') {
       $aresult=&caparesponse_check($responselist[$i],        $aresult=&caparesponse_check($thisanswer,$responselist[$i],
      $expr.';my $answer=\''.$thisanswer.'\';');       $expr);
     } else {      } else {
       $aresult=&caparesponse_check($responselist[$i]." $unit",        $aresult=&caparesponse_check($thisanswer,$responselist[$i]." $unit",
    $expr.';my $answer=\''.$thisanswer.'\';');     $expr);
     }      }
     my ($temp)=split /:/, $aresult;      my ($temp)=split /:/, $aresult;
     $awards.="$temp,";      $awards.="$temp,";
Line 238  sub hinton { Line 245  sub hinton {
 }  }
   
 sub random {  sub random {
   my ($start,$end,$step)=@_;      my ($start,$end,$step)=@_;
   if ( ! $hidden::RANDOMINIT ) {      if ( ! $hidden::RANDOMINIT ) {
     if ($external::randomseed == 0) { $external::randomseed=1; }   if ($external::randomseed == 0) { $external::randomseed=1; }
     &random_set_seed(1,int(abs($external::randomseed)));   if ($external::randomseed =~/,/) {
     &math_random_uniform();      my ($num1,$num2)=split(/,/,$seed);
     $hidden::RANDOMINIT=1;      &random_set_seed(abs($num1),abs($num2));
   }   } else {
   if (!defined($step)) { $step=1; }      &random_set_seed(1,int(abs($external::randomseed)));
   my $num=1+int(($end-$start)/$step);   }
   my $result=$start + int(&math_random_uniform() * $num)*$step;   &math_random_uniform();
   return $result;   $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 478  sub format { Line 490  sub format {
   my ($value,$fmt)=@_;    my ($value,$fmt)=@_;
   my $dollarmode;    my $dollarmode;
   if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; }     if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } 
     $fmt=~/e/E/g;
   my $result=sprintf('%.'.$fmt,$value);    my $result=sprintf('%.'.$fmt,$value);
   $result=~s/(E[+-]*)0/$1/;    $result=~s/(E[+-]*)0/$1/;
   if ($dollarmode) {$result=&dollarmode($result);}    if ($dollarmode) {$result=&dollarmode($result);}
Line 496  sub prettyprint { Line 509  sub prettyprint {
     my $exponent=$2;      my $exponent=$2;
     $exponent=~s/^\+0*//;      $exponent=~s/^\+0*//;
     $exponent=~s/^-0*/-/;      $exponent=~s/^-0*/-/;
       $exponent=~s/^-0*/-/;
       if ($exponent eq '-') { undef($exponent); }
     if ($exponent) {      if ($exponent) {
       if ($external::target eq 'web') {        if ($external::target eq 'web') {
  $result=$frac.'&#215;10<sup>'.$exponent.'</sup>';   $result=$frac.'&#215;10<sup>'.$exponent.'</sup>';
Removed from v.1.60  
changed lines
  Added in v.1.66

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