[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.157 and 1.166

version 1.157, 2004/10/21 03:24:23 version 1.166, 2005/04/07 06:56:22
Line 30  package Apache::caparesponse; Line 30  package Apache::caparesponse;
 use strict;  use strict;
 use capa;  use capa;
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));      &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
Line 128  sub end_numericalresponse { Line 129  sub end_numericalresponse {
     }      }
     my $tag;      my $tag;
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }      if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
     if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {      if ( $target eq 'grade' && &Apache::response::submitted() ) {
  &Apache::response::setup_params($tag,$safeeval);   &Apache::response::setup_params($tag,$safeeval);
  $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);   $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
  my $partid = $Apache::inputtags::part;   my $partid = $Apache::inputtags::part;
Line 136  sub end_numericalresponse { Line 137  sub end_numericalresponse {
  if ($Apache::lonhomework::type eq 'exam' &&    if ($Apache::lonhomework::type eq 'exam' && 
     $tag eq 'formularesponse') {      $tag eq 'formularesponse') {
     $increment=&Apache::response::scored_response($partid,$id);      $increment=&Apache::response::scored_response($partid,$id);
  } elsif ($Apache::lonhomework::type eq 'survey') {  
     if ( !defined($ENV{'form.submitted'})) { return ''; }  
     my $response = &Apache::response::getresponse();  
     if ( $response =~ /[^\s]/) {  
  my %previous=&Apache::response::check_for_previous($response,  
  $partid,$id);  
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;  
  my $ad=$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}='SUBMITTED';  
  &Apache::response::handle_previous(\%previous,$ad);  
     }  
  } else {   } else {
     my $response = &Apache::response::getresponse();      my $response = &Apache::response::getresponse();
     if ( $response =~ /[^\s]/) {      if ( $response =~ /[^\s]/) {
Line 154  sub end_numericalresponse { Line 145  sub end_numericalresponse {
  &Apache::lonxml::debug("submitted a $response<br>\n");   &Apache::lonxml::debug("submitted a $response<br>\n");
  &Apache::lonxml::debug($$parstack[-1] . "\n<br>");   &Apache::lonxml::debug($$parstack[-1] . "\n<br>");
   
  if ($ENV{'form.submitted'} eq 'scantron') {   if ( &Apache::response::submitted('scantron')) {
     my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');      my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');
     if (!$number_of_bubbles) { $number_of_bubbles=8; }      if (!$number_of_bubbles) { $number_of_bubbles=8; }
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
     my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);      my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
     my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);      my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
     my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect,$safeeval);      if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
     $response=$values[$response];      my ($values,$display)=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect,$safeeval);
       $response=$values->[$response];
  }   }
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};   my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
Line 184  sub end_numericalresponse { Line 176  sub end_numericalresponse {
  }   }
  #sig fig don't make much sense either   #sig fig don't make much sense either
  if (($Apache::lonhomework::type eq 'exam' ||   if (($Apache::lonhomework::type eq 'exam' ||
      $ENV{'form.submitted'} eq 'scantron') &&       &Apache::response::submitted('scantron')) &&
     $tag eq 'numericalresponse') {      $tag eq 'numericalresponse') {
     delete($$args_ref{'sig'});      delete($$args_ref{'sig'});
  }   }
Line 213  sub end_numericalresponse { Line 205  sub end_numericalresponse {
    $Apache::inputtags::params{'sig'});     $Apache::inputtags::params{'sig'});
  }   }
  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");   &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
    if ($Apache::lonhomework::type eq 'survey' &&
       ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
        $ad eq 'EXACT_ANS')) {
       $ad='SUBMITTED';
    }
  &Apache::response::handle_previous(\%previous,$ad);   &Apache::response::handle_previous(\%previous,$ad);
  $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;   $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
  $Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg;   $Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg;
