--- loncom/homework/caparesponse/caparesponse.pm 2002/10/14 20:37:27 1.65 +++ loncom/homework/caparesponse/caparesponse.pm 2002/11/25 21:36:42 1.73 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.65 2002/10/14 20:37:27 albertel Exp $ +# $Id: caparesponse.pm,v 1.73 2002/11/25 21:36:42 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -89,7 +89,8 @@ sub start_numericalresponse { $result.=&Apache::edit::text_arg('Format:','format',$token,4); } elsif ($token->[1] eq 'stringresponse') { $result.=&Apache::edit::select_arg('Type:','type', - ['cs','ci','mc'],$token); + [['cs','Case Sensitive'],['ci','Case Insensitive'], + ['mc','Case Insensitive, Any Order']],$token); } elsif ($token->[1] eq 'formularesponse') { $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40); } @@ -112,6 +113,8 @@ sub start_numericalresponse { } } elsif ($target eq 'meta') { $result=&Apache::response::meta_package_write('numericalresponse'); + } elsif ($target eq 'answer' || $target eq 'grade') { + &Apache::response::reset_params(); } return $result; } @@ -127,6 +130,9 @@ sub end_numericalresponse { my $id = $Apache::inputtags::response['-1']; my $response = $ENV{'form.HWVAL'.$id}; if ( $response =~ /[^\s]/) { + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } my %previous = &Apache::response::check_for_previous($response,$partid,$id); $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; &Apache::lonxml::debug("submitted a $response
\n"); @@ -157,7 +163,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 +204,7 @@ sub end_numericalresponse { $result.="}. \\vskip 0 mm "; } } - } else { + 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); my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval); @@ -223,6 +228,7 @@ sub end_numericalresponse { 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]; $result.= ''; for ($ind=0;$ind<$number_of_bubbles;$ind++) { my $ans; @@ -241,7 +247,7 @@ sub end_numericalresponse { } $ans = sprintf('%.'.$format,$bubbles_values[$ind]); } - $result.=''; + $result.=''; } $result.='
'.$alphabet[$ind].': '.$ans.''.$alphabet[$ind].': '.$ans.'
'; } elsif ($target eq 'tex') { @@ -249,10 +255,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 +268,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,15 +297,24 @@ 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') { @@ -338,8 +360,8 @@ sub end_numericalresponse { } } if ($target eq 'answer') { - if ($high) { $ans.=' ['.$low.','.$high.'] '; } - if ($sighigh) { $ans.= "Sig $siglow - $sighigh"; } + 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"} },