[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.211 and 1.226

version 1.211, 2007/04/16 23:25:12 version 1.226, 2008/06/10 15:22:39
Line 310  sub start_numericalresponse { Line 310  sub start_numericalresponse {
     $safeeval);      $safeeval);
     if ($unit =~ /\S/) { $result.=" (in $unit) "; }      if ($unit =~ /\S/) { $result.=" (in $unit) "; }
  }   }
           if (($token->[1] eq 'formularesponse') && 
               ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&
               (!&Apache::lonxml::get_param_var('samples',$parstack,$safeeval))) {
               $result.=&edit_formula_button($id,"HWVAL_$id");
           }
  if (  &Apache::response::show_answer() ) {   if (  &Apache::response::show_answer() ) {
     &set_answertext($tag_internal_answer_name,$target,$token,$tagstack,      &set_answertext($tag_internal_answer_name,$target,$token,$tagstack,
     $parstack,$parser,$safeeval,-1);      $parstack,$parser,$safeeval,-1);
Line 318  sub start_numericalresponse { Line 323  sub start_numericalresponse {
     return $result;      return $result;
 }  }
   
   sub edit_formula_button {
       my ($id,$field)=@_;
       my $button=&mt('Edit Answer');
       my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor');
       return(<<ENDFORMULABUTTON);
   <script language="JavaScript">
   function edit_${id}_${field} (textarea) {
       thenumber = textarea;
       thedata = document.forms['lonhomework'].elements[textarea].value;
       newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable");
   }
   </script>
   <input type='button' value='$button' onclick="javascript:edit_${id}_${field}('${field}');void(0);" />$helplink
   ENDFORMULABUTTON
   }
   
 sub set_answertext {  sub set_answertext {
     my ($name,$target,$token,$tagstack,$parstack,$parser,$safeeval,      my ($name,$target,$token,$tagstack,$parstack,$parser,$safeeval,
  $response_level) = @_;   $response_level) = @_;
Line 392  sub setup_capa_args { Line 413  sub setup_capa_args {
 sub setup_capa_response {  sub setup_capa_response {
     my ($args_ref,$response) = @_;         my ($args_ref,$response) = @_;   
   
     use Data::Dumper;  
     &Apache::lonxml::debug("response dump is ".&Dumper($response));  
       
     if (ref($response)) {      if (ref($response)) {
  $$args_ref{'response'}=dclone($response);   $$args_ref{'response'}=dclone($response);
     } else {      } else {
Line 434  sub check_submission { Line 452  sub check_submission {
           
     &add_in_tag_answer($parstack,$safeeval);      &add_in_tag_answer($parstack,$safeeval);
   
       if (!%answer) {
    &Apache::lonxml::error("No answers are defined");
       }
   
     my (@final_awards,@final_msgs,@names);      my (@final_awards,@final_msgs,@names);
     foreach my $name (keys(%answer)) {      foreach my $name (keys(%answer)) {
  &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} }));   &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} }));
Line 465  sub add_in_tag_answer { Line 487  sub add_in_tag_answer {
     my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval,      my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval,
       $response_level);        $response_level);
     &Apache::lonxml::debug('answer is'.join(':',@answer));      &Apache::lonxml::debug('answer is'.join(':',@answer));
     if (@answer && defined($answer[0])) {      if (@answer && $answer[0] =~ /\S/) {
  $answer{$tag_internal_answer_name}= {'type' => 'ordered',   $answer{$tag_internal_answer_name}= {'type' => 'ordered',
      'answers' => [\@answer] };       'answers' => [\@answer] };
     }      }
Line 601  sub end_numericalresponse { Line 623  sub end_numericalresponse {
  }   }
     }      }
  }   }
  &setup_prior_tries_hash();   &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;
     } elsif ($target eq 'answer' || $target eq 'analyze') {      } elsif ($target eq 'answer' || $target eq 'analyze') {
Line 677  sub end_numericalresponse { Line 699  sub end_numericalresponse {
     #}      #}
  }   }
  if ($high && $tag eq 'numericalresponse') {   if ($high && $tag eq 'numericalresponse') {
     $element.=' ['.$low.','.$high.']';      $element.='; ['.$low.'; '.$high.']';
     $tolline .= "[$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') {
  $element.= " Sig $siglow - $sighigh";   $element.= "; Sig $siglow - $sighigh";
     } else {      } else {
  $element.= " Sig <i>$siglow - $sighigh</i>";   $element.= " Sig <i>$siglow - $sighigh</i>";
  $sigline .= "[$siglow, $sighigh]";   $sigline .= "[$siglow, $sighigh]";
Line 702  sub end_numericalresponse { Line 724  sub end_numericalresponse {
     }      }
  }   }
  if ($target eq 'answer') {   if ($target eq 'answer') {
     $result.= &Apache::response::answer_part($tag,join(', ',@all_answer_info));      $result.= &Apache::response::answer_part($tag,join('; ',@all_answer_info));
  }   }
     }      }
   
