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

Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.253 and 1.258

version 1.253, 2012/12/14 11:17:09 version 1.258, 2016/08/09 23:43:45
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # caparesponse definition  # caparesponse definition
 #  #
 #  caparesponse.pm,v 1.249.8.2 2012/02/04 20:40:15 foxr   # $Id$
 #  #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
Line 446  sub check_submission { Line 446  sub check_submission {
     }      }
   
     my (@final_awards,@final_msgs,@names);      my (@final_awards,@final_msgs,@names);
     # $Apache::lonxml::debug = 1; # DEBUG  
     foreach my $name (keys(%answer)) {      foreach my $name (keys(%answer)) {
  &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} }));   &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} }));
   
Line 465  sub check_submission { Line 464  sub check_submission {
  push(@final_msgs,$msg);   push(@final_msgs,$msg);
  push(@names,$name);   push(@names,$name);
     }      }
     # $Apache::lonxml::debug = 0; # DEBUG  
     my ($ad, $msg, $name) = &Apache::inputtags::finalizeawards(\@final_awards,      my ($ad, $msg, $name) = &Apache::inputtags::finalizeawards(\@final_awards,
        \@final_msgs,         \@final_msgs,
        \@names,1);         \@names,1);
Line 644  sub end_numericalresponse { Line 642  sub end_numericalresponse {
  }   }
     }      }
  }   }
         if (($target eq 'web') && ($tag eq 'formularesponse')  
             && ($Apache::lonhomework::type ne 'exam') && ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')  
     && (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) {  
             $result.=&Apache::response::edit_mathresponse_button($id,"HWVAL_$id");  
         }  
               
  &Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical);   &Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical);
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.='</td></tr>'.&Apache::edit::end_table;   $result.='</td></tr>'.&Apache::edit::end_table;
Line 785  sub end_numericalresponse { Line 778  sub end_numericalresponse {
     $ans.=" $cleanunit";      $ans.=" $cleanunit";
  }   }
     }      }
     #  
     # The computer's response must be cast in a form that   
     # ensures it has sufficient significant figures.  
     # the only way to do this is to sprintf it into scientific notation  
     # due to the ambiguity of trailing zeros.  
     # See Bug 6577  
     #  
     my ($sigMax, $sigmin) = &get_sigrange($Apache::inputtags::params{'sig'});  
     my $sigfigs = $sigMax-1;  
   
     for (my $i = 0; $i < scalar @$response; $i++) {  
  $response->[$i] = sprintf('%.' . $sigfigs . 'e', $response->[$i]);  
     }  
     my ($ad,$msg)=&check_submission($response,$partid,$id,$tag,      my ($ad,$msg)=&check_submission($response,$partid,$id,$tag,
     $parstack,$safeeval);      $parstack,$safeeval);
     if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {      if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
Line 810  sub end_numericalresponse { Line 790  sub end_numericalresponse {
     $tag,$parstack,      $tag,$parstack,
     $safeeval,1);      $safeeval,1);
     $error=&mt("Computer's answer is incorrect ([_1]).",'"'.join(', ',@$response).'"').' ';      $error=&mt("Computer's answer is incorrect ([_1]).",'"'.join(', ',@$response).'"').' ';
     if ($sigline ne '') {                      if ($ad eq 'UNIT_INVALID_STUDENT') {
                           $error.=&mt('Unable to interpret units. Computer reads units as "[_1]".',$msg).' '.
                                   &mt('The unit attribute in the numericalresponse item needs to be a supported physical unit.');
       } elsif ($sigline ne '') {
  $error.=&mt('It is likely that the tolerance range [_1] or significant figures [_2] need to be adjusted.',$tolline,$sigline);   $error.=&mt('It is likely that the tolerance range [_1] or significant figures [_2] need to be adjusted.',$tolline,$sigline);
     } else {      } else {
  $error.=&mt('It is likely that the tolerance range [_1] needs to be adjusted.',$tolline);   $error.=&mt('It is likely that the tolerance range [_1] needs to be adjusted.',$tolline);
Line 911  sub get_table_sizes { Line 894  sub get_table_sizes {
     my $cell_width=0;      my $cell_width=0;
     foreach my $member (@$rbubble_values) {      foreach my $member (@$rbubble_values) {
  my $cell_width_real=0;   my $cell_width_real=0;
  if ($member=~/(\+|-)?(\d*)\.?(\d*)\s*\$?\\times\s*10\^{(\+|-)?(\d+)}\$?/) {   if ($member=~/(\+|-)?(\d*)\.?(\d*)\s*\$?\\times\s*10\^\{(\+|-)?(\d+)}\$?/) {
     $cell_width_real=(length($2)+length($3)+length($5)+7)*$scale;      $cell_width_real=(length($2)+length($3)+length($5)+7)*$scale;
  } elsif ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {   } elsif ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {
     $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale;      $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale;
Removed from v.1.253  
changed lines
  Added in v.1.258

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