--- loncom/homework/caparesponse/caparesponse.pm 2001/10/01 20:18:31 1.44 +++ loncom/homework/caparesponse/caparesponse.pm 2002/08/27 02:25:11 1.54 @@ -1,11 +1,36 @@ # The LearningOnline Network with CAPA # caparesponse definition +# +# $Id: caparesponse.pm,v 1.54 2002/08/27 02:25:11 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# package Apache::caparesponse; use strict; use capa; -sub BEGIN { +BEGIN { &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse')); } @@ -57,18 +82,18 @@ sub start_numericalresponse { my $id = &Apache::response::start_response($parstack,$safeeval); my $result; if ($target eq 'edit') { - $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token)); + $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Answer:','answer',$token); if ($token->[1] eq 'numericalresponse') { $result.=&Apache::edit::text_arg('Unit:','unit',$token,5); $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','ci','mc'],$token); } elsif ($token->[1] eq 'formularesponse') { - $result.=&Apache::edit::text_arg('Sample Points:','points',$token,40); + $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40); } - $result.=''; + $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag; if ($token->[1] eq 'numericalresponse') { @@ -79,7 +104,7 @@ sub start_numericalresponse { 'answer','type'); } elsif ($token->[1] eq 'formularesponse') { $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, - 'answer','points'); + 'answer','samples'); } if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); @@ -96,7 +121,7 @@ sub end_numericalresponse { my $result = ''; if ( $target eq 'grade' ) { if ( defined $ENV{'form.submitted'}) { - &Apache::response::setup_params('numericalresponse'); + &Apache::response::setup_params($$tagstack[-1]); $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); my $partid = $Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; @@ -115,24 +140,23 @@ sub end_numericalresponse { $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.="');"; $result = &Apache::run::run($expression,$safeeval); my ($awards) = split /:/ , $result; my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); - if ( $previous{'used'} && ($previous{'award'} eq $ad) ) { - if ($previous{'last'}) { - push(@Apache::inputtags::previous,'PREVIOUSLY_LAST'); - } else { - push(@Apache::inputtags::previous,'PREVIOUSLY_USED'); - } - } + &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; &Apache::lonxml::debug("$expression"); &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); $result=''; } } - } elsif ($target eq 'web') { + } 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" ) { @@ -142,8 +166,11 @@ sub end_numericalresponse { $safeeval); my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval); - $result="

The computer got "; - + 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; @@ -161,18 +188,23 @@ sub end_numericalresponse { } } chop $result; - $result.=" $unit.

"; + 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') { + &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('numericalresponse'); + $result.=&Apache::response::answer_header($$tagstack[-1]); for(my $i=0;$i<=$#answers;$i++) { my $ans=$answers[$i]; my $fmt; @@ -183,12 +215,26 @@ sub end_numericalresponse { $fmt=$formats[0]; } } - if ($fmt) { $ans = sprintf('%.'.$fmt,$ans); } - $result.=&Apache::response::answer_part('numericalresponse',$ans); + 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 ($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('numericalresponse', - ''.$unit.''); + $result.=&Apache::response::answer_part($$tagstack[-1],"Unit: $unit"); } if ($type || $token->[1] eq 'stringresponse') { my $string='Case Insensitive'; @@ -198,16 +244,56 @@ sub end_numericalresponse { $string='Case Sensitive'; } elsif ($type eq 'ci') { $string='Case Insensitive'; + } elsif ($type eq 'fml') { + $string='Formula'; } - $result.=&Apache::response::answer_part('numericalresponse', + $result.=&Apache::response::answer_part($$tagstack[-1], ''.$string.''); } - $result.=&Apache::response::answer_footer('numericalresponse'); + 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; } +sub get_tolrange { + my ($ans,$tol)=@_; + my ($high,$low); + if ($tol =~ /%$/) { + chop($tol); + my $change=$ans*($tol/100.0); + $high=$ans+$change; + $low=$ans-$change; + } else { + $high=$ans+$tol; + $low=$ans-$tol; + } + return ($high,$low); +} + +sub get_sigrange { + my ($sig)=@_; + &Apache::lonxml::debug("Got a sig of :$sig:"); + my $sig_lbound; + my $sig_ubound; + if ($sig eq '') { + $sig_lbound = 0; #SIG_LB_DEFAULT + $sig_ubound =15; #SIG_UB_DEFAULT + } else { + ($sig_lbound,$sig_ubound) = split(/,/,$sig); + if (!$sig_lbound) { + $sig_lbound = 0; #SIG_LB_DEFAULT + $sig_ubound =15; #SIG_UB_DEFAULT + } + if (!$sig_ubound) { $sig_ubound=$sig_lbound; } + } + return ($sig_ubound,$sig_lbound); +} + sub start_stringresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result;