[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.174 and 1.191

version 1.174, 2005/07/11 18:35:23 version 1.191, 2006/06/19 13:59:21
Line 29 Line 29
 package Apache::caparesponse;  package Apache::caparesponse;
 use strict;  use strict;
 use capa;  use capa;
   use Safe::Hole;
   use Apache::lonmaxima();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));      &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse','mathresponse'));
   }
   
   my %answer;
   my $cur_name;
   sub start_answer {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       $cur_name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
       if ($cur_name =~ /^\s*$/) { $cur_name = $Apache::lonxml::curdepth; }
       my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
       if (!defined($type) && $tagstack->[-2] eq 'answergroup') {
    $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
       }
       if (!defined($type)) { $type = 'ordered' };
       $answer{$cur_name}= { 'type' => $type,
     'answers' => [] };
       return $result;
   }
   
   sub end_answer {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       undef($cur_name);
       return $result;
   }
   
   sub start_answergroup {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       my $id = $Apache::inputtags::response[-1];
       my $dis = &Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval);
       if (defined($dis)) { $Apache::inputtags::answertxt{$id}=$dis; }
       return $result;
   }
   
   sub end_answergroup {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       return $result;
   }
   
   sub start_value {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ( $target eq 'web' || $target eq 'tex' ||
    $target eq 'grade' || $target eq 'webgrade' ||
    $target eq 'answer' || $target eq 'analyze' ) {
    my $bodytext = &Apache::lonxml::get_all_text("/value",$parser,$style);
    $bodytext = &Apache::run::evaluate($bodytext,$safeeval,
      $$parstack[-1]);
    push(@{ $answer{$cur_name}{'answers'} },$bodytext);
       }
       return $result;
   }
   
   sub end_value {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       return $result;
   }
   
   sub start_array {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ( $target eq 'web' || $target eq 'tex' ||
    $target eq 'grade' || $target eq 'webgrade' ||
    $target eq 'answer' || $target eq 'analyze' ) {
    my $bodytext = &Apache::lonxml::get_all_text("/array",$parser,$style);
    my @values = &Apache::run::evaluate($bodytext,$safeeval,
       $$parstack[-1]);
    push(@{ $answer{$cur_name}{'answers'} },@values);
       }
       return $result;
   }
   
   sub end_array {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       return $result;
   }
   
   sub start_unit {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       return $result;
   }
   
   sub end_unit {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       return $result;
 }  }
   
 sub start_numericalresponse {  sub start_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       &Apache::lonxml::register('Apache::caparesponse',('answer','answergroup','value','array','unit'));
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
     my $result;      my $result;
     undef %{$safeeval->varglob('LONCAPA::CAPAresponse_args')};      undef(%answer);
       undef(%{$safeeval->varglob('LONCAPA::CAPAresponse_args')});
     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);
