[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.256 and 1.266

version 1.256, 2015/10/30 03:49:55 version 1.266, 2025/02/20 06:36:00
Line 327  sub start_numericalresponse { Line 327  sub start_numericalresponse {
 sub set_answertext {  sub set_answertext {
     my ($name,$target,$token,$tagstack,$parstack,$parser,$safeeval,      my ($name,$target,$token,$tagstack,$parstack,$parser,$safeeval,
  $response_level) = @_;   $response_level) = @_;
     &add_in_tag_answer($parstack,$safeeval,$response_level);      my $stringify;
       if (scalar(@$tagstack)) {
           if ($$tagstack[-1] eq 'formularesponse') {
               if (&Apache::lonxml::get_param('samples',$parstack,$safeeval)) {
                   $stringify = 1;
               }
           } elsif ($$tagstack[-1] eq 'numericalresponse') {
               $stringify = 1;
           }
       }
       &add_in_tag_answer($parstack,$safeeval,$stringify,$response_level);
   
     if ($name eq '' || !ref($answer{$name})) {      if ($name eq '' || !ref($answer{$name})) {
  if (ref($answer{$tag_internal_answer_name})) {   if (ref($answer{$tag_internal_answer_name})) {
Line 401  sub setup_capa_response { Line 411  sub setup_capa_response {
     if (ref($response)) {      if (ref($response)) {
  $$args_ref{'response'}=dclone($response);   $$args_ref{'response'}=dclone($response);
     } else {      } else {
  $$args_ref{'response'}=dclone([$response]);   $$args_ref{'response'}=dclone(["$response"]);
     }      }
 }  }
   
Line 409  sub check_submission { Line 419  sub check_submission {
     my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_;      my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_;
     my @args = ('type','tol','sig','format','unit','calc','samples','preprocess');      my @args = ('type','tol','sig','format','unit','calc','samples','preprocess');
     my $args_ref = &setup_capa_args($safeeval,$parstack,\@args,$response);      my $args_ref = &setup_capa_args($safeeval,$parstack,\@args,$response);
       my $stringify;
   
     my $hideunit=      my $hideunit=
  &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');   &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
Line 428  sub check_submission { Line 439  sub check_submission {
     if ($tag eq 'formularesponse') {      if ($tag eq 'formularesponse') {
  if ($$args_ref{'samples'}) {   if ($$args_ref{'samples'}) {
     $$args_ref{'type'}='fml';      $$args_ref{'type'}='fml';
               $stringify = 1;
  } else {   } else {
     $$args_ref{'type'}='math';      $$args_ref{'type'}='math';
  }   }
     } elsif ($tag eq 'numericalresponse') {      } elsif ($tag eq 'numericalresponse') {
  $$args_ref{'type'}='float';   $$args_ref{'type'}='float';
           $stringify = 1;
     } elsif ($tag eq 'stringresponse') {      } elsif ($tag eq 'stringresponse') {
         if ($$args_ref{'type'} eq '') {          if ($$args_ref{'type'} eq '') {
             $$args_ref{'type'} = 'ci';              $$args_ref{'type'} = 'ci';
         }          }
     }      }
   
     &add_in_tag_answer($parstack,$safeeval);      &add_in_tag_answer($parstack,$safeeval,$stringify);
   
     if (!%answer) {      if (!%answer) {
  &Apache::lonxml::error("No answers are defined");   &Apache::lonxml::error("No answers are defined");
Line 514  sub stringresponse_gradechange { Line 527  sub stringresponse_gradechange {
 }  }
   
 sub add_in_tag_answer {  sub add_in_tag_answer {
     my ($parstack,$safeeval,$response_level) = @_;      my ($parstack,$safeeval,$stringify,$response_level) = @_;
     my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval,      my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval,
       $response_level);        $response_level);
     &Apache::lonxml::debug('answer is'.join(':',@answer));      &Apache::lonxml::debug('answer is'.join(':',@answer));
     if (@answer && $answer[0] =~ /\S/) {      if (@answer && $answer[0] =~ /\S/) {
           if ($stringify) {
               @answer = map { $_ .= ''; } @answer;
           }
  $answer{$tag_internal_answer_name}= {'type' => 'ordered',   $answer{$tag_internal_answer_name}= {'type' => 'ordered',
      'answers' => [\@answer] };       'answers' => [\@answer] };
     }      }
Line 544  sub end_numericalresponse { Line 560  sub end_numericalresponse {
     }      }
     my $partid = $Apache::inputtags::part;      my $partid = $Apache::inputtags::part;
     my $id = $Apache::inputtags::response[-1];      my $id = $Apache::inputtags::response[-1];
     my $tag;      my ($tag,$stringify);
     my $safehole = new Safe::Hole;      my $safehole = new Safe::Hole;
     $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);      $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
   
Line 562  sub end_numericalresponse { Line 578  sub end_numericalresponse {
  &Apache::lonxml::debug($$parstack[-1] . "\n<br>");   &Apache::lonxml::debug($$parstack[-1] . "\n<br>");
   
  if ( &Apache::response::submitted('scantron')) {   if ( &Apache::response::submitted('scantron')) {
     &add_in_tag_answer($parstack,$safeeval);                      if ($tag eq 'numericalresponse') {
     my ($values,$display)=&make_numerical_bubbles($partid,$id,                          $stringify = 1;
   $target,$parstack,$safeeval);                      } elsif ($tag eq 'formularesponse') {
     $response=$values->[$response];                          if (&Apache::lonxml::get_param('samples',$parstack,$safeeval)) {
  }                              $stringify = 1;
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;                          }
                       }
               &add_in_tag_answer($parstack,$safeeval,$stringify);
               my ($values,$display)=&make_numerical_bubbles($partid,$id,$target,
                             $parstack,$safeeval);
               $response=$values->[$response];
           }
           $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  my ($ad,$msg,$name)=&check_submission($response,$partid,$id,   my ($ad,$msg,$name)=&check_submission($response,$partid,$id,
       $tag,$parstack,        $tag,$parstack,
       $safeeval);        $safeeval);
Line 601  sub end_numericalresponse { Line 624  sub end_numericalresponse {
     }      }
  }   }
     } elsif ($target eq 'web' || $target eq 'tex') {      } elsif ($target eq 'web' || $target eq 'tex') {
  &check_for_answer_errors($parstack,$safeeval);          if ($tag eq 'numericalresponse') {
               $stringify = 1;
           } elsif ($tag eq 'formularesponse') {
               if (&Apache::lonxml::get_param('samples',$parstack,$safeeval)) {
                   $stringify = 1;
               }
           }
    &check_for_answer_errors($parstack,$safeeval,$stringify);
  my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};   my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
  my $status = $Apache::inputtags::status['-1'];   my $status = $Apache::inputtags::status['-1'];
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
Line 623  sub end_numericalresponse { Line 653  sub end_numericalresponse {
  if ($previous eq $bubble_values->[$ind]) {   if ($previous eq $bubble_values->[$ind]) {
     $checked=" checked='on' ";      $checked=" checked='on' ";
  }   }
  $result.='<td><input type="radio" name="HWVAL_'.$id.   $result.='<td><label><input type="radio" name="HWVAL_'.$id.
     '" value="'.$bubble_values->[$ind].'" '.$checked      '" value="'.$bubble_values->[$ind].'" '.$checked
     .' /><b>'.$alphabet[$ind].'</b>: '.      .' /><b>'.$alphabet[$ind].'</b>: '.
     $bubble_display->[$ind].'</td>';      $bubble_display->[$ind].'</label></td>';
     }      }
     $result.='</tr></table>';      $result.='</tr></table>';
  }   }
Line 648  sub end_numericalresponse { Line 678  sub end_numericalresponse {
  $result.='</td></tr>'.&Apache::edit::end_table;   $result.='</td></tr>'.&Apache::edit::end_table;
     } elsif ($target eq 'answer' || $target eq 'analyze') {      } elsif ($target eq 'answer' || $target eq 'analyze') {
  my $part_id="$partid.$id";   my $part_id="$partid.$id";
           my $samples;
  if ($target eq 'analyze') {   if ($target eq 'analyze') {
     push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);      push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
     $Apache::lonhomework::analyze{"$part_id.type"} = $tag;      $Apache::lonhomework::analyze{"$part_id.type"} = $tag;
Line 660  sub end_numericalresponse { Line 691  sub end_numericalresponse {
  if (scalar(@$tagstack)) {   if (scalar(@$tagstack)) {
     &Apache::response::setup_params($tag,$safeeval);      &Apache::response::setup_params($tag,$safeeval);
  }   }
  &add_in_tag_answer($parstack,$safeeval);          if ($tag eq 'numericalresponse') {
               $stringify = 1;
           } elsif ($tag eq 'formularesponse') {
               $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);
               if ($samples) {
                   $stringify = 1;
               }
           }
    &add_in_tag_answer($parstack,$safeeval,$stringify);
  my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);   my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
   
  my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);   my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
    my ($needsdollar,$needscomma);
    if ($unit =~ /\$/) {
       $needsdollar = 1;
    }
    if ($unit =~ /\,/) {
       $needscomma = 1;
    }
   
  if ($target eq 'answer') {   if ($target eq 'answer') {
     $result.=&Apache::response::answer_header($tag,undef,      $result.=&Apache::response::answer_header($tag,undef,
       scalar(keys(%answer)));        scalar(keys(%answer)));
Line 753  sub end_numericalresponse { Line 799  sub end_numericalresponse {
  my $ans=$answers[$i];   my $ans=$answers[$i];
  my $fmt=$formats[0];   my $fmt=$formats[0];
  if (@formats && $#formats) {$fmt=$formats[$i];}   if (@formats && $#formats) {$fmt=$formats[$i];}
  foreach my $element (@$ans) {       my @answers;
    if (ref($ans) eq 'ARRAY') {
       @answers = (@{$ans});
    }
    foreach my $element (@answers) {    
     if ($fmt && $tag eq 'numericalresponse') {      if ($fmt && $tag eq 'numericalresponse') {
  $fmt=~s/e/E/g;   $fmt=~s/e/E/g;
  if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; }   if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; }
  if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; }   if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; }
  $element = &format_number($element,$fmt,$target,   $element = &format_number($element,$fmt,$target,
   $safeeval);    $safeeval);
  if ($fmt=~/\$/ && $unit!~/\$/) { $element=~s/\$//; }   if ($fmt=~/\$/ && !$needsdollar) { $element=~s/\$//; }
     }      }
  }   }
  push(@fmt_ans,join(',',@$ans));   push(@fmt_ans,join(',',@answers));
     }      }
     my $response=\@fmt_ans;      my $response=\@fmt_ans;
   
Line 773  sub end_numericalresponse { Line 823  sub end_numericalresponse {
  ! ($Apache::lonhomework::type eq 'exam' ||   ! ($Apache::lonhomework::type eq 'exam' ||
    lc($hideunit) eq "yes") )  {     lc($hideunit) eq "yes") )  {
  my $cleanunit=$unit;   my $cleanunit=$unit;
  $cleanunit=~s/\$\,//g;   $cleanunit=~s/[\$,]//g;
  foreach my $ans (@fmt_ans) {   foreach my $ans (@fmt_ans) {
     $ans.=" $cleanunit";      $ans.=" $cleanunit";
  }   }
Line 790  sub end_numericalresponse { Line 840  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 'NO_UNIT') && $needsdollar) {
                           $error.=&mt('The unit attribute includes [_1] but the answer format does not.','$').' '.
                                   &mt('Either remove the [_1] from the unit or prepend [_1] to the answer format.','$');    
                       } elsif (($ad eq 'COMMA_FAIL') && $needscomma) {
                           $error.=&mt('The unit attribute includes [_1] but the answer format does not.',',').' '.
                                   &mt('Either remove the [_1] from the unit or prepend [_1] to the answer format.',',');
                       } elsif ($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 818  sub end_numericalresponse { Line 877  sub end_numericalresponse {
  }   }
     }      }
     if ($tag eq 'formularesponse' && $target eq 'answer') {      if ($tag eq 'formularesponse' && $target eq 'answer') {
  my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);  
  $result.=&Apache::response::answer_part($tag,$samples);   $result.=&Apache::response::answer_part($tag,$samples);
     }      }
     $result.=&Apache::response::next_answer($tag,$name);      $result.=&Apache::response::next_answer($tag,$name);
Line 861  sub format_prior_response_numerical { Line 919  sub format_prior_response_numerical {
 }  }
   
 sub check_for_answer_errors {  sub check_for_answer_errors {
     my ($parstack,$safeeval) = @_;      my ($parstack,$safeeval,$stringify) = @_;
     &add_in_tag_answer($parstack,$safeeval);      &add_in_tag_answer($parstack,$safeeval,$stringify);
     my %counts;      my %counts;
     foreach my $name (keys(%answer)) {      foreach my $name (keys(%answer)) {
  push(@{$counts{scalar(@{$answer{$name}{'answers'}})}},$name);   push(@{$counts{scalar(@{$answer{$name}{'answers'}})}},$name);
Line 891  sub get_table_sizes { Line 949  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;
Line 1045  sub make_numerical_bubbles { Line 1103  sub make_numerical_bubbles {
                      &Math::Random::random_uniform_integer(1,1,10);                       &Math::Random::random_uniform_integer(1,1,10);
     }      }
     for ($ind=0;$ind<$number_of_bubbles;$ind++) {      for ($ind=0;$ind<$number_of_bubbles;$ind++) {
  $bubble_values[$ind] = $answerfactor*($factor**($power-$powers[$#powers-$ind]));   my $exponent = $power-$powers[$#powers-$ind];
    $bubble_values[$ind] = $answerfactor*($factor**$exponent);
   
    # If bubble is for correct answer (i.e., exponent = 0), and value
    # of $answerfactor * factor**$exponent is an integer with more than
    # 15 digits, assign $answerfactor itself as bubble value.
    # This prevents a "use fewer digits" issue on 64bit servers
    # when correct answer is >= 1e+16, and when correct bubble is A.
   
    if ($exponent == 0) {
       if ($bubble_values[$ind] =~ /^-?(\d+)$/) {
    if (length($1) > 15) {
       $bubble_values[$ind] = $answerfactor;
    }
       }
    }
   
  $bubble_display[$ind] = &format_number($bubble_values[$ind],   $bubble_display[$ind] = &format_number($bubble_values[$ind],
        $format,$target,$safeeval);         $format,$target,$safeeval);
     }      }
Line 1090  sub make_horizontal_latex_bubbles { Line 1164  sub make_horizontal_latex_bubbles {
     my $j=0;      my $j=0;
     my $cou=0;      my $cou=0;
     $result.='\vskip 2mm \noindent ';      $result.='\vskip 2mm \noindent ';
     $result .= '\textbf{'.$Apache::lonxml::counter.'.} \vskip -3mm ';      if ($Apache::lonhomework::type eq 'exam') {
           $result .= '\textbf{'.$Apache::lonxml::counter.'.} \vskip -3mm ';
       }
   
     for (my $i=0;$i<$number_of_tables;$i++) {      for (my $i=0;$i<$number_of_tables;$i++) {
  if ($i == 0) {   if ($i == 0) {
Line 1230  sub end_stringresponse { Line 1306  sub end_stringresponse {
     if (!$Apache::lonxml::default_homework_loaded) {      if (!$Apache::lonxml::default_homework_loaded) {
  &Apache::lonxml::default_homework_load($safeeval);   &Apache::lonxml::default_homework_load($safeeval);
     }      }
       my $tag;
       if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
     if ( $target eq 'grade' && &Apache::response::submitted() ) {      if ( $target eq 'grade' && &Apache::response::submitted() ) {
  &Apache::response::setup_params('stringresponse',$safeeval);   &Apache::response::setup_params('stringresponse',$safeeval);
  $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);   $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
Line 1272  sub end_stringresponse { Line 1350  sub end_stringresponse {
                     if ($$args_ref{'type'} eq '') {                      if ($$args_ref{'type'} eq '') {
                         $$args_ref{'type'} = 'ci';                          $$args_ref{'type'} = 'ci';
                     }                      }
     &add_in_tag_answer($parstack,$safeeval);                      my $stringify = 1;
       &add_in_tag_answer($parstack,$safeeval,$stringify);
     my (@final_awards,@final_msgs,@names,%ansstring);      my (@final_awards,@final_msgs,@names,%ansstring);
     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 1363  sub end_stringresponse { Line 1442  sub end_stringresponse {
     }      }
  }   }
     } elsif ($target eq 'answer' || $target eq 'analyze') {      } elsif ($target eq 'answer' || $target eq 'analyze') {
  &add_in_tag_answer($parstack,$safeeval);          my $stringify;
           if ($type ne 're') {
               $stringify = 1;
           }
    &add_in_tag_answer($parstack,$safeeval,$stringify);
  if ($target eq 'analyze') {   if ($target eq 'analyze') {
     push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");      push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");
     $Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse';      $Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse';
Removed from v.1.256  
changed lines
  Added in v.1.266

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