--- loncom/homework/caparesponse/caparesponse.pm 2002/10/04 06:35:28 1.64
+++ loncom/homework/caparesponse/caparesponse.pm 2002/11/06 17:58:27 1.68
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# caparesponse definition
#
-# $Id: caparesponse.pm,v 1.64 2002/10/04 06:35:28 albertel Exp $
+# $Id: caparesponse.pm,v 1.68 2002/11/06 17:58:27 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -157,7 +157,6 @@ sub end_numericalresponse {
}
}
} elsif ($target eq 'web' || $target eq 'tex') {
- 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" ) {
@@ -199,7 +198,6 @@ sub end_numericalresponse {
$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);
@@ -249,10 +247,10 @@ sub end_numericalresponse {
if ($formats[0]=~m/^(\d+)E([^\d]*)(\d*)$/) {
$max_val=$1+$2+4;
} else {
- $max_val=5;
+ $max_val=4;
}
- $max_val = int(90/(($max_val+6)*2));
- my $celllength = 90/$max_val-12;
+ $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;}
@@ -262,17 +260,24 @@ sub end_numericalresponse {
}
my $j=0;
my $cou=0;
- $result.='\vskip 2 mm \noindent ';
+ $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
for (my $i=0;$i<$number_of_tables;$i++) {
- $result.='\vskip 0 mm \noindent \begin{tabular}{|';
+ $result.='\vskip -1 mm \noindent \begin{tabular}{';
for ($ind=0;$ind<$table_range[$j];$ind++) {
- $result.='lp{'.$celllength.' mm}|';
+ $result.='lp{'.$celllength.' mm}';
}
- $result.='}\hline';
+ $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 = '';
@@ -284,78 +289,115 @@ sub end_numericalresponse {
} elsif ($badans=~/^(\d*)$/) {
$format = 'd';
}
- $ans = sprintf('%.'.$format,$bubbles_values[$ind]);
+ $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.=' '.$alphabet[$ind].': & '.$ans.' ';
+ $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.='\\\\\hline\end{tabular}\vskip 0 mm ';
- }
+ $result.='\\\\\end{tabular}\vskip 0 mm ';
+ }
+ $result.='\end{enumerate}';
+ &Apache::lonxml::increment_counter();
}
- }
} 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;