Line 98  sub start_numericalresponse { Line 193  sub start_numericalresponse {
     $safeeval);      $safeeval);
     for (my $i=0; $i <= $#answers; $i++) {      for (my $i=0; $i <= $#answers; $i++) {
  my $answer=$answers[$i];   my $answer=$answers[$i];
  my $format;   if ( scalar(@$tagstack)
  if ($#formats > 0) {       && $tagstack->[-1] ne 'numericalresponse') {
     $format=$formats[$i];      $answertxt.=$answer.',';
  } else {   } else {
     $format=$formats[0];      my $format;
       if ($#formats > 0) {
    $format=$formats[$i];
       } else {
    $format=$formats[0];
       }
       if ($unit=~/\$/) { $format="\$".$format; $unit=~s/\$//g; }
       if ($unit=~/\,/) { $format="\,".$format; $unit=~s/\,//g; }
       my $formatted=&format_number($answer,$format,$target,
    $safeeval);
       $answertxt.=$formatted.',';
  }   }
  if ($unit=~/\$/) { $format="\$".$format; $unit=~s/\$//g; }  
  if ($unit=~/\,/) { $format="\,".$format; $unit=~s/\,//g; }  
  my $formatted=&format_number($answer,$format,$target,  
      $safeeval);  
  $answertxt.=$formatted.',';  
     }      }
     chop $answertxt;      chop $answertxt;
     if ($target eq 'web') {      if ($target eq 'web') {
Line 149  sub check_submission { Line 249  sub check_submission {
     }      }
           
     if ($tag eq 'formularesponse') {      if ($tag eq 'formularesponse') {
  $$args_ref{'type'}='fml';   if ($$args_ref{'samples'}) {
       $$args_ref{'type'}='fml';
    } else {
       $$args_ref{'type'}='math';
    }
     } elsif ($tag eq 'numericalresponse') {      } elsif ($tag eq 'numericalresponse') {
  $$args_ref{'type'}='float';   $$args_ref{'type'}='float';
     }      }
     my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);      my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
     &Apache::lonxml::debug('answer is'.join(':',@answer));      &Apache::lonxml::debug('answer is'.join(':',@answer));
     @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;      if (@answer && defined($answer[0])) {
        $answer{'INTERNAL'}= {'type' => 'ordered',
     my ($result,@msgs) =         'answers' => \@answer };
  &Apache::run::run("&caparesponse_check_list()",$safeeval);      }
     &Apache::lonxml::debug('msgs are'.join(':',@msgs));      #FIXME would be nice if we could save name so we know who graded him
     my ($awards)=split(/:/,$result);      #correct
     my @awards= split(/,/,$awards);      my (%results,@final_awards,@final_msgs,@names);
     return(\@awards,\@msgs);      foreach my $name (keys(%answer)) {
    &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} }));
    @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@{ $answer{$name}{'answers'} };
    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);
    my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
    $results{$name}= [$ad,$msg];
    push(@final_awards,$ad);
    push(@final_msgs,$msg);
    push(@names,$name);
       }
       my ($ad, $msg, $name) = &Apache::inputtags::finalizeawards(\@final_awards,
          \@final_msgs,
          \@names,1);
       return($ad,$msg);
 }  }
   
 sub end_numericalresponse {  sub end_numericalresponse {
Line 175  sub end_numericalresponse { Line 296  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;
       my $safehole = new Safe::Hole;
     $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);      $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
       $safehole->wrap(\&Apache::lonmaxima::maxima_check,$safeeval,'&maxima_check');
   
     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);
  if ($Apache::lonhomework::type eq 'exam' &&    if ($Apache::lonhomework::type eq 'exam' && 
     $tag eq 'formularesponse') {      (($tag eq 'formularesponse') || ($tag eq 'mathresponse'))) {
     $increment=&Apache::response::scored_response($partid,$id);      $increment=&Apache::response::scored_response($partid,$id);
  } else {   } else {
     my $response = &Apache::response::getresponse();      my $response = &Apache::response::getresponse();
     if ( $response =~ /[^\s]/) {      if ( $response =~ /[^\s]/) {
  my $ad;  
  my %previous = &Apache::response::check_for_previous($response,$partid,$id);   my %previous = &Apache::response::check_for_previous($response,$partid,$id);
  &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 ( &Apache::response::submitted('scantron')) {   if ( &Apache::response::submitted('scantron')) {
     my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');      my ($values,$display)=&make_numerical_bubbles($partid,$id,
     if (!$number_of_bubbles) { $number_of_bubbles=8; }    $target,$parstack,$safeeval);
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);  
     my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);  
     my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);  
     if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }  
     my ($values,$display)=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect,$safeeval);  
     $response=$values->[$response];      $response=$values->[$response];
  }   }
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  my ($awards,$msgs)=&check_submission($response,$partid,$id,   my ($ad,$msg)=&check_submission($response,$partid,$id,
      $tag,$parstack,$safeeval);   $tag,$parstack,$safeeval);
   
  ($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 231  sub end_numericalresponse { Line 348  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 $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');      my ($bubble_values,$bubble_display)=
     if ($Apache::inputtags::params{'numbubbles'}) {   &make_numerical_bubbles($partid,$id,$target,$parstack,
  $number_of_bubbles = $Apache::inputtags::params{'numbubbles'};   $safeeval);
     }      my $number_of_bubbles = scalar(@{ $bubble_values });
     if (!$number_of_bubbles) { $number_of_bubbles=8; }  
       
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,  
  $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);  
     if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }  
     my ($bubble_values,$bubble_display)=  
  &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 264  sub end_numericalresponse { Line 371  sub end_numericalresponse {
     $bubble_display->[$ind].'</td>';      $bubble_display->[$ind].'</td>';
     }      }
     $result.='</tr></table>';      $result.='</tr></table>';
  } elsif ($tag eq 'formularesponse') {  
     $result.= '<br /><br /><font color="red">  
                            <textarea name="HWVAL_'.$id.'" rows="4" cols="50">  
                            </textarea></font> <br /><br />';  
  }   }
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {   if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {
Line 295  sub end_numericalresponse { Line 398  sub end_numericalresponse {
     }      }
     $result.='\end{enumerate}';      $result.='\end{enumerate}';
  } else {   } else {
     $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';      $increment = &Apache::response::repetition();
     my $repetition = &Apache::response::repetition();  
     $result.='\begin{enumerate}';  
     for (my $i=0;$i<$repetition;$i++) {  
  $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).'}.]\textit{Leave blank on scoring form}\vskip 0 mm';  
     }  
     $increment=$repetition;  
     $result.= '\end{enumerate}';  
  }   }
     }      }
  }   }