Line 238  sub end_numericalresponse { Line 235  sub end_numericalresponse {
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
     $safeeval);      $safeeval);
     my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);      my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
     my @bubble_values=&make_numerical_bubbles($number_of_bubbles,      if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
       $target,$answers[0],      my ($bubble_values,$bubble_display)=
       $formats[0],\@incorrect,$safeeval);   &make_numerical_bubbles($number_of_bubbles,
    $target,$answers[0],
    $formats[0],\@incorrect,$safeeval);
     my @alphabet=('A'..'Z');      my @alphabet=('A'..'Z');
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($tag eq 'numericalresponse') {   if ($tag eq 'numericalresponse') {
Line 249  sub end_numericalresponse { Line 248  sub end_numericalresponse {
     my $previous=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.$id.submission"};      my $previous=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.$id.submission"};
     for (my $ind=0;$ind<$number_of_bubbles;$ind++) {      for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
  my $checked='';   my $checked='';
  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><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_values[$ind].'</td>';      $bubble_display->[$ind].'</td>';
     }      }
     $result.='</tr></table>';      $result.='</tr></table>';
  } elsif ($tag eq 'formularesponse') {   } elsif ($tag eq 'formularesponse') {
Line 269  sub end_numericalresponse { Line 268  sub end_numericalresponse {
  }   }
  if ($tag eq 'numericalresponse') {   if ($tag eq 'numericalresponse') {
     my ($celllength,$number_of_tables,@table_range)=      my ($celllength,$number_of_tables,@table_range)=
  &get_table_sizes($number_of_bubbles,\@bubble_values);   &get_table_sizes($number_of_bubbles,$bubble_display);
     my $j=0;      my $j=0;
     my $cou=0;      my $cou=0;
     $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';      $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
Line 280  sub end_numericalresponse { Line 279  sub end_numericalresponse {
  }   }
  $result.='}';   $result.='}';
  for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {   for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
     $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_values[$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.=' & ';}      if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
  }   }
  $cou += $table_range[$j];   $cou += $table_range[$j];
Line 309  sub end_numericalresponse { Line 308  sub end_numericalresponse {
     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;
     my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);      my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
       if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
     push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);      push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);
     &Apache::response::check_if_computed($token,$parstack,      &Apache::response::check_if_computed($token,$parstack,
  $safeeval,'answer');   $safeeval,'answer');
Line 349  sub end_numericalresponse { Line 349  sub end_numericalresponse {
     if ($target eq 'answer') {      if ($target eq 'answer') {
  if ($high && $tag eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }   if ($high && $tag eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }
  if (defined($sighigh) && $tag eq 'numericalresponse') {   if (defined($sighigh) && $tag eq 'numericalresponse') {
     if ($ENV{'form.answer_output_mode'} eq 'tex') {      if ($env{'form.answer_output_mode'} eq 'tex') {
  $ans.= " Sig $siglow - $sighigh";   $ans.= " Sig $siglow - $sighigh";
     } else {      } else {
  $ans.= " Sig <i>$siglow - $sighigh</i>";   $ans.= " Sig <i>$siglow - $sighigh</i>";
Line 362  sub end_numericalresponse { Line 362  sub end_numericalresponse {
     push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"} }, $high);      push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"} }, $high);
     push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"} }, $low);      push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"} }, $low);
  }   }
    if ($fmt) {
       push (@{ $Apache::lonhomework::analyze{"$part_id.format"} }, $fmt);
    }
     }      }
  }   }
  if (defined($unit) and ($unit ne '') and   if (defined($unit) and ($unit ne '') and
     $tag eq 'numericalresponse') {      $tag eq 'numericalresponse') {
     if ($target eq 'answer') {      if ($target eq 'answer') {
  if ($ENV{'form.answer_output_mode'} eq 'tex') {   if ($env{'form.answer_output_mode'} eq 'tex') {
     $result.=&Apache::response::answer_part($tag,      $result.=&Apache::response::answer_part($tag,
     " Unit: $unit ");      " Unit: $unit ");
  } else {   } else {
Line 400  sub get_table_sizes { Line 403  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 413  sub get_table_sizes { Line 416  sub get_table_sizes {
     }      }
     $cell_width+=8;       $cell_width+=8; 
     my $textwidth;      my $textwidth;
     if ($ENV{'form.textwidth'} ne '') {      if ($env{'form.textwidth'} ne '') {
  $ENV{'form.textwidth'}=~/(\d*)\.?(\d*)/;   $env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
  $textwidth=$1.'.'.$2;   $textwidth=$1.'.'.$2;
     } else {      } else {
  $ENV{'textwidth'}=~/(\d+)\.?(\d*)/;   $env{'form.textwidth'}=~/(\d+)\.?(\d*)/;
  $textwidth=$1.'.'.$2;   $textwidth=$1.'.'.$2;
     }      }
     my $bubbles_per_line=int($textwidth/$cell_width);      my $bubbles_per_line=int($textwidth/$cell_width);
Line 458  sub format_number { Line 461  sub format_number {
   
 sub make_numerical_bubbles {  sub make_numerical_bubbles {
     my ($number_of_bubbles,$target,$answer,$format,$incorrect,$safeeval) =@_;      my ($number_of_bubbles,$target,$answer,$format,$incorrect,$safeeval) =@_;
     my @bubble_values = ();      my @bubble_values=();
     &Apache::lonxml::debug("answer is $answer incorrect is $incorrect");      &Apache::lonxml::debug("answer is $answer incorrect is $incorrect");
     my @oldseed=&Math::Random::random_get_seed();      my @oldseed=&Math::Random::random_get_seed();
     if (defined($incorrect) && ref($incorrect)) {      if (defined($incorrect) && ref($incorrect)) {
Line 473  sub make_numerical_bubbles { Line 476  sub make_numerical_bubbles {
     &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values));      &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values));
     &Math::Random::random_set_seed(@oldseed);      &Math::Random::random_set_seed(@oldseed);
     if (defined($format) && $format ne '') {      if (defined($format) && $format ne '') {
    my @bubble_display;
  foreach my $value (@bubble_values) {   foreach my $value (@bubble_values) {
     $value=&format_number($value,$format,$target,$safeeval);      push(@bubble_display,
    &format_number($value,$format,$target,$safeeval));
  }   }
    return (\@bubble_values,\@bubble_display);
       } else {
    return (\@bubble_values,\@bubble_values);
     }      }
     return @bubble_values;  
  }   }
  if (defined($$incorrect[0]) &&   if (defined($$incorrect[0]) &&
     scalar(@$incorrect)+1 < $number_of_bubbles) {      scalar(@$incorrect)+1 < $number_of_bubbles) {
     &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them.");      &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them (".join(',',@$incorrect).").");
  }   }
     }      }
     my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors      my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors
Line 491  sub make_numerical_bubbles { Line 498  sub make_numerical_bubbles {
     my $power = $powers[$ind];      my $power = $powers[$ind];
     $ind=&Math::Random::random_uniform_integer(1,0,$#factors);      $ind=&Math::Random::random_uniform_integer(1,0,$#factors);
     my $factor = $factors[$ind];      my $factor = $factors[$ind];
       my @bubble_display;
     for ($ind=0;$ind<$number_of_bubbles;$ind++) {      for ($ind=0;$ind<$number_of_bubbles;$ind++) {
  $bubble_values[$ind] = $answer*($factor**($power-$powers[$#powers-$ind]));   $bubble_values[$ind] = $answer*($factor**($power-$powers[$#powers-$ind]));
  $bubble_values[$ind] = &format_number($bubble_values[$ind],   $bubble_display[$ind] = &format_number($bubble_values[$ind],
        $format,$target,$safeeval);         $format,$target,$safeeval);
   
     }      }
     &Math::Random::random_set_seed(@oldseed);      &Math::Random::random_set_seed(@oldseed);
     return @bubble_values;      return (\@bubble_values,\@bubble_display);
 }  }
   
 sub get_tolrange {  sub get_tolrange {
Line 519  sub get_tolrange { Line 527  sub get_tolrange {
 sub get_sigrange {  sub get_sigrange {
     my ($sig)=@_;      my ($sig)=@_;
     &Apache::lonxml::debug("Got a sig of :$sig:");      &Apache::lonxml::debug("Got a sig of :$sig:");
     my $courseid=$ENV{'request.course.id'};      my $courseid=$env{'request.course.id'};
     if (lc($ENV{"course.$courseid.disablesigfigs"}) eq 'yes') {      if (lc($env{"course.$courseid.disablesigfigs"}) eq 'yes') {
  return (15,0);   return (15,0);
     }      }
     my $sig_lbound;      my $sig_lbound;
Line 540  sub get_sigrange { Line 548  sub get_sigrange {
  ($sig_lbound > 15) ||   ($sig_lbound > 15) ||
  ($sig =~/(\+|-)/ ) ) {   ($sig =~/(\+|-)/ ) ) {
  my $errormsg=&mt("Invalid Significant figures detected")." ($sig)";   my $errormsg=&mt("Invalid Significant figures detected")." ($sig)";
  if ($ENV{'request.state'} eq 'construct') {   if ($env{'request.state'} eq 'construct') {
     $errormsg.=      $errormsg.=
  &Apache::loncommon::help_open_topic('Significant_Figures');   &Apache::loncommon::help_open_topic('Significant_Figures');
  }   }
Line 603  sub end_stringresponse { Line 611  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);
     }      }
     if ( $target eq 'grade' && defined($ENV{'form.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']);
  if ($Apache::lonhomework::type eq 'exam' ||   if ($Apache::lonhomework::type eq 'exam' ||
     $ENV{'form.submitted'} eq 'scantron') {      &Apache::response::submitted('scantron')) {
     $increment=&Apache::response::scored_response($part,$id);      $increment=&Apache::response::scored_response($part,$id);
  } elsif ($Apache::lonhomework::type eq 'survey') {  
     if ( !defined($ENV{'form.submitted'})) { return ''; }  
     my $response = &Apache::response::getresponse();  
     if ( $response =~ /[^\s]/) {  
  my %previous=&Apache::response::check_for_previous($response,  
    $part,$id);  
  $Apache::lonhomework::results{"resource.$part.$id.submission"}=  
     $response;  
  my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';  
  &Apache::response::handle_previous(\%previous,$ad);  
     }  
  } else {   } else {
     my $response = &Apache::response::getresponse();      my $response = &Apache::response::getresponse();
     if ( $response =~ /[^\s]/) {      if ( $response =~ /[^\s]/) {
Line 662  sub end_stringresponse { Line 659  sub end_stringresponse {
     ($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);      ($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
     &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");      &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
  }   }
    if ($Apache::lonhomework::type eq 'survey' &&
       ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
        $ad eq 'EXACT_ANS')) {
       $ad='SUBMITTED';
    }
  &Apache::response::handle_previous(\%previous,$ad);   &Apache::response::handle_previous(\%previous,$ad);
  $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;   $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
  $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;   $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;
Line 710  sub end_stringresponse { Line 712  sub end_stringresponse {
     $string='Regular Expression';      $string='Regular Expression';
  }   }
  if ($target eq 'answer') {   if ($target eq 'answer') {
     if ($ENV{'form.answer_output_mode'} eq 'tex') {      if ($env{'form.answer_output_mode'} eq 'tex') {
  $result.=&Apache::response::answer_part('stringresponse',   $result.=&Apache::response::answer_part('stringresponse',
  "$string");   "$string");
     } else {      } else {
Removed from v.1.157  
changed lines
  Added in v.1.166

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