Line 786  sub end_numericalresponse { Line 808  sub end_numericalresponse {
     }      }
     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);          if (($tag eq 'formularesponse') && ($target eq 'analyze')) {
               my $type = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.type');
               if ($type eq 'exam') {
                   $increment = &Apache::response::repetition();
               }
           }
    &Apache::lonxml::increment_counter($increment,"$partid.$id");
    if ($target eq 'analyze') {
       &Apache::lonhomework::set_bubble_lines();
    }
     }      }
     &Apache::response::end_response();      &Apache::response::end_response();
     return $result;      return $result;
 }  }
   
 sub setup_prior_tries_hash {  sub format_prior_response_numerical {
     #FIXME support multi answer numericals/formula      my ($mode,$answer) = @_;
     my $part=$Apache::inputtags::part;      if (ref($answer)) {
     my $id=$Apache::inputtags::response[-1];   my $result = '<table class="LC_prior_numerical"><tr>';
     foreach my $i (1..$Apache::lonhomework::history{'version'}) {   foreach my $element (@{ $answer }) {
  my $key = "$i:resource.$part.$id.submission";      $result.= '<td><span class="LC_prior_numerical">'.
  next if (!exists($Apache::lonhomework::history{"$key"}));   &HTML::Entities::encode($element,'"<>&').'</span></td>';
  $Apache::inputtags::submission_display{$key} =   }
     '<span class="LC_prior_numerical">'.   $result.='</tr></table>';
     &HTML::Entities::encode($Apache::lonhomework::history{$key},   return $result;
     '"<>&').'</span>';  
     }      }
       return '<span class="LC_prior_numerical">'.
       &HTML::Entities::encode($answer,'"<>&').'</span>';
   
 }  }
   
 sub check_for_answer_errors {  sub check_for_answer_errors {
Line 822  sub check_for_answer_errors { Line 855  sub check_for_answer_errors {
  } (sort(keys(%counts))));   } (sort(keys(%counts))));
  &Apache::lonxml::error(&mt("All answers must have the same number of components. Varying numbers of answers were seen. ").$counts);   &Apache::lonxml::error(&mt("All answers must have the same number of components. Varying numbers of answers were seen. ").$counts);
     }      }
     use Data::Dumper;  
     &Apache::lonxml::debug("count dump is ".&Dumper(\%counts));  
     my $expected_number_of_inputs = (keys(%counts))[0];      my $expected_number_of_inputs = (keys(%counts))[0];
     if ( $expected_number_of_inputs != scalar(@Apache::inputtags::inputlist)) {      if ( $expected_number_of_inputs > 0 
    && $expected_number_of_inputs != scalar(@Apache::inputtags::inputlist)) {
  &Apache::lonxml::error(&mt("Expected [_1] input fields, but there were only [_2] seen.",    &Apache::lonxml::error(&mt("Expected [_1] input fields, but there were only [_2] seen.", 
    $expected_number_of_inputs,     $expected_number_of_inputs,
    scalar(@Apache::inputtags::inputlist)));     scalar(@Apache::inputtags::inputlist)));
Line 861  sub get_table_sizes { Line 893  sub get_table_sizes {
     my $bubbles_per_line=int($textwidth/$cell_width);      my $bubbles_per_line=int($textwidth/$cell_width);
     if ($bubbles_per_line > $number_of_bubbles) {      if ($bubbles_per_line > $number_of_bubbles) {
  $bubbles_per_line=$number_of_bubbles;   $bubbles_per_line=$number_of_bubbles;
     }elsif (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==0)) {$bubbles_per_line=$number_of_bubbles/2;}      } elsif (($bubbles_per_line > $number_of_bubbles/2) 
        && ($number_of_bubbles % 2==0)) {
    $bubbles_per_line=$number_of_bubbles/2;
       }
       if ($bubbles_per_line < 1) {
    $bubbles_per_line=1;
       }
     my $number_of_tables = int($number_of_bubbles/$bubbles_per_line);      my $number_of_tables = int($number_of_bubbles/$bubbles_per_line);
     my @table_range = ();      my @table_range = ();
     for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}      for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}
Line 896  sub format_number { Line 934  sub format_number {
   
 sub make_numerical_bubbles {  sub make_numerical_bubbles {
     my ($part,$id,$target,$parstack,$safeeval) =@_;      my ($part,$id,$target,$parstack,$safeeval) =@_;
   
       if (!%answer) {
    &Apache::lonxml::error(&mt("No answers defined for response [_1] in part [_2] to make bubbles for.",$id,$part));
    return ([],[],undef);
       }
           
     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);
Line 966  sub make_numerical_bubbles { Line 1009  sub make_numerical_bubbles {
     $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;      my @bubble_display;
       my $answerfactor=$answer;
       if ($answer==0) { 
          $answerfactor=&Math::Random::random_uniform_integer(1,1,100)/
                        &Math::Random::random_uniform_integer(1,1,10);
       }
     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] = $answerfactor*($factor**($power-$powers[$#powers-$ind]));
  $bubble_display[$ind] = &format_number($bubble_values[$ind],   $bubble_display[$ind] = &format_number($bubble_values[$ind],
        $format,$target,$safeeval);         $format,$target,$safeeval);
   
     }      }
     my $correct = $alphabet[$number_of_bubbles-$power];      my $correct = $alphabet[$number_of_bubbles-$power];
       if ($answer==0) {
          $correct='A';
          $bubble_values[0]=0;
          $bubble_display[0] = &format_number($bubble_values[0],
                                              $format,$target,$safeeval);
       }
     &Math::Random::random_set_seed(@oldseed);      &Math::Random::random_set_seed(@oldseed);
     return (\@bubble_values,\@bubble_display,$correct);      return (\@bubble_values,\@bubble_display,$correct);
 }  }
Line 996  sub get_sigrange { Line 1049  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 ($env{'request.state'} ne 'construct'
    && lc($env{"course.$courseid.disablesigfigs"}) eq 'yes') {
  return (15,0);   return (15,0);
     }      }
     my $sig_lbound;      my $sig_lbound;
Line 1025  sub get_sigrange { Line 1079  sub get_sigrange {
     return ($sig_ubound,$sig_lbound);      return ($sig_ubound,$sig_lbound);
 }  }
   
 sub setup_prior_tries_hash_string {  sub format_prior_response_string {
     my $part=$Apache::inputtags::part;      my ($mode,$answer) =@_;
     my $id=$Apache::inputtags::response[-1];      return '<span class="LC_prior_string">'.
     foreach my $i (1..$Apache::lonhomework::history{'version'}) {      &HTML::Entities::encode($answer,'"<>&').'</span>';
  my $key = "$i:resource.$part.$id.submission";  
  next if (!exists($Apache::lonhomework::history{"$key"}));  
  $Apache::inputtags::submission_display{$key} =  
     '<span class="LC_prior_string">'.  
     &HTML::Entities::encode($Apache::lonhomework::history{$key},  
     '"<>&').'</span>';  
     }  
 }  }
   
 sub start_stringresponse {  sub start_stringresponse {
Line 1216  sub end_stringresponse { Line 1263  sub end_stringresponse {
     } 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 'web' || $target eq 'tex') {      } elsif ($target eq 'web' || $target eq 'tex') {
  &setup_prior_tries_hash_string();   &Apache::response::setup_prior_tries_hash(\&format_prior_response_string);
     }      }
     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());   &Apache::lonxml::increment_counter(&Apache::response::repetition(),
      "$part.$id");
    if ($target eq 'analyze') {
       &Apache::lonhomework::set_bubble_lines();
    }
     }      }
     &Apache::response::end_response;      &Apache::response::end_response;
     return $result;      return $result;
Removed from v.1.211  
changed lines
  Added in v.1.226

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