Line 329  sub end_numericalresponse { Line 425  sub end_numericalresponse {
   
  if ($target eq 'answer') {   if ($target eq 'answer') {
     $result.=&Apache::response::answer_header($tag);      $result.=&Apache::response::answer_header($tag);
       if ($tag eq 'numericalresponse'
    && $Apache::lonhomework::type eq 'exam') {
    my ($bubble_values,undef,$correct) = &make_numerical_bubbles($partid,
        $id,$target,$parstack,$safeeval);
    $result.=&Apache::response::answer_part($tag,$correct);
       }
  }   }
    my ($sigline,$tolline);
  for(my $i=0;$i<=$#answers;$i++) {   for(my $i=0;$i<=$#answers;$i++) {
     my $ans=$answers[$i];      my $ans=$answers[$i];
     my $fmt=$formats[0];      my $fmt=$formats[0];
Line 352  sub end_numericalresponse { Line 455  sub end_numericalresponse {
  #    $low =&format_number($low,$fmt,$target,$safeeval);   #    $low =&format_number($low,$fmt,$target,$safeeval);
  #}   #}
     }      }
     my $response=$ans;  
     my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.  
       $id.'.turnoffunit');  
     if ($unit ne ''  &&   
  ! ($Apache::lonhomework::type eq 'exam' ||  
    lc($hideunit) eq "yes") )  {  
  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.']';
       $tolline .= "[$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>";
    $sigline .= "[$siglow, $sighigh]";
     }      }
  }   }
  $result.=&Apache::response::answer_part($tag,$ans);   $result.=&Apache::response::answer_part($tag,$ans);
Line 382  sub end_numericalresponse { Line 479  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);   my @fmt_ans;
     if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {   for(my $i=0;$i<=$#answers;$i++) {
       my $ans=$answers[$i];
       my $fmt=$formats[0];
       if (@formats && $#formats) {$fmt=$formats[$i];}
       if ($fmt && $tag eq 'numericalresponse') {
    $fmt=~s/e/E/g;
    if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; }
    if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; }
    $ans = &format_number($ans,$fmt,$target,$safeeval);
    if ($fmt=~/\$/ && $unit!~/\$/) { $ans=~s/\$//; }
       }
       push(@fmt_ans,$ans);
    }
    my $response=join(', ',@fmt_ans);
    my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.
     $id.'.turnoffunit');
    if ($unit ne ''  && 
       ! ($Apache::lonhomework::type eq 'exam' ||
          lc($hideunit) eq "yes") )  {
       my $cleanunit=$unit;
       $cleanunit=~s/\$\,//g;
       $response.=" $cleanunit";
    }
   
    my ($ad,$msg)=&check_submission($response,$partid,$id,$tag,
    $parstack,$safeeval);
    if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
       my $error;
       if ($tag eq 'formularesponse') {
    $error=&mt('Computer\'s answer is incorrect ("[_1]").',$response);
       } else {
  # answer failed check if it is sig figs that is failing   # answer failed check if it is sig figs that is failing
  my ($awards,$msgs)=&check_submission($response,$partid,$id,   my ($ad,$msg)=&check_submission($response,$partid,$id,
      $tag,$parstack,$safeeval,   $tag,$parstack,
      1);   $safeeval,1);
  my ($ad,$msg)=&Apache::inputtags::finalizeawards($awards,   if ($sigline ne '') {
  $msgs);      $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] or significant figures [_3] need to be adjusted.',$response,$tolline,$sigline);
   
  my $error;  
  if ($siglow ne '' && $sighigh ne '') {  
     $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range ("[_2]" to "[_3]") or significant figures ("[_4]" to "[_5]") need to be adjusted.',$response,$low,$high,$siglow,$sighigh);  
  } else {  
     $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range ("[_2]" to "[_3]") needs to be adjusted.',$response,$low,$high);  
  }  
  if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {  
     &Apache::lonxml::error($error);  
  } else {   } else {
     &Apache::lonxml::warning($error);      $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] needs to be adjusted.',$response,$tolline);
  }   }
     }      }
       if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
    &Apache::lonxml::error($error);
       } else {
    &Apache::lonxml::warning($error);
       }
  }   }
   
  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') {
