Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.72 and 1.115

version 1.72, 2002/11/13 23:37:56 version 1.115, 2003/10/14 22:53:22
Line 31  use strict; Line 31  use strict;
 use capa;  use capa;
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));      &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
 }  
   
 sub start_caparesponse {  
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;  
   my $id = &Apache::response::start_response($parstack,$safeeval);  
   return '';  
 }  
   
 sub end_caparesponse {  
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;  
   my $result = '';  
   if ( $target eq 'grade' ) {  
     if ( defined $ENV{'form.submitted'}) {  
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);  
       my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};  
       if ( $response =~ /[^\s]/) {  
  my $id = $Apache::inputtags::response['-1'];  
  my $previous= &Apache::response::check_for_previous($response,$id,$response);  
  if ( $previous ) {   
   $result = 'PREVIOUSLY_USED';  
  } else {  
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;  
   &Apache::lonxml::debug("submitted a $response<br>\n");  
   &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");  
   my $expression="&caparesponse_check('".$response."','".  
     $$parstack[$#$parstack].  
       ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.  
  ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.  
   "');";  
   $result = &Apache::run::run($expression,$safeeval);  
   my ($ad) = split /:/ , $result;  
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;  
   &Apache::lonxml::debug("$expression");  
   &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");  
  }  
       }  
     }  
   } elsif ($target eq 'web') {  
     #$result .= "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";  
   }  
   #Apache::lonxml::debug("\n<br>\nreal end caparesponse<br>\n");  
   &Apache::response::end_response;  
   return '';  
 }  }
   
 sub start_numericalresponse {  sub start_numericalresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
   my $result;      my $result;
   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);
     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).
       $result.=&Apache::edit::text_arg('Format:','format',$token,4);   &Apache::loncommon::help_open_topic('Physical_Units');
     } elsif ($token->[1] eq 'stringresponse') {      $result.=&Apache::edit::text_arg('Format:','format',$token,4).
       $result.=&Apache::edit::select_arg('Type:','type',   &Apache::loncommon::help_open_topic('Numerical_Response_Format');
  [['cs','Case Sensitive'],['ci','Case Insensitive'],   } elsif ($token->[1] eq 'stringresponse') {
   ['mc','Case Insensitive, Any Order']],$token);      $result.=&Apache::edit::select_arg('Type:','type',
     } elsif ($token->[1] eq 'formularesponse') {   [['cs','Case Sensitive'],['ci','Case Insensitive'],
       $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);    ['mc','Case Insensitive, Any Order']],$token);
     }   } elsif ($token->[1] eq 'formularesponse') {
     $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();      $result.=&Apache::edit::text_arg('Sample Points:','samples',
   } elsif ($target eq 'modified') {       $token,40).
     my $constructtag;        &Apache::loncommon::help_open_topic('Formula_Response_Sampling');
     if ($token->[1] eq 'numericalresponse') {   }
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,   $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
  'answer','unit','format');      } elsif ($target eq 'modified') {
     } elsif ($token->[1] eq 'stringresponse') {   my $constructtag;
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,   if ($token->[1] eq 'numericalresponse') {
  'answer','type');      $constructtag=&Apache::edit::get_new_args($token,$parstack,
     } elsif ($token->[1] eq 'formularesponse') {        $safeeval,'answer',
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,        'unit','format');
  'answer','samples');   } elsif ($token->[1] eq 'stringresponse') {
     }      $constructtag=&Apache::edit::get_new_args($token,$parstack,
     if ($constructtag) {        $safeeval,'answer',
       $result = &Apache::edit::rebuild_tag($token);        'type');
       $result.=&Apache::edit::handle_insert();   } elsif ($token->[1] eq 'formularesponse') {
     }      $constructtag=&Apache::edit::get_new_args($token,$parstack,
   } elsif ($target eq 'meta') {        $safeeval,'answer',
     $result=&Apache::response::meta_package_write('numericalresponse');        'samples');
   }   }
   return $result;   if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();
    }
       } elsif ($target eq 'meta') {
    $result=&Apache::response::meta_package_write('numericalresponse');
       } elsif ($target eq 'answer' || $target eq 'grade') {
    &Apache::response::reset_params();
       } elsif ($target eq 'web') {
    my $partid = $Apache::inputtags::part;
    my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
    &Apache::lonxml::debug("Got unit $hideunit for $partid $id");
    #no way to enter units, with radio buttons
    if (lc($hideunit) eq "yes") {
       my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
       $safeeval);
       if ($unit =~ /\S/) { $result.=" (in $unit) "; }
    }
       }
       return $result;
 }  }
   
 sub end_numericalresponse {  sub end_numericalresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';      my $increment=1;
   if ( $target eq 'grade' ) {      my $result = '';
     if ( defined $ENV{'form.submitted'}) {      if (!$Apache::lonxml::default_homework_loaded) {
       &Apache::response::setup_params($$tagstack[-1]);   &Apache::lonxml::default_homework_load($safeeval);
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);      }
       my $partid = $Apache::inputtags::part;      if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
       my $id = $Apache::inputtags::response['-1'];   &Apache::response::setup_params($$tagstack[-1]);
       my $response = $ENV{'form.HWVAL'.$id};   $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
       if ( $response =~ /[^\s]/) {   my $partid = $Apache::inputtags::part;
  if (!$Apache::lonxml::default_homework_loaded) {   my $id = $Apache::inputtags::response['-1'];
     &Apache::lonxml::default_homework_load($safeeval);   if ($Apache::lonhomework::type eq 'exam' && 
  }      ($$tagstack[-1] eq 'formularesponse' ||
  my %previous = &Apache::response::check_for_previous($response,$partid,$id);       $$tagstack[-1] eq 'stringresponse')) {
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;      $increment=&Apache::response::scored_response($partid,$id);
  &Apache::lonxml::debug("submitted a $response<br>\n");   } else {
  &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");      my $response = &Apache::response::getresponse();
  $response =~ s/\\/\\\\/g;      if ( $response =~ /[^\s]/) {
  $response =~ s/\'/\\\'/g;   my $ad;
  &Apache::lonxml::debug("current $response");   my %previous = &Apache::response::check_for_previous($response,$partid,$id);
  my $expression="&caparesponse_check_list('".$response."','".   &Apache::lonxml::debug("submitted a $response<br>\n");
   $$parstack[$#$parstack];   &Apache::lonxml::debug($$parstack[-1] . "\n<br>");
  foreach my $key (keys(%Apache::inputtags::params)) {  
   $expression.= ';my $'. #'   if ($ENV{'form.submitted'} eq 'scantron') {
     $key.'="'.$Apache::inputtags::params{$key}.'"';      my $number_of_bubbles = 8;#default values for number of bubbles
  }      my (@formats)=&Apache::lonxml::get_param_var('format',
  if ($$tagstack[-1] eq 'formularesponse') {   $parstack,$safeeval);
   $expression.=';my $type="fml";';      my (@answers)=&Apache::lonxml::get_param_var('answer',
  } elsif ($$tagstack[-1] eq 'numericalresponse') {   $parstack,$safeeval);
   $expression.=';my $type="float";';      my @values=&make_numerical_bubbles($number_of_bubbles,$target,
  }         $answers[0],$formats[0]);
  $expression.="');";      $response=$values[$response];
  $result = &Apache::run::run($expression,$safeeval);   } else {
  my ($awards) = split /:/ , $result;      $response =~ s/\\/\\\\/g;
  my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);      $response =~ s/\'/\\\'/g;
  &Apache::response::handle_previous(\%previous,$ad);   }
  $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;   $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  &Apache::lonxml::debug("$expression");   &Apache::lonxml::debug("current $response");
  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");   my $expression="&caparesponse_check_list('".$response."','".
  $result='';      $$parstack[-1];
       }   my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
     }   #no way to enter units, with radio buttons
   } elsif ($target eq 'web' || $target eq 'tex') {   if ($Apache::lonhomework::type eq 'exam' ||
       my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};      lc($hideunit) eq "yes") {
       my $status = $Apache::inputtags::status['-1'];      $expression.=';my $unit=undef;';
       if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {   }
    foreach my $key (keys(%Apache::inputtags::params)) {
       $expression.= ';my $'. #'
    $key.'="'.$Apache::inputtags::params{$key}.'"';
    }
    if ($$tagstack[-1] eq 'formularesponse') {
       $expression.=';my $type="fml";';
    } elsif ($$tagstack[-1] eq 'numericalresponse') {
       $expression.=';my $type="float";';
    }
    $expression.="');";
    my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
    &Apache::lonxml::debug('answer is'.join(':',@answer));
    @{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer;
   
    $result = &Apache::run::run($expression,$safeeval);
    my ($awards) = split /:/ , $result;
    ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
    &Apache::lonxml::debug("$expression");
    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
    &Apache::response::handle_previous(\%previous,$ad);
    $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
    $result='';
       }
    }
       } elsif ($target eq 'web' || $target eq 'tex') {
  my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,   my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
      $safeeval);       $safeeval);
  my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,   my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
      $safeeval);   my $status = $Apache::inputtags::status['-1'];
  my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);   if (  &Apache::response::show_answer() ) {
       my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
  if ($target eq 'web') {   $safeeval);
   $result="<br />The correct answer is ";      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
         } elsif ($target eq 'tex') {      $safeeval);
   $result='\vskip 0 mm The correct answer is \\texttt{';      if ($target eq 'web') {
         }   $result="<br />The correct answer is ";
  for (my $i=0; $i <= $#answers; $i++) {      }
    my $answer=$answers[$i];      for (my $i=0; $i <= $#answers; $i++) {
    my $format;   my $answer=$answers[$i];
    if ($#formats > 0) {   my $format;
      $format=$formats[$i];   if ($#formats > 0) {
    } else {      $format=$formats[$i];
      $format=$formats[0];   } else {
    }      $format=$formats[0];
    my $formatted;   }
    if ((defined($format)) && ($format ne '')) {   my $formatted;
      &Apache::lonxml::debug("formatting with :$format: answer :$answer:");   if ((defined($format)) && ($format ne '')) {
      $formatted=sprintf('%.'.$format,$answer).',';      $format=~s/e/E/g;
    } else {      &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
      &Apache::lonxml::debug("no format answer :$answer:");      $formatted=sprintf('%.'.$format,$answer).',';
      $formatted="$answer,";   } else {
    }      &Apache::lonxml::debug("no format answer :$answer:");
    if ($target eq 'tex') {$formatted=&Apache::lonxml::latex_special_symbols($formatted);}      $formatted="$answer,";
      $result.=$formatted;   }
            }   if ($target eq 'tex') {
    chop $result;      $formatted='';
    if ($target eq 'web') {      #$formatted=&Apache::lonxml::latex_special_symbols($formatted);
      $result.=" $unit.<br />";   }
    } elsif ($target eq 'tex') {   $result.=$formatted;
      $result.=&Apache::lonxml::latex_special_symbols($unit);      }
      $result.="}. \\vskip 0 mm ";      chop $result;
    }      if ($target eq 'web') {
        }   $result.=" $unit.<br />";
       if ($Apache::lonhomework::type eq 'exam') {      }
       my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);   }
  my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);   if ($Apache::lonhomework::type eq 'exam') {
  my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);      my $number_of_bubbles = 8; #default values for number of bubbles
  my $number_of_bubbles = 8; #default values for number of bubbles      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
  my @bubbles_values = ();    $safeeval);
  my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
  my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers      $safeeval);
  my $factors_number = 5; #default values for number of factors      my @bubble_values=&make_numerical_bubbles($number_of_bubbles,
  my $powers_number = 8; #default values for number of powers        $target,$answers[0],
  my $symb;        $formats[0]);
  if ($ENV{'form.symb'}=~/___\d+___/) {$symb=$ENV{'form.symb'};} else {$symb=$ENV{'request.symb'};}      my @alphabet=('A'..'Z');
  my $randomseed = srand(&Apache::lonnet::rndseed($symb,$ENV{'request.course.id'},  
                                                               $ENV{'user.domain'},$ENV{'user.name'}));  
  my $ind=1+int(rand()*($factors_number-1));  
  my $factor = $factors[$ind];  
  $ind=1+int(rand()*($powers_number-1));  
  my $power = $powers[$ind];  
  for ($ind=0;$ind<$number_of_bubbles;$ind++) {  
     $bubbles_values[$ind] = $answers[0]*$factor**($power-$powers[$powers_number-$ind-1]);  
  }      
  my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',  
  'Q','R','S','T','U','V','W','X','Y','Z');  
         if ($target eq 'web') {  
     my $id=$Apache::inputtags::response[-1];      my $id=$Apache::inputtags::response[-1];
     $result.= '<table border="1"><tr>';      if ($target eq 'web') {
     for ($ind=0;$ind<$number_of_bubbles;$ind++) {   if ($$tagstack[-1] eq 'numericalresponse') {
  my $ans;      if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}
  if ($formats[0] ne '') {      $result.= '<table border="1"><tr>';
     $ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]);      for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
    $result.='<td><input type="radio" name="HWVAL_'.$id.
       '" value="'.$bubble_values[$ind].'"><b>'.
    $alphabet[$ind].'</b>: '.
       $bubble_values[$ind].'</td>';
       }
       $result.='</tr></table>';
    } elsif ($$tagstack[-1] eq 'formularesponse') {
       $result.= '<br /><br /><font color="red">
                              <textarea name="HWVAL_'.$id.'" rows="4" cols="50">
                              </textarea></font> <br /><br />';
    }
       } elsif ($target eq 'tex') {
    if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {
       $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
    }
    if ($$tagstack[-1] eq 'numericalresponse') {
       my ($celllength,$number_of_tables,@table_range)=
    &get_table_sizes($formats[0],$number_of_bubbles);
       my $j=0;
       my $cou=0;
       $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
       for (my $i=0;$i<$number_of_tables;$i++) {
    $result.='\vskip -1 mm \noindent \begin{tabular}{';
    for (my $ind=0;$ind<$table_range[$j];$ind++) {
       $result.='lp{'.$celllength.' mm}';
    }
    $result.='}';
    for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
       $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$bubble_values[$ind].'} ';
       if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
    }
    $cou += $table_range[$j];
    $j++;
    $result.='\\\\\end{tabular}\vskip 0 mm ';
       }
       $result.='\end{enumerate}';
  } else {   } else {
     my $badans = $bubbles_values[$ind];      $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
     my $format = '';       my $repetition = &Apache::response::repetition();
                     #What is the number? (integer,decimal,floating point)      $result.='\begin{enumerate}';
                     if ($badans=~/^(\d*\.?\d*)(E|e)(\d*)$/) {      for (my $i=0;$i<$repetition;$i++) {
  $format = 'e'.$2;   $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).'}.]\textit{Leave blank on scoring form}\vskip 0 mm';
     } elsif ($badans=~/^(\d*)\.(\d*)$/) {  
  $format = '4f';  
     } elsif ($badans=~/^(\d*)$/) {  
  $format = 'd';  
     }      }
     $ans = sprintf('%.'.$format,$bubbles_values[$ind]);      $increment=$repetition;
       $result.= '\end{enumerate}';
  }   }
     $result.='<td><input type="radio" name="HWVAL'.$id.'" value="'.$ans.'"><b>'.$alphabet[$ind].'</b>: '.$ans.'</td>';  
     }      }
     $result.='</tr></table>';   }
  } elsif ($target eq 'tex') {      } elsif ($target eq 'edit') {
     my $max_val = 0;   $result.='</td></tr>'.&Apache::edit::end_table;
     if ($formats[0]=~m/^(\d+)E([^\d]*)(\d*)$/) {      } elsif ($target eq 'answer' || $target eq 'analyze') {
  $max_val=$1+$2+4;  
     } else {   my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
  $max_val=4;   if ($target eq 'analyze') {
     }      push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
     $max_val = int(0.9*$ENV{'form.textwidth'}/(($max_val+6)*2));      $Apache::lonhomework::analyze{"$part_id.type"} = $$tagstack[-1];
             my $celllength = 0.9*$ENV{'form.textwidth'}/$max_val-10;   }
     my @table_range = ();   &Apache::response::setup_params($$tagstack[-1]);
     my $number_of_tables = int($number_of_bubbles/$max_val);   my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
     for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$max_val;}   my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
     if ($number_of_bubbles % $max_val != 0) {   my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
  $number_of_tables++;   my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
  push @table_range,($number_of_bubbles % $max_val);  
     }   if ($target eq 'answer') {
     my $j=0;      $result.=&Apache::response::answer_header($$tagstack[-1]);
     my $cou=0;   }
     $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';   for(my $i=0;$i<=$#answers;$i++) {
     for (my $i=0;$i<$number_of_tables;$i++) {      my $ans=$answers[$i];
  $result.='\vskip -1 mm \noindent \begin{tabular}{';      my $fmt=$formats[0];
  for ($ind=0;$ind<$table_range[$j];$ind++) {      if (@formats && $#formats) {$fmt=$formats[$i];}
     $result.='lp{'.$celllength.' mm}';      my ($high,$low);
  }      if ($Apache::inputtags::params{'tol'}) {
  $result.='}';   ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});
  for ($ind=$cou;$ind<$cou+$table_range[$j];$ind++) {      }
     my $ans;      my ($sighigh,$siglow);
     if ($formats[0] ne '') {      if ($Apache::inputtags::params{'sig'}) {
  $ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]);   ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
  if ($ans =~ m/([0-9\.\-\+]+)E([0-9\-\+]+)/ ) {      }
     my $number = $1;      if ($fmt && $$tagstack[-1] eq 'numericalresponse') {
     my $power = $2;   $fmt=~s/e/E/g;
     $power=~s/^\+//;   $ans = sprintf('%.'.$fmt,$ans);
     $power=~s/^(-?)0+(\d+)//;   if ($high) {
     $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs      $high=sprintf('%.'.$fmt,$high);
  }       $low =sprintf('%.'.$fmt,$low);
    }
       }
       if ($target eq 'answer') {
    if ($high && $$tagstack[-1] eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }
    if ($sighigh && $$tagstack[-1] eq 'numericalresponse') {
       if ($ENV{'form.answer_output_mode'} eq 'tex') {
    $ans.= " Sig $siglow - $sighigh";
     } else {      } else {
  my $badans = $bubbles_values[$ind];   $ans.= " Sig <i>$siglow - $sighigh</i>";
  my $format = '';   
  #What is the number? (integer,decimal,floating point)  
  if ($badans=~/^(\d*\.?\d*)(E|e)(\d*)$/) {  
     $format = 'e'.$2;  
  } elsif ($badans=~/^(\d*)\.(\d*)$/) {  
     $format = '4f';  
  } elsif ($badans=~/^(\d*)$/) {  
     $format = 'd';  
  }  
  $ans = sprintf('%.'.$format,$bubbles_values[$ind]);  
  if ($ans =~ m/([0-9\.\-\+]+)E([0-9\-\+]+)/ ) {  
     my $number = $1;  
     my $power = $2;  
     $power=~s/^\+//;  
     $power=~s/^(-?)0+(\d+)//;  
     $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs  
  }   
     }      }
     $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} ';  
     if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}  
  }   }
  $cou += $table_range[$j];   $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
  $j++;      } elsif ($target eq 'analyze') {
  $result.='\\\\\end{tabular}\vskip 0 mm ';       push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} }, $ans);
     }   if ($high) {
     $result.='\end{enumerate}';      push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"} }, $high);
     &Apache::lonxml::increment_counter();      push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"} }, $low);
  }   }
     }      }
   } elsif ($target eq 'edit') {   }
     $result.='</td></tr>'.&Apache::edit::end_table;   if (defined($unit) and ($unit ne '') and
   } elsif ($target eq 'answer' || $target eq 'analyze') {      $$tagstack[-1] eq 'numericalresponse') {
       if ($target eq 'answer') {
       my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";   if ($ENV{'form.answer_output_mode'} eq 'tex') {
       if ($target eq 'analyze') {      $result.=&Apache::response::answer_part($$tagstack[-1],
   push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);      " Unit: $unit ");
   $Apache::lonhomework::analyze{"$part_id.type"} = $$tagstack[-1];   } else {
       }      $result.=&Apache::response::answer_part($$tagstack[-1],
       &Apache::response::setup_params($$tagstack[-1]);      "Unit: <b>$unit</b>");
       my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);   }
       my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);      } elsif ($target eq 'analyze') {
       my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);   push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit);
       my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);      }
    }
       if ($target eq 'answer') {   if ($type || $$tagstack[-1] eq 'stringresponse') {
   $result.=&Apache::response::answer_header($$tagstack[-1]);      my $string='Case Insensitive';
       }      if ($type eq 'mc') {
       for(my $i=0;$i<=$#answers;$i++) {   $string='Multiple Choice';
   my $ans=$answers[$i];      } elsif ($type eq 'cs') {
   my $fmt;   $string='Case Sensitive';
   if (@formats) {      } elsif ($type eq 'ci') {
       if ($#formats) {   $string='Case Insensitive';
   $fmt=$formats[$i];      } elsif ($type eq 'fml') {
       } else {   $string='Formula';
   $fmt=$formats[0];      }
       }      if ($target eq 'answer') {
   }   if ($ENV{'form.answer_output_mode'} eq 'tex') {
   my ($high,$low);      $result.=&Apache::response::answer_part($$tagstack[-1],
   if ($Apache::inputtags::params{'tol'}) {    "$string");
       ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});   } else {
   }      $result.=&Apache::response::answer_part($$tagstack[-1],
   my ($sighigh,$siglow);      "<b>$string</b>");
   if ($Apache::inputtags::params{'sig'}) {   }
       ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});      } elsif ($target eq 'analyze') {
   }   push (@{ $Apache::lonhomework::analyze{"$part_id.str_type"} },
   if ($fmt) {        $type);
       $ans = sprintf('%.'.$fmt,$ans);      }
       if ($high) {   }
   $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low);   if ($$tagstack[-1] eq 'formularesponse' && $target eq 'answer') {
       }      my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);
   }      $result.=&Apache::response::answer_part($$tagstack[-1],$samples);
   if ($target eq 'answer') {   }
       if ($high) { $ans.=' ['.$low.','.$high.'] '; }   if ($target eq 'answer') {
       if ($sighigh) { $ans.= "Sig <i>$siglow - $sighigh</i>"; }      $result.=&Apache::response::answer_footer($$tagstack[-1]);
       $result.=&Apache::response::answer_part($$tagstack[-1],$ans);   }
   } elsif ($target eq 'analyze') {      }
       push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} },      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
     $ans);   $target eq 'tex' || $target eq 'analyze') {
       if ($high) {   &Apache::lonxml::increment_counter($increment);
   push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"} }, $high);      }
   push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"} }, $low);      &Apache::response::end_response;
       }      return $result;
   }  }
       }  
       if ($unit) {  sub get_table_sizes {
   if ($target eq 'answer') {      my ($format,$number_of_bubbles)=@_;
       $result.=&Apache::response::answer_part($$tagstack[-1],      my $max_val = 0;
       "Unit: <b>$unit</b>");      if ($format=~m/^(\d+)E([^\d]*)(\d*)$/) {
   } elsif ($target eq 'analyze') {   $max_val=$1+$2+4;
       push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} },      } else {
     $unit);   $max_val=4;
   }      }
       }      $max_val = int(0.9*$ENV{'form.textwidth'}/(($max_val+6)*2));
       if ($type || $token->[1] eq 'stringresponse') {      my $celllength = 0.9*$ENV{'form.textwidth'}/$max_val-10;
   my $string='Case Insensitive';      my @table_range = ();
   if ($type eq 'mc') {      my $number_of_tables = int($number_of_bubbles/$max_val);
       $string='Multiple Choice';      for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$max_val;}
   } elsif ($type eq 'cs') {      if ($number_of_bubbles % $max_val != 0) {
       $string='Case Sensitive';   $number_of_tables++;
   } elsif ($type eq 'ci') {   push @table_range,($number_of_bubbles % $max_val);
       $string='Case Insensitive';      }
   } elsif ($type eq 'fml') {      return ($celllength,$number_of_tables,@table_range);
       $string='Formula';  }
   }  
   if ($target eq 'answer') {  sub format_number {
       $result.=&Apache::response::answer_part($$tagstack[-1],      my ($number,$format,$target)=@_;
       '<b>'.$string.'</b>');      my $ans;
   } elsif ($target eq 'analyze') {      if ($format ne '') {
       push (@{ $Apache::lonhomework::analyze{"$part_id.type"} },   $format=~s/e/E/g;
     $type);   $ans = sprintf('%.'.$format,$number);
   }      } else {
       }   my $format = '';
       if ($$tagstack[-1] eq 'formularesponse' && $target eq 'answer') {   #What is the number? (integer,decimal,floating point)
   my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);   if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) {
   $result.=&Apache::response::answer_part($$tagstack[-1],$samples);      $format = '3e';
       }   } elsif ($number=~/^(\d*)\.(\d*)$/) {
       if ($target eq 'answer') {      $format = '4f';
   $result.=&Apache::response::answer_footer($$tagstack[-1]);   } elsif ($number=~/^(\d*)$/) {
       }      $format = 'd';
   }   }
   &Apache::response::end_response;   $ans = sprintf('%.'.$format,$number);
   return $result;      }
       if ($target eq 'tex') {
    if ($ans =~ m/([0-9\.\-\+]+)E([0-9\-\+]+)/ ) {
       my $number = $1;
       my $power = $2;
       $power=~s/^\+//;
       $power=~s/^(-?)0+(\d+)//;
       $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs
    }
       }
       return $ans;
   }
   
   sub make_numerical_bubbles {
       my ($number_of_bubbles,$target,$answer,$format) =@_;
       my @bubble_values = ();
       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
       &Apache::response::setrandomnumber();
       my $ind=&Math::Random::random_uniform_integer(1,0,$#powers);
       my $power = $powers[$ind];
       $ind=&Math::Random::random_uniform_integer(1,0,$#factors);
       my $factor = $factors[$ind];
       for ($ind=0;$ind<$number_of_bubbles;$ind++) {
    $bubble_values[$ind] = $answer*($factor**($power-$powers[$#powers-$ind]));
    $bubble_values[$ind] = &format_number($bubble_values[$ind],
          $format,$target);
   
       }
       return @bubble_values;
 }  }
   
 sub get_tolrange {  sub get_tolrange {
   my ($ans,$tol)=@_;      my ($ans,$tol)=@_;
   my ($high,$low);      my ($high,$low);
   if ($tol =~ /%$/) {      if ($tol =~ /%$/) {
     chop($tol);   chop($tol);
     my $change=$ans*($tol/100.0);   my $change=$ans*($tol/100.0);
     $high=$ans+$change;   $high=$ans+$change;
     $low=$ans-$change;   $low=$ans-$change;
   } else {      } else {
     $high=$ans+$tol;   $high=$ans+$tol;
     $low=$ans-$tol;   $low=$ans-$tol;
   }      }
   return ($high,$low);      return ($high,$low);
 }  }
   
 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 $sig_lbound;      my $sig_lbound;
   my $sig_ubound;      my $sig_ubound;
   if ($sig eq '') {      if ($sig eq '') {
     $sig_lbound = 0; #SIG_LB_DEFAULT   $sig_lbound = 0; #SIG_LB_DEFAULT
     $sig_ubound =15; #SIG_UB_DEFAULT   $sig_ubound =15; #SIG_UB_DEFAULT
   } else {      } else {
     ($sig_lbound,$sig_ubound) = split(/,/,$sig);   ($sig_lbound,$sig_ubound) = split(/,/,$sig);
     if (!$sig_lbound) {   if (!$sig_lbound) {
       $sig_lbound = 0; #SIG_LB_DEFAULT      $sig_lbound = 0; #SIG_LB_DEFAULT
       $sig_ubound =15; #SIG_UB_DEFAULT      $sig_ubound =15; #SIG_UB_DEFAULT
     }   }
     if (!$sig_ubound) { $sig_ubound=$sig_lbound; }   if (!$sig_ubound) { $sig_ubound=$sig_lbound; }
   }      }
   return ($sig_ubound,$sig_lbound);      return ($sig_ubound,$sig_lbound);
 }  }
   
 sub start_stringresponse {  sub start_stringresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;      my $result;
   if ($target eq 'meta') {      if ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('stringresponse');   &Apache::response::start_response($parstack,$safeeval);
   } else {   $result=&Apache::response::meta_package_write('stringresponse');
     $result.=&start_numericalresponse(@_);   &Apache::response::end_response();
   }      } else {
   return $result;   $result.=&start_numericalresponse(@_);
       }
       return $result;
 }  }
   
 sub end_stringresponse {  sub end_stringresponse {
   return end_numericalresponse(@_);      return end_numericalresponse(@_);
 }  }
   
 sub start_formularesponse {  sub start_formularesponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;      my $result;
   if ($target eq 'meta') {      if ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('formularesponse');   &Apache::response::start_response($parstack,$safeeval);
   } else {   $result=&Apache::response::meta_package_write('formularesponse');
     $result.=&start_numericalresponse(@_);   &Apache::response::end_response();
   }      } else {
   return $result;   $result.=&start_numericalresponse(@_);
       }
       return $result;
 }  }
   
 sub end_formularesponse {  sub end_formularesponse {
   return end_numericalresponse(@_);      return end_numericalresponse(@_);
 }  }
   
 1;  1;
 __END__  __END__
    

Removed from v.1.72  
changed lines
  Added in v.1.115


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