--- loncom/homework/caparesponse/caparesponse.pm 2002/08/26 19:44:33 1.53 +++ loncom/homework/caparesponse/caparesponse.pm 2002/10/17 17:13:44 1.67 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.53 2002/08/26 19:44:33 sakharuk Exp $ +# $Id: caparesponse.pm,v 1.67 2002/10/17 17:13:44 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -157,104 +157,250 @@ sub end_numericalresponse { } } } elsif ($target eq 'web' || $target eq 'tex') { - my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; - my $status = $Apache::inputtags::status['-1']; - if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) { - my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack, - $safeeval); - my (@formats)=&Apache::lonxml::get_param_var('format',$parstack, - $safeeval); - my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval); - - if ($target eq 'web') { - $result="
The computer got "; - } elsif ($target eq 'tex') { - $result='\vskip 0 mm The computer got '; - } - for (my $i=0; $i <= $#answers; $i++) { - my $answer=$answers[$i]; - my $format; - if ($#formats > 0) { - $format=$formats[$i]; - } else { - $format=$formats[0]; - } - if ((defined($format)) && ($format ne '')) { - &Apache::lonxml::debug("formatting with :$format: answer :$answer:"); - $result.=sprintf('%.'.$format,$answer).','; - } else { - &Apache::lonxml::debug("no format answer :$answer:"); - $result.="$answer,"; + if ($Apache::lonhomework::type ne 'exam') { + my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; + my $status = $Apache::inputtags::status['-1']; + if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) { + my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack, + $safeeval); + my (@formats)=&Apache::lonxml::get_param_var('format',$parstack, + $safeeval); + my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval); + + if ($target eq 'web') { + $result="
The correct answer is "; + } elsif ($target eq 'tex') { + $result='\vskip 0 mm The correct answer is \\texttt{'; + } + for (my $i=0; $i <= $#answers; $i++) { + my $answer=$answers[$i]; + my $format; + if ($#formats > 0) { + $format=$formats[$i]; + } else { + $format=$formats[0]; + } + my $formatted; + if ((defined($format)) && ($format ne '')) { + &Apache::lonxml::debug("formatting with :$format: answer :$answer:"); + $formatted=sprintf('%.'.$format,$answer).','; + } else { + &Apache::lonxml::debug("no format answer :$answer:"); + $formatted="$answer,"; + } + if ($target eq 'tex') {$formatted=&Apache::lonxml::latex_special_symbols($formatted);} + $result.=$formatted; + } + chop $result; + if ($target eq 'web') { + $result.=" $unit.
"; + } elsif ($target eq 'tex') { + $result.=&Apache::lonxml::latex_special_symbols($unit); + $result.="}. \\vskip 0 mm "; + } + } + } else { + my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); + my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); + my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval); + my $number_of_bubbles = 8; #default values for number of bubbles + my @bubbles_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 + my $factors_number = 5; #default values for number of factors + my $powers_number = 8; #default values for number of powers + my $symb; + if ($ENV{'form.symb'}=~/___\d+___/) {$symb=$ENV{'form.symb'};} else {$symb=$ENV{'request.symb'};} + 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') { + $result.= ''; + for ($ind=0;$ind<$number_of_bubbles;$ind++) { + my $ans; + if ($formats[0] ne '') { + $ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]); + } else { + my $badans = $bubbles_values[$ind]; + 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]); + } + $result.=''; + } + $result.='
'.$alphabet[$ind].': '.$ans.'
'; + } elsif ($target eq 'tex') { + my $max_val = 0; + if ($formats[0]=~m/^(\d+)E([^\d]*)(\d*)$/) { + $max_val=$1+$2+4; + } else { + $max_val=4; + } + $max_val = int(0.9*$ENV{'form.textwidth'}/(($max_val+6)*2)); + my $celllength = 0.9*$ENV{'form.textwidth'}/$max_val-10; + my @table_range = (); + my $number_of_tables = int($number_of_bubbles/$max_val); + for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$max_val;} + if ($number_of_bubbles % $max_val != 0) { + $number_of_tables++; + push @table_range,($number_of_bubbles % $max_val); + } + 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 ($ind=0;$ind<$table_range[$j];$ind++) { + $result.='lp{'.$celllength.' mm}'; + } + $result.='}'; + for ($ind=$cou;$ind<$cou+$table_range[$j];$ind++) { + my $ans; + if ($formats[0] ne '') { + $ans = sprintf('%.'.$formats[0],$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 + } + } else { + my $badans = $bubbles_values[$ind]; + 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]; + $j++; + $result.='\\\\\end{tabular}\vskip 0 mm '; + } + $result.='\end{enumerate}'; + &Apache::lonxml::increment_counter(); } - } - chop $result; - if ($target eq 'web') { - $result.=" $unit.