Line 483  sub format_number { Line 607  sub format_number {
     my $ans;      my $ans;
     if ($format eq '') {      if ($format eq '') {
  #What is the number? (integer,decimal,floating point)   #What is the number? (integer,decimal,floating point)
  if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) {   if ($number=~/^(\d*\.?\d*)(E|e)[+\-]?(\d*)$/) {
     $format = '3e';      $format = '3e';
  } elsif ($number=~/^(\d*)\.(\d*)$/) {   } elsif ($number=~/^(\d*)\.(\d*)$/) {
     $format = '4f';      $format = '4f';
Line 499  sub format_number { Line 623  sub format_number {
 }  }
   
 sub make_numerical_bubbles {  sub make_numerical_bubbles {
     my ($number_of_bubbles,$target,$answer,$format,$incorrect,$safeeval) =@_;      my ($part,$id,$target,$parstack,$safeeval) =@_;
       
       my $number_of_bubbles = 
    &Apache::response::get_response_param($part.'_'.$id,'numbubbles',8);
   
       my ($format)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
       my ($answer)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
       my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,
      $safeeval);
       if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
       
     my @bubble_values=();      my @bubble_values=();
     &Apache::lonxml::debug("answer is $answer incorrect is $incorrect");      my @alphabet=('A'..'Z');
   
       &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 (@incorrect) {
  &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1 gt $number_of_bubbles));   &Apache::lonxml::debug("inside ".(scalar(@incorrect)+1 gt $number_of_bubbles));
  if (defined($$incorrect[0]) &&   if (defined($incorrect[0]) &&
     scalar(@$incorrect)+1 >= $number_of_bubbles) {      scalar(@incorrect)+1 >= $number_of_bubbles) {
     &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1).":$number_of_bubbles");      &Apache::lonxml::debug("inside ".(scalar(@incorrect)+1).":$number_of_bubbles");
     &Apache::response::setrandomnumber();      &Apache::response::setrandomnumber();
     my @rand_inc=&Math::Random::random_permutation(@$incorrect);      my @rand_inc=&Math::Random::random_permutation(@incorrect);
     @bubble_values=@rand_inc[0..($number_of_bubbles-2)];      @bubble_values=@rand_inc[0..($number_of_bubbles-2)];
     @bubble_values=sort {$a <=> $b} (@bubble_values,$answer);      @bubble_values=sort {$a <=> $b} (@bubble_values,$answer);
     &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values));      &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": which are :".join(':',@bubble_values));
     &Math::Random::random_set_seed(@oldseed);      &Math::Random::random_set_seed(@oldseed);
   
       my $correct;
       for(my $i=0; $i<=$#bubble_values;$i++) {
    if ($bubble_values[$i] eq $answer) {
       $correct = $alphabet[$i];
       last;
    }
       }
   
     if (defined($format) && $format ne '') {      if (defined($format) && $format ne '') {
  my @bubble_display;   my @bubble_display;
  foreach my $value (@bubble_values) {   foreach my $value (@bubble_values) {
     push(@bubble_display,      push(@bubble_display,
  &format_number($value,$format,$target,$safeeval));   &format_number($value,$format,$target,$safeeval));
  }   }
  return (\@bubble_values,\@bubble_display);   return (\@bubble_values,\@bubble_display,$correct);
     } else {      } else {
  return (\@bubble_values,\@bubble_values);   return (\@bubble_values,\@bubble_values,$correct);
     }      }
  }   }
  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 (".join(',',@$incorrect).").");      &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 544  sub make_numerical_bubbles { Line 689  sub make_numerical_bubbles {
        $format,$target,$safeeval);         $format,$target,$safeeval);
   
     }      }
       my $correct = $alphabet[$number_of_bubbles-$power];
     &Math::Random::random_set_seed(@oldseed);      &Math::Random::random_set_seed(@oldseed);
     return (\@bubble_values,\@bubble_display);      return (\@bubble_values,\@bubble_display,$correct);
 }  }
   
 sub get_tolrange {  sub get_tolrange {
Line 639  sub start_stringresponse { Line 785  sub start_stringresponse {
   
 sub end_stringresponse {  sub end_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $increment=1;  
     my $result = '';      my $result = '';
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $id=$Apache::inputtags::response[-1];      my $id=$Apache::inputtags::response[-1];
Line 655  sub end_stringresponse { Line 801  sub end_stringresponse {
  $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' ||
     &Apache::response::submitted('scantron')) {      &Apache::response::submitted('scantron')) {
     $increment=&Apache::response::scored_response($part,$id);      &Apache::response::scored_response($part,$id);
   
  } else {   } else {
     my $response = &Apache::response::getresponse();      my $response = &Apache::response::getresponse();
     if ( $response =~ /[^\s]/) {      if ( $response =~ /[^\s]/) {
Line 674  sub end_stringresponse { Line 821  sub end_stringresponse {
 # $answer=$token->[2]->{'answer'};  # $answer=$token->[2]->{'answer'};
 #    }  #    }
     ${$safeeval->varglob('LONCAPA::response')}=$response;      ${$safeeval->varglob('LONCAPA::response')}=$response;
     $result = &Apache::run::run('return $LONCAPA::response=~m'.$answer,$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';
Line 708  sub end_stringresponse { Line 855  sub end_stringresponse {
  $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;   $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;
     }      }
  }   }
     } elsif ($target eq 'web' || $target eq 'tex') {  
  my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};  
  my $status = $Apache::inputtags::status['-1'];  
  if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {  
     $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';  
     $increment = &Apache::response::repetition();  
     $result.='\begin{enumerate}';  
     for (my $i=0;$i<$increment;$i++) {  
  $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).  
     '}.]\textit{Leave blank on scoring form}\vskip 0 mm';  
     }  
     $result.= '\end{enumerate}';  
  }  
     } elsif ($target eq 'answer' || $target eq 'analyze') {      } elsif ($target eq 'answer' || $target eq 'analyze') {
  if ($target eq 'analyze') {   if ($target eq 'analyze') {
     push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");      push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");
Line 735  sub end_stringresponse { Line 869  sub end_stringresponse {
 # foreach my $ans (@answers) {  # foreach my $ans (@answers) {
     if ($target eq 'answer') {      if ($target eq 'answer') {
  $result.=&Apache::response::answer_part('stringresponse',$answer);   $result.=&Apache::response::answer_part('stringresponse',$answer);
    if ($type eq 're') {
       $result.=&Apache::response::answer_part('stringresponse',
       $answerdisplay);
    }
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  push (@{ $Apache::lonhomework::analyze{"$part.$id.answer"} },   push (@{ $Apache::lonhomework::analyze{"$part.$id.answer"} },
       $answer);        $answer);
Line 770  sub end_stringresponse { Line 908  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($increment);   &Apache::lonxml::increment_counter(&Apache::response::repetition());
     }      }
     &Apache::response::end_response;      &Apache::response::end_response;
     return $result;      return $result;
Line 793  sub end_formularesponse { Line 931  sub end_formularesponse {
     return end_numericalresponse(@_);      return end_numericalresponse(@_);
 }  }
   
   sub start_mathresponse {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ($target eq 'meta') {
           &Apache::response::start_response($parstack,$safeeval);
           $result=&Apache::response::meta_package_write('mathresponse');
           &Apache::response::end_response();
       } else {
   #       $result.=&start_numericalresponse(@_);
       }
       return $result;
   }
   
   sub end_mathresponse {
   #    return end_numericalresponse(@_);
   }
   
 1;  1;
 __END__  __END__
   
Removed from v.1.174  
changed lines
  Added in v.1.191

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