[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.165 and 1.169

version 1.165, 2005/02/23 23:41:23 version 1.169, 2005/06/20 21:30: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 119  sub start_numericalresponse { Line 120  sub start_numericalresponse {
     return $result;      return $result;
 }  }
   
   sub check_submission {
       my ($response,$partid,$id,$tag,$parstack,$safeeval)=@_;
       my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
       $$args_ref{'response'}=$response;
       my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
       
       foreach my $arg ('type','tol','sig','format','unit','calc',
        'samples') {
    $$args_ref{$arg}=
       &Apache::lonxml::get_param($arg,$parstack,$safeeval);
       }
       foreach my $key (keys(%Apache::inputtags::params)) {
    $$args_ref{$key}=$Apache::inputtags::params{$key};
       }
       
       #no way to enter units, with radio buttons
       if ($Apache::lonhomework::type eq 'exam' ||
    lc($hideunit) eq "yes") {
    delete($$args_ref{'unit'});
       }
       #sig fig don't make much sense either
       if (($Apache::lonhomework::type eq 'exam' ||
    &Apache::response::submitted('scantron')) &&
    $tag eq 'numericalresponse') {
    delete($$args_ref{'sig'});
       }
       
       if ($tag eq 'formularesponse') {
    $$args_ref{'type'}='fml';
       } elsif ($tag eq 'numericalresponse') {
    $$args_ref{'type'}='float';
       }
       my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
       &Apache::lonxml::debug('answer is'.join(':',@answer));
       @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;
       
       my ($result,@msgs) = 
    &Apache::run::run("&caparesponse_check_list()",$safeeval);
       &Apache::lonxml::debug('msgs are'.join(':',@msgs));
       my ($awards)=split(/:/,$result);
       my @awards= split(/,/,$awards);
       return(\@awards,\@msgs);
   }
   
 sub end_numericalresponse {  sub end_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $increment=1;      my $increment=1;
Line 126  sub end_numericalresponse { Line 171  sub end_numericalresponse {
     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 $partid = $Apache::inputtags::part;
       my $id = $Apache::inputtags::response[-1];
     my $tag;      my $tag;
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }      if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
     if ( $target eq 'grade' && &Apache::response::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']);  
  my $partid = $Apache::inputtags::part;  
  my $id = $Apache::inputtags::response['-1'];  
  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);
Line 155  sub end_numericalresponse { Line 200  sub end_numericalresponse {
     $response=$values->[$response];      $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 ($awards,$msgs)=&check_submission($response,$partid,$id,
  $$args_ref{'response'}=$response;       $tag,$parstack,$safeeval);
  my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');  
    ($ad,my $msg) = &Apache::inputtags::finalizeawards($awards,$msgs);
  foreach my $arg ('type','tol','sig','format','unit','calc',  
  'samples') {  
     $$args_ref{$arg}=  
  &Apache::lonxml::get_param($arg,$parstack,$safeeval);  
  }  
  foreach my $key (keys(%Apache::inputtags::params)) {  
     $$args_ref{$key}=$Apache::inputtags::params{$key};  
  }  
   
  #no way to enter units, with radio buttons  
  if ($Apache::lonhomework::type eq 'exam' ||  
     lc($hideunit) eq "yes") {  
     delete($$args_ref{'unit'});  
  }  
  #sig fig don't make much sense either  
  if (($Apache::lonhomework::type eq 'exam' ||  
      &Apache::response::submitted('scantron')) &&  
     $tag eq 'numericalresponse') {  
     delete($$args_ref{'sig'});  
  }  
   
  if ($tag eq 'formularesponse') {  
     $$args_ref{'type'}='fml';  
  } elsif ($tag eq 'numericalresponse') {  
     $$args_ref{'type'}='float';  
  }  
  my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);  
  &Apache::lonxml::debug('answer is'.join(':',@answer));  
  @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;  
   
  ($result,my @msgs) =   
     &Apache::run::run("&caparesponse_check_list()",$safeeval);  
  &Apache::lonxml::debug('msgs are'.join(':',@msgs));  
  my ($awards)=split(/:/,$result);  
  my (@awards) = split(/,/,$awards);  
  ($ad,my $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);  
  &Apache::lonxml::debug('ad is'.$ad);   &Apache::lonxml::debug('ad is'.$ad);
  if ($ad eq 'SIG_FAIL') {   if ($ad eq 'SIG_FAIL') {
     my ($sig_u,$sig_l)=      my ($sig_u,$sig_l)=
Line 221  sub end_numericalresponse { Line 230  sub end_numericalresponse {
  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') {
     my $partid=$Apache::inputtags::part;  
     my $id=$Apache::inputtags::response[-1];  
     my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');      my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');
     if ($Apache::inputtags::params{'numbubbles'}) {      if ($Apache::inputtags::params{'numbubbles'}) {
  $number_of_bubbles = $Apache::inputtags::params{'numbubbles'};   $number_of_bubbles = $Apache::inputtags::params{'numbubbles'};
Line 301  sub end_numericalresponse { Line 308  sub end_numericalresponse {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $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="$Apache::inputtags::part.$Apache::inputtags::response[-1]";  
  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 345  sub end_numericalresponse { Line 351  sub end_numericalresponse {
  #    $low =&format_number($low,$fmt,$target,$safeeval);   #    $low =&format_number($low,$fmt,$target,$safeeval);
  #}   #}
     }      }
       my $response=$ans;
       if ($unit) {
    my $cleanunit=$unit;
    $cleanunit=~s/\$\,//g;
    $response.=" $cleanunit";
       }
     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 365  sub end_numericalresponse { Line 377  sub end_numericalresponse {
     push (@{ $Apache::lonhomework::analyze{"$part_id.format"} }, $fmt);      push (@{ $Apache::lonhomework::analyze{"$part_id.format"} }, $fmt);
  }   }
     }      }
       my ($awards,$msgs)=&check_submission($response,$partid,$id,$tag,
    $parstack,$safeeval);
       my ($ad,$msg) =&Apache::inputtags::finalizeawards($awards,$msgs);
       if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
    &Apache::lonxml::error(&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range ("[_2]" to "[_3]") or significant figures ("[_4]" to "[_5]") needs to be adjusted',$response,$low,$high,$siglow,$sighigh));
       }
  }   }
  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 415  sub get_table_sizes { Line 433  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 526  sub get_tolrange { Line 544  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 547  sub get_sigrange { Line 565  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 711  sub end_stringresponse { Line 729  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.165  
changed lines
  Added in v.1.169

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