"; - } elsif ($target eq 'tex') { - $result.=" $unit.\\vskip 0 mm "; - } } } elsif ($target eq 'edit') { $result.=''.&Apache::edit::end_table; - } elsif ($target eq 'answer') { + } elsif ($target eq 'answer' || $target eq 'analyze') { - &Apache::response::setup_params($$tagstack[-1]); - my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); - my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); - my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval); - my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval); + my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; + if ($target eq 'analyze') { + push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); + $Apache::lonhomework::analyze{"$part_id.type"} = $$tagstack[-1]; + } + &Apache::response::setup_params($$tagstack[-1]); + my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); + my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); + my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval); + my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval); - $result.=&Apache::response::answer_header($$tagstack[-1]); - for(my $i=0;$i<=$#answers;$i++) { - my $ans=$answers[$i]; - my $fmt; - if (@formats) { - if ($#formats) { - $fmt=$formats[$i]; - } else { - $fmt=$formats[0]; - } + if ($target eq 'answer') { + $result.=&Apache::response::answer_header($$tagstack[-1]); } - my ($high,$low); - if ($Apache::inputtags::params{'tol'}) { - ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'}); - } - my ($sighigh,$siglow); - if ($Apache::inputtags::params{'sig'}) { - ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'}); + for(my $i=0;$i<=$#answers;$i++) { + my $ans=$answers[$i]; + my $fmt; + if (@formats) { + if ($#formats) { + $fmt=$formats[$i]; + } else { + $fmt=$formats[0]; + } + } + my ($high,$low); + if ($Apache::inputtags::params{'tol'}) { + ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'}); + } + my ($sighigh,$siglow); + if ($Apache::inputtags::params{'sig'}) { + ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'}); + } + if ($fmt) { + $ans = sprintf('%.'.$fmt,$ans); + if ($high) { + $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low); + } + } + if ($target eq 'answer') { + if ($high) { $ans.=' ['.$low.','.$high.'] '; } + if ($sighigh) { $ans.= "Sig $siglow - $sighigh"; } + $result.=&Apache::response::answer_part($$tagstack[-1],$ans); + } elsif ($target eq 'analyze') { + push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} }, + $ans); + if ($high) { + push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"} }, $high); + push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"} }, $low); + } + } } - if ($fmt) { - $ans = sprintf('%.'.$fmt,$ans); - if ($high) { - $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low); - } + if ($unit) { + if ($target eq 'answer') { + $result.=&Apache::response::answer_part($$tagstack[-1], + "Unit: $unit"); + } elsif ($target eq 'analyze') { + push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, + $unit); + } } - if ($high) { $ans.=' ['.$low.','.$high.'] '; } - if ($sighigh) { $ans.= "Sig $siglow - $sighigh"; } - $result.=&Apache::response::answer_part($$tagstack[-1],$ans); - } - if ($unit) { - $result.=&Apache::response::answer_part($$tagstack[-1],"Unit: $unit"); - } - if ($type || $token->[1] eq 'stringresponse') { - my $string='Case Insensitive'; - if ($type eq 'mc') { - $string='Multiple Choice'; - } elsif ($type eq 'cs') { - $string='Case Sensitive'; - } elsif ($type eq 'ci') { - $string='Case Insensitive'; - } elsif ($type eq 'fml') { - $string='Formula'; + if ($type || $token->[1] eq 'stringresponse') { + my $string='Case Insensitive'; + if ($type eq 'mc') { + $string='Multiple Choice'; + } elsif ($type eq 'cs') { + $string='Case Sensitive'; + } elsif ($type eq 'ci') { + $string='Case Insensitive'; + } elsif ($type eq 'fml') { + $string='Formula'; + } + if ($target eq 'answer') { + $result.=&Apache::response::answer_part($$tagstack[-1], + ''.$string.''); + } elsif ($target eq 'analyze') { + push (@{ $Apache::lonhomework::analyze{"$part_id.type"} }, + $type); + } + } + 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') { + $result.=&Apache::response::answer_footer($$tagstack[-1]); } - $result.=&Apache::response::answer_part($$tagstack[-1], - ''.$string.''); - } - if ($$tagstack[-1] eq 'formularesponse') { - my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval); - $result.=&Apache::response::answer_part($$tagstack[-1],$samples); - } - $result.=&Apache::response::answer_footer($$tagstack[-1]); } &Apache::response::end_response; return $result;