[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.247 and 1.260

version 1.247, 2011/06/08 01:39:32 version 1.260, 2018/09/14 02:51:39
Line 36  use Apache::lonnet; Line 36  use Apache::lonnet;
 use Apache::lonmsg();  use Apache::lonmsg();
 use Apache::response();  use Apache::response();
 use Storable qw(dclone);  use Storable qw(dclone);
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::caparesponse',('numericalresponse','stringresponse','formularesponse'));      &Apache::lonxml::register('Apache::caparesponse',('numericalresponse','stringresponse','formularesponse'));
Line 43  BEGIN { Line 44  BEGIN {
   
 my %answer;  my %answer;
 my @answers;  my @answers;
   my @alphabet=('A'..'Z');
   
 sub get_answer { return %answer; };  sub get_answer { return %answer; };
 sub push_answer{ push(@answers,dclone(\%answer)); undef(%answer) }  sub push_answer{ push(@answers,dclone(\%answer)); undef(%answer) }
 sub pop_answer { %answer = %{pop(@answers)}; };  sub pop_answer { %answer = %{pop(@answers)}; };
Line 280  sub start_numericalresponse { Line 283  sub start_numericalresponse {
      $token,40).       $token,40).
       &Apache::loncommon::help_open_topic('Formula_Response_Sampling');        &Apache::loncommon::help_open_topic('Formula_Response_Sampling');
  }   }
           $result.=&Apache::edit::text_arg('Pre-Processor Subroutine:','preprocess',
                                                $token,10);
  $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag;   my $constructtag;
Line 287  sub start_numericalresponse { Line 292  sub start_numericalresponse {
     $constructtag=&Apache::edit::get_new_args($token,$parstack,      $constructtag=&Apache::edit::get_new_args($token,$parstack,
       $safeeval,'answer',        $safeeval,'answer',
        'incorrect','unit',         'incorrect','unit',
       'format');        'format','preprocess');
  } elsif ($token->[1] eq 'formularesponse') {   } elsif ($token->[1] eq 'formularesponse') {
     $constructtag=&Apache::edit::get_new_args($token,$parstack,      $constructtag=&Apache::edit::get_new_args($token,$parstack,
       $safeeval,'answer',        $safeeval,'answer',
       'samples');        'samples','preprocess');
  }   }
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
Line 451  sub check_submission { Line 456  sub check_submission {
  my ($result,@msgs) =    my ($result,@msgs) = 
     &Apache::run::run("&caparesponse_check_list()",$safeeval);      &Apache::run::run("&caparesponse_check_list()",$safeeval);
  &Apache::lonxml::debug("checking $name $result with $response took ".&Time::HiRes::tv_interval($t0));   &Apache::lonxml::debug("checking $name $result with $response took ".&Time::HiRes::tv_interval($t0));
           
  &Apache::lonxml::debug('msgs are '.join(':',@msgs));   &Apache::lonxml::debug('msgs are '.join(':',@msgs));
  my ($awards)=split(/:/,$result);   my ($awards)=split(/:/,$result);
  my @awards= split(/,/,$awards);   my @awards= split(/,/,$awards);
Line 609  sub end_numericalresponse { Line 613  sub end_numericalresponse {
     my $number_of_bubbles = scalar(@{ $bubble_values });      my $number_of_bubbles = scalar(@{ $bubble_values });
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
     $safeeval);      $safeeval);
     my @alphabet=('A'..'Z');  
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($tag eq 'numericalresponse') {   if ($tag eq 'numericalresponse') {
     if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}      if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}
Line 632  sub end_numericalresponse { Line 635  sub end_numericalresponse {
     $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';      $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
  }   }
  if ($tag eq 'numericalresponse') {   if ($tag eq 'numericalresponse') {
     my ($celllength,$number_of_tables,@table_range)=      $result .= &make_horizontal_latex_bubbles($bubble_values, $bubble_display,
  &get_table_sizes($number_of_bubbles,$bubble_display);   '$\bigcirc$');
     my $j=0;  
     my $cou=0;  
     $result.='\vskip 2mm \noindent ';  
     $result .= '\textbf{'.$Apache::lonxml::counter.'.} \vskip -3mm ';  
   
     for (my $i=0;$i<$number_of_tables;$i++) {  
  if ($i == 0) {  
     $result .= '\vskip -1mm ';  
  } else {  
     $result .= '\vskip 1mm ';  
  }  
  $result.='\noindent \setlength{\tabcolsep}{2 mm}\hskip 2pc\begin{tabular}{';  
  for (my $ind=0;$ind<$table_range[$j];$ind++) {  
     $result.='p{3 mm}p{'.$celllength.' mm}';  
  }  
  $result.='}';  
  for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {  
     $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_display->[$ind].'} ';  
     if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}  
  }  
  $cou += $table_range[$j];  
  $j++;  
  $result.='\\\\\end{tabular}\vskip 0 mm ';  
     }  
  } else {   } else {
     $increment = &Apache::response::repetition();      $increment = &Apache::response::repetition();
  }   }
     }      }
  }   }
         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 690  sub end_numericalresponse { Line 664  sub end_numericalresponse {
  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 779  sub end_numericalresponse { Line 760  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 799  sub end_numericalresponse { Line 784  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 816  sub end_numericalresponse { Line 801  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 917  sub get_table_sizes { Line 911  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 990  sub make_numerical_bubbles { Line 984  sub make_numerical_bubbles {
     my $number_of_bubbles =       my $number_of_bubbles = 
  &Apache::response::get_response_param($part.'_'.$id,'numbubbles',8);   &Apache::response::get_response_param($part.'_'.$id,'numbubbles',8);
   
       #
       # Fixes for BZ 6519 - number of bubbles <= 0 or non-integer.
       # 
       $number_of_bubbles = int($number_of_bubbles + 0.5);
       if ($number_of_bubbles <= 0) {
    $number_of_bubbles = 8;
       }
       
   
     my ($format)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);      my ($format)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
     my $name = (exists($answer{$tag_internal_answer_name})       my $name = (exists($answer{$tag_internal_answer_name}) 
  ? $tag_internal_answer_name   ? $tag_internal_answer_name
Line 1077  sub make_numerical_bubbles { Line 1080  sub make_numerical_bubbles {
     return (\@bubble_values,\@bubble_display,$correct);      return (\@bubble_values,\@bubble_display,$correct);
 }  }
   
   ##
   # Produce LaTeX bubbles laid out horizontally given a set of bubble values:
   #
   # @param bubble_values  - reference to an array of bubble 'values'
   # @param bubble_display - reference to the array of texts to display to the user
   #                         for each bubble_value (this is mostly for numerical response
   #                         when the displayed value may not be an exact
   #                         representation of the bubble value. 
   # @param bubble_fragment- The LaTeX fragment that will be plugged in to make
   #                         the bubble itself. Note that the code will autonomously
   #                         label each bubble with a lable...and that it's perfectly
   #                         acceptable to use "" for the bubble_fragment.
   # 
   # @return string - the LaTeX fragment that produces the bubbles.
   #
   sub make_horizontal_latex_bubbles {
       my ($bubble_values, $bubble_display, $bubble_fragment)     = @_;
       my $result;
   
       my $number_of_bubbles = scalar(@{$bubble_values}); 
   
       # Get the number of rows and columns in each row of the bubble
       # table:
   
       my ($celllength, $number_of_tables, @table_range) =
    &get_table_sizes($number_of_bubbles, $bubble_display);
   
       my $j=0;
       my $cou=0;
       $result.='\vskip 2mm \noindent ';
       $result .= '\textbf{'.$Apache::lonxml::counter.'.} \vskip -3mm ';
   
       for (my $i=0;$i<$number_of_tables;$i++) {
    if ($i == 0) {
       $result .= '\vskip -1mm ';
    } else {
       $result .= '\vskip 1mm ';
    }
    $result.='\noindent \setlength{\tabcolsep}{2 mm}\hskip 2pc\begin{tabular}{';
    for (my $ind=0;$ind<$table_range[$j];$ind++) {
       $result.='p{4 mm}p{'.$celllength.' mm}';
    }
    $result.='}';
    for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
       $result.='\hskip -4 mm {\small \textbf{ '.$alphabet[$ind].'}}'
    . $bubble_fragment 
    . '& \hskip -3 mm {\small '.$bubble_display->[$ind].'} ';
       if ($ind != $cou+$table_range[$j]-1) {
    $result.=' & ';
       }
    }
    $cou += $table_range[$j];
    $j++;
    $result.='\\\\\end{tabular}\vskip 0 mm ';
       }
       return $result;
   }
   
 sub get_tolrange {  sub get_tolrange {
     my ($ans,$tol)=@_;      my ($ans,$tol)=@_;
     my ($high,$low);      my ($high,$low);
Line 1148  sub start_stringresponse { Line 1209  sub start_stringresponse {
   ['re','Regular Expression']],$token);    ['re','Regular Expression']],$token);
  $result.=&Apache::edit::text_arg('String to display for answer:',   $result.=&Apache::edit::text_arg('String to display for answer:',
  'answerdisplay',$token);   'answerdisplay',$token);
           $result.=&Apache::edit::text_arg('Pre-Processor Subroutine:','preprocess',
                                                $token,10);
  $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag;   my $constructtag;
  $constructtag=&Apache::edit::get_new_args($token,$parstack,   $constructtag=&Apache::edit::get_new_args($token,$parstack,
   $safeeval,'answer',    $safeeval,'answer',
   'type','answerdisplay');    'type','answerdisplay','preprocess');
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();      $result.=&Apache::edit::handle_insert();
Line 1213  sub end_stringresponse { Line 1276  sub end_stringresponse {
 # $answer=$token->[2]->{'answer'};  # $answer=$token->[2]->{'answer'};
 #    }  #    }
     ${$safeeval->varglob('LONCAPA::response')}=$response;      ${$safeeval->varglob('LONCAPA::response')}=$response;
                       my $preprocess=&Apache::lonxml::get_param('preprocess',$parstack,$safeeval);
                       $preprocess=~s/^\&//;
                       if (defined($preprocess)) {
                           &Apache::run::run('$LONCAPA::response=&'.$preprocess.'($LONCAPA::response);',$safeeval);
                       }
     $result = &Apache::run::run('if ($LONCAPA::response=~m'.$answer.') { return 1; } else { return 0; }',$safeeval);      $result = &Apache::run::run('if ($LONCAPA::response=~m'.$answer.') { return 1; } else { return 0; }',$safeeval);
     &Apache::lonxml::debug("current $response");      &Apache::lonxml::debug("current $response");
     &Apache::lonxml::debug("current $answer");      &Apache::lonxml::debug("current $answer");
     $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';      $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
  } else {   } else {
     my @args = ('type');      my @args = ('type','preprocess');
     my $args_ref = &setup_capa_args($safeeval,$parstack,      my $args_ref = &setup_capa_args($safeeval,$parstack,
     \@args,$response);      \@args,$response);
                     if ($$args_ref{'type'} eq '') {                      if ($$args_ref{'type'} eq '') {
Line 1380  sub end_stringresponse { Line 1448  sub end_stringresponse {
     }      }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::increment_counter(&Apache::response::repetition(),          my $repetition = &Apache::response::repetition();
    "$part.$id");   &Apache::lonxml::increment_counter($repetition,"$part.$id");
  if ($target eq 'analyze') {   if ($target eq 'analyze') {
     &Apache::lonhomework::set_bubble_lines();      &Apache::lonhomework::set_bubble_lines();
  }   }
Removed from v.1.247  
changed lines
  Added in v.1.260

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