--- loncom/homework/caparesponse/caparesponse.pm 2004/02/13 15:09:52 1.129 +++ loncom/homework/caparesponse/caparesponse.pm 2004/03/16 19:47:47 1.143 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.129 2004/02/13 15:09:52 www Exp $ +# $Id: caparesponse.pm,v 1.143 2004/03/16 19:47:47 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,7 @@ sub start_numericalresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $id = &Apache::response::start_response($parstack,$safeeval); my $result; + undef %{$safeeval->varglob('LONCAPA::CAPAresponse_args')}; if ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Answer:','answer',$token); @@ -99,7 +100,7 @@ sub end_numericalresponse { my $tag; if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; } if ( $target eq 'grade' && defined($ENV{'form.submitted'})) { - &Apache::response::setup_params($tag); + &Apache::response::setup_params($tag,$safeeval); $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); my $partid = $Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; @@ -122,50 +123,60 @@ sub end_numericalresponse { my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval); my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect); $response=$values[$response]; - } else { - $response =~ s/\\/\\\\/g; - $response =~ s/\'/\\\'/g; } $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; - &Apache::lonxml::debug("current $response"); - my $expression="&caparesponse_check_list('".$response."','". - $$parstack[-1]; + my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')}; + $$args_ref{'response'}=$response; my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit'); + foreach my $arg ('type','tol','sig','ans_fmt','unit','calc', + 'samples') { + $$args_ref{$arg}= + &Apache::lonxml::get_param($arg,$parstack,$safeeval); + } foreach my $key (keys(%Apache::inputtags::params)) { - $expression.= ';my $'. #' - $key.'="'.$Apache::inputtags::params{$key}.'"'; + $$args_ref{$key}=$Apache::inputtags::params{$key}; } #no way to enter units, with radio buttons if ($Apache::lonhomework::type eq 'exam' || lc($hideunit) eq "yes") { - $expression.=';my $unit=undef;'; + delete($$args_ref{'unit'}); } #sig fig don't make much sense either if (($Apache::lonhomework::type eq 'exam' || $ENV{'form.submitted'} eq 'scantron') && $tag eq 'numericalresponse') { - $expression.=';my $sig=undef;'; + delete($$args_ref{'sig'}); } if ($tag eq 'formularesponse') { - $expression.=';my $type="fml";'; + $$args_ref{'type'}='fml'; } elsif ($tag eq 'numericalresponse') { - $expression.=';my $type="float";'; + $$args_ref{'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; + @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer; - $result = &Apache::run::run($expression,$safeeval); - my ($awards) = split /:/ , $result; - ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); - &Apache::lonxml::debug("$expression"); + ($result,my @msgs) = + &Apache::run::run("&caparesponse_check_list()",$safeeval); + &Apache::lonxml::debug('msgs are'.join(':',@msgs)); + my ($awards)=split(/:/,$result); + my (@awards) = split(/,/,$awards); + ($ad,my $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs); + &Apache::lonxml::debug('ad is'.$ad); + if ($ad eq 'SIG_FAIL') { + my ($sig_u,$sig_l)= + &get_sigrange($Apache::inputtags::params{'sig'}); + $msg=join(':',$msg,$sig_l,$sig_u); + &Apache::lonxml::debug("sigs bad $sig_u $sig_l ". + $Apache::inputtags::params{'sig'}); + } &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; + $Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg; $result=''; } } @@ -298,7 +309,7 @@ sub end_numericalresponse { push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect); } if (scalar(@$tagstack)) { - &Apache::response::setup_params($tag); + &Apache::response::setup_params($tag,$safeeval); } my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); @@ -382,19 +393,28 @@ sub get_table_sizes { my $cell_width=0; foreach my $member (@$rbubble_values) { my $cell_width_real=0; - if ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) { + if ($member=~/(\+|-)?(\d*)\.?(\d*)\s*\$\\times\s*10\^{(\+|-)?(\d+)}\$/) { + $cell_width_real=(length($2)+length($3)+length($5)+7)*$scale; + } elsif ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) { $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale; - } elsif ($member=~/(\d*)\.?(\d*)/) { - $cell_width_real=(length($1)+length($2)+2)*$scale; + } elsif ($member=~/(\d*)\.(\d*)/) { + $cell_width_real=(length($1)+length($2)+3)*$scale; } else { - $cell_width_real=(length($member)+1)*$scale; + $cell_width_real=(length($member)+1)*$scale*0.9; } if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;} } - $cell_width+=8; - $ENV{'form.textwidth'}=~/(\d+)/; - my $textwidth=$1; + $cell_width+=8; + my $textwidth; + if ($ENV{'form.textwidth'} ne '') { + $ENV{'form.textwidth'}=~/(\d*)\.?(\d*)/; + $textwidth=$1.'.'.$2; + } else { + $ENV{'textwidth'}=~/(\d+)\.?(\d*)/; + $textwidth=$1.'.'.$2; + } my $bubbles_per_line=int($textwidth/$cell_width); + if (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==0)) {$bubbles_per_line=$number_of_bubbles/2;} my $number_of_tables = int($number_of_bubbles/$bubbles_per_line); my @table_range = (); for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;} @@ -403,6 +423,7 @@ sub get_table_sizes { push @table_range,($number_of_bubbles % $bubbles_per_line); } $cell_width-=8; + $cell_width=$cell_width*3/4; return ($cell_width,$number_of_tables,@table_range); } @@ -452,6 +473,11 @@ sub make_numerical_bubbles { @bubble_values=sort {$a <=> $b} (@bubble_values,$answer); &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values)); &Math::Random::random_set_seed(@oldseed); + if (defined($format) && $format ne '') { + foreach my $value (@bubble_values) { + $value=&format_number($value,$format,$target); + } + } return @bubble_values; } if (defined($$incorrect[0]) && @@ -507,6 +533,16 @@ sub get_sigrange { } if (!$sig_ubound) { $sig_ubound=$sig_lbound; } } + if (($sig_ubound<$sig_lbound) || + ($sig_lbound > 15) || + ($sig =~/(\+|-)/ ) ) { + my $errormsg=&mt("Invalid Significant figures detected")." ($sig)"; + if ($ENV{'request.state'} eq 'construct') { + $errormsg.= + &Apache::loncommon::help_open_topic('Significant_Figures'); + } + &Apache::lonxml::error($errormsg); + } return ($sig_ubound,$sig_lbound); } @@ -529,16 +565,14 @@ sub start_stringresponse { [['inline','Inline']],$token); $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { - &Apache::edit::get_new_args($token,$parstack, - $safeeval,'answer','type'); - my $answerdisplay=$ENV{'form.'.&Apache::edit::html_element_name('answerdisplay')}; - if ($answerdisplay) { - $token->[2]->{'answerdisplay'}=$answerdisplay; - } else { - delete $token->[2]->{'answerdisplay'}; - } - $result = &Apache::edit::rebuild_tag($token); - $result.=&Apache::edit::handle_insert(); + my $constructtag; + $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'answer', + 'type','answerdisplay'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.=&Apache::edit::handle_insert(); + } } elsif ($target eq 'answer' || $target eq 'grade') { &Apache::response::reset_params(); } @@ -559,7 +593,7 @@ sub end_stringresponse { &Apache::lonxml::default_homework_load($safeeval); } if ( $target eq 'grade' && defined($ENV{'form.submitted'})) { - &Apache::response::setup_params('stringresponse'); + &Apache::response::setup_params('stringresponse',$safeeval); $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); if ($Apache::lonhomework::type eq 'exam' || $ENV{'form.submitted'} eq 'scantron') { @@ -571,10 +605,9 @@ sub end_stringresponse { $part,$id); &Apache::lonxml::debug("submitted a $response
\n"); &Apache::lonxml::debug($$parstack[-1] . "\n
"); - $Apache::lonhomework::results{"resource.$part.$id.submission"}= $response; - my $ad; + my ($ad,$msg); if ($type eq 're' ) { # if the RE wasn't in a var it likely got munged, # thus grab it from the var directly @@ -582,33 +615,34 @@ sub end_stringresponse { # if ($testans !~ m/^\s*\$/) { # $answer=$token->[2]->{'answer'}; # } - ${$safeeval->varglob('LONCAPA_INTERNAL_response')}= - $response; - $result = &Apache::run::run('return $LONCAPA_INTERNAL_response=~m'.$answer,$safeeval); + ${$safeeval->varglob('LONCAPA::response')}=$response; + $result = &Apache::run::run('return $LONCAPA::response=~m'.$answer,$safeeval); &Apache::lonxml::debug("current $response"); &Apache::lonxml::debug("current $answer"); $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT'; } else { - $response =~ s/\\/\\\\/g; - $response =~ s/\'/\\\'/g; + my $args_ref= + \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')}; + + $$args_ref{'response'}=$response; &Apache::lonxml::debug("current $response"); - my $expression="&caparesponse_check_list('".$response."','". - $$parstack[-1]; + $$args_ref{'type'}= + &Apache::lonxml::get_param('type',$parstack,$safeeval); foreach my $key (keys(%Apache::inputtags::params)) { - $expression.= ';my $'. #' - $key.'="'.$Apache::inputtags::params{$key}.'"'; + $$args_ref{$key}=$Apache::inputtags::params{$key}; } - $expression.="');"; &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"); + @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=($answer); + ($result, my @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval); + &Apache::lonxml::debug('msgs are'.join(':',@msgs)); + my ($awards)=split(/:/,$result); + my (@awards) = split(/,/,$awards); + ($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs); &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); } &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; + $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg; } } } elsif ($target eq 'web' || $target eq 'tex') { @@ -636,7 +670,7 @@ sub end_stringresponse { push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id"); $Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse'; } - &Apache::response::setup_params('stringresponse'); + &Apache::response::setup_params('stringresponse',$safeeval); if ($target eq 'answer') { $result.=&Apache::response::answer_header('stringresponse'); }