[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.114 and 1.117

version 1.114, 2003/09/22 20:49:01 version 1.117, 2003/10/23 07:31:52
Line 41  sub start_numericalresponse { Line 41  sub start_numericalresponse {
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::text_arg('Answer:','answer',$token);   $result.=&Apache::edit::text_arg('Answer:','answer',$token);
    $result.=&Apache::edit::text_arg('Incorrect Answers:','incorrect',
    $token);
  if ($token->[1] eq 'numericalresponse') {   if ($token->[1] eq 'numericalresponse') {
     $result.=&Apache::edit::text_arg('Unit:','unit',$token,5).      $result.=&Apache::edit::text_arg('Unit:','unit',$token,5).
  &Apache::loncommon::help_open_topic('Physical_Units');   &Apache::loncommon::help_open_topic('Physical_Units');
Line 61  sub start_numericalresponse { Line 63  sub start_numericalresponse {
  if ($token->[1] eq 'numericalresponse') {   if ($token->[1] eq 'numericalresponse') {
     $constructtag=&Apache::edit::get_new_args($token,$parstack,      $constructtag=&Apache::edit::get_new_args($token,$parstack,
       $safeeval,'answer',        $safeeval,'answer',
       'unit','format');        'incorrect','unit',
         'format');
  } elsif ($token->[1] eq 'stringresponse') {   } elsif ($token->[1] eq 'stringresponse') {
     $constructtag=&Apache::edit::get_new_args($token,$parstack,      $constructtag=&Apache::edit::get_new_args($token,$parstack,
       $safeeval,'answer',        $safeeval,'answer',
Line 114  sub end_numericalresponse { Line 117  sub end_numericalresponse {
     if ( $response =~ /[^\s]/) {      if ( $response =~ /[^\s]/) {
  my $ad;   my $ad;
  my %previous = &Apache::response::check_for_previous($response,$partid,$id);   my %previous = &Apache::response::check_for_previous($response,$partid,$id);
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;  
  &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 ($ENV{'form.submitted'} eq 'scantron') {
     my $number_of_bubbles = 8;#default values for number of bubbles      my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');
     my (@formats)=&Apache::lonxml::get_param_var('format',      if (!$number_of_bubbles) { $number_of_bubbles=8; }
  $parstack,$safeeval);      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
     my (@answers)=&Apache::lonxml::get_param_var('answer',      my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
  $parstack,$safeeval);      my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
     my @values=&make_numerical_bubbles($number_of_bubbles,$target,      my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect);
        $answers[0],$formats[0]);  
     $response=$values[$response];      $response=$values[$response];
  } else {   } else {
     $response =~ s/\\/\\\\/g;      $response =~ s/\\/\\\\/g;
     $response =~ s/\'/\\\'/g;      $response =~ s/\'/\\\'/g;
  }   }
    $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  &Apache::lonxml::debug("current $response");   &Apache::lonxml::debug("current $response");
  my $expression="&caparesponse_check_list('".$response."','".   my $expression="&caparesponse_check_list('".$response."','".
     $$parstack[-1];      $$parstack[-1];
Line 206  sub end_numericalresponse { Line 208  sub end_numericalresponse {
     }      }
  }   }
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     my $number_of_bubbles = 8; #default values for number of bubbles      my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');
       if (!$number_of_bubbles) { $number_of_bubbles=8; }
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
  $safeeval);   $safeeval);
     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 @bubble_values=&make_numerical_bubbles($number_of_bubbles,      my @bubble_values=&make_numerical_bubbles($number_of_bubbles,
       $target,$answers[0],        $target,$answers[0],
       $formats[0]);        $formats[0],\@incorrect);
     my @alphabet=('A'..'Z');      my @alphabet=('A'..'Z');
     my $id=$Apache::inputtags::response[-1];      my $id=$Apache::inputtags::response[-1];
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($$tagstack[-1] eq 'numericalresponse') {   if ($$tagstack[-1] eq 'numericalresponse') {
     if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}      if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}
     $result.= '<table border="1"><tr>';      $result.= '<table border="1"><tr>';
       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='';
    if ($previous eq $bubble_values[$ind]) {
       $checked=" checked='on' ";
    }
  $result.='<td><input type="radio" name="HWVAL_'.$id.   $result.='<td><input type="radio" name="HWVAL_'.$id.
     '" value="'.$bubble_values[$ind].'"><b>'.      '" value="'.$bubble_values[$ind].'" '.$checked
  $alphabet[$ind].'</b>: '.      .' /><b>'.$alphabet[$ind].'</b>: '.
     $bubble_values[$ind].'</td>';      $bubble_values[$ind].'</td>';
     }      }
     $result.='</tr></table>';      $result.='</tr></table>';
  } elsif ($$tagstack[-1] eq 'formularesponse') {   } elsif ($$tagstack[-1] eq 'formularesponse') {
Line 277  sub end_numericalresponse { Line 286  sub end_numericalresponse {
  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"} = $$tagstack[-1];      $Apache::lonhomework::analyze{"$part_id.type"} = $$tagstack[-1];
       my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
       push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);
  }   }
  &Apache::response::setup_params($$tagstack[-1]);   &Apache::response::setup_params($$tagstack[-1]);
  my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);   my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
Line 430  sub format_number { Line 441  sub format_number {
 }  }
   
 sub make_numerical_bubbles {  sub make_numerical_bubbles {
     my ($number_of_bubbles,$target,$answer,$format) =@_;      my ($number_of_bubbles,$target,$answer,$format,$incorrect) =@_;
     my @bubble_values = ();      my @bubble_values = ();
       &Apache::lonxml::debug("incorrect is $incorrect");
       if (defined($incorrect) && ref($incorrect)) {
    &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1 gt $number_of_bubbles));
    if (scalar(@$incorrect)+1 >= $number_of_bubbles) {
       &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1).":$number_of_bubbles");
       &Apache::response::setrandomnumber();
       my @rand_inc=&Math::Random::random_permutation(@$incorrect);
       @bubble_values=@rand_inc[0..($number_of_bubbles-2)];
       @bubble_values=sort {$a <=> $b} (@bubble_values,$answer);
       &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values));
       return @bubble_values;
    }
    #FIXME what to do when not enough incorrects specified?
       }
     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
     my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers      my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers
     &Apache::response::setrandomnumber();      &Apache::response::setrandomnumber();
Removed from v.1.114  
changed lines
  Added in v.1.117

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