';
- } elsif ($target eq 'modified') {
- my $constructtag;
- if ($token->[1] eq 'numericalresponse') {
- $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
- 'answer','unit','format');
+ &setup_capa_response($args_ref,$response);
+ return $args_ref;
+}
+
+sub setup_capa_response {
+ my ($args_ref,$response) = @_;
+
+ if (ref($response)) {
+ $$args_ref{'response'}=dclone($response);
} else {
- $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
- 'answer','type');
+ $$args_ref{'response'}=dclone([$response]);
+ }
+}
+
+sub check_submission {
+ my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_;
+ my @args = ('type','tol','sig','format','unit','calc','samples');
+ my $args_ref = &setup_capa_args($safeeval,$parstack,\@args,$response);
+
+ my $hideunit=
+ &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
+ #no way to enter units, with radio buttons
+ if ($Apache::lonhomework::type eq 'exam' ||
+ lc($hideunit) eq "yes") {
+ delete($$args_ref{'unit'});
+ }
+ #sig fig don't make much sense either
+ if (($Apache::lonhomework::type eq 'exam' ||
+ &Apache::response::submitted('scantron') ||
+ $ignore_sig) &&
+ $tag eq 'numericalresponse') {
+ delete($$args_ref{'sig'});
+ }
+
+ if ($tag eq 'formularesponse') {
+ if ($$args_ref{'samples'}) {
+ $$args_ref{'type'}='fml';
+ } else {
+ $$args_ref{'type'}='math';
+ }
+ } elsif ($tag eq 'numericalresponse') {
+ $$args_ref{'type'}='float';
+ }
+
+ &add_in_tag_answer($parstack,$safeeval);
+
+ if (!%answer) {
+ &Apache::lonxml::error("No answers are defined");
+ }
+
+ my (@final_awards,@final_msgs,@names);
+ foreach my $name (keys(%answer)) {
+ &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} }));
+
+ ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$name});
+ &setup_capa_response($args_ref,$response);
+ use Time::HiRes;
+ my $t0 = [Time::HiRes::gettimeofday()];
+ my ($result,@msgs) =
+ &Apache::run::run("&caparesponse_check_list($tag)",$safeeval);
+ &Apache::lonxml::debug("checking $name $result with $response took ".&Time::HiRes::tv_interval($t0));
+ &Apache::lonxml::debug('msgs are '.join(':',@msgs));
+ my ($awards)=split(/:/,$result);
+ my @awards= split(/,/,$awards);
+ my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
+ push(@final_awards,$ad);
+ push(@final_msgs,$msg);
+ push(@names,$name);
+ }
+ my ($ad, $msg, $name) = &Apache::inputtags::finalizeawards(\@final_awards,
+ \@final_msgs,
+ \@names,1);
+ &Apache::lonxml::debug(" name of picked award is $name from ".join(', ',@names));
+ return($ad,$msg, $name);
+}
+
+sub add_in_tag_answer {
+ my ($parstack,$safeeval,$response_level) = @_;
+ my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval,
+ $response_level);
+ &Apache::lonxml::debug('answer is'.join(':',@answer));
+ if (@answer && $answer[0] =~ /\S/) {
+ $answer{$tag_internal_answer_name}= {'type' => 'ordered',
+ 'answers' => [\@answer] };
}
- if ($constructtag) {
- $result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
- }
- } elsif ($target eq 'meta') {
- $result=&Apache::response::meta_package_write('numericalresponse');
- }
- return $result;
+}
+
+sub capa_formula_fix {
+ my ($expression)=@_;
+ return &Apache::response::implicit_multiplication($expression);
}
sub end_numericalresponse {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result = '';
- if ( $target eq 'grade' ) {
- if ( defined $ENV{'form.submitted'}) {
- &Apache::response::setup_params('numericalresponse');
- $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
- my $partid = $Apache::inputtags::part;
- my $id = $Apache::inputtags::response['-1'];
- my $response = $ENV{'form.HWVAL'.$id};
- if ( $response =~ /[^\s]/) {
- 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");
- &Apache::lonxml::debug($$parstack[$#$parstack] . "\n
");
- $response =~ s/\\/\\\\/g;
- $response =~ s/\'/\\\'/g;
- &Apache::lonxml::debug("current $response");
- my $expression="&caparesponse_check_list('".$response."','".
- $$parstack[$#$parstack];
- foreach my $key (keys(%Apache::inputtags::params)) {
- $expression.= ';my $'. #'
- $key.'="'.$Apache::inputtags::params{$key}.'"';
- }
- $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::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') {
- my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
- my $status = $Apache::inputtags::status['-1'];
- if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
- my $answervar=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
- my (@answers)=&Apache::run::run("return $answervar",$safeeval,1);
- if (!defined($answers[0])) { $answers[0]=$answervar; } else {
- &Apache::lonxml::debug("answers is $#answers :$answers[0]:");
- }
- my $formatvar=&Apache::lonxml::get_param('format',$parstack,$safeeval);
- my (@formats)=&Apache::run::run("return $formatvar",$safeeval,1);
- if (!defined($formats[0])) { $formats[0]=$formatvar; }
-
- my $unit=&Apache::lonxml::get_param('unit',$parstack,$safeeval);
-
- $result="
The computer got ";
-
- for (my $i=0; $i <= $#answers; $i++) {
- my $answer=$answers[$i];
- my $format;
- if ($#formats > 0) {
- $format=$formats[$i];
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+ &Apache::lonxml::deregister('Apache::caparesponse',
+ ('answer','answergroup','value','array','unit',
+ 'vector'));
+ pop(@Apache::lonxml::namespace);
+
+ my $increment=1;
+ my $result = '';
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ my $partid = $Apache::inputtags::part;
+ my $id = $Apache::inputtags::response[-1];
+ my $tag;
+ my $safehole = new Safe::Hole;
+ $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
+
+ if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
+ if ( $target eq 'grade' && &Apache::response::submitted() ) {
+ &Apache::response::setup_params($tag,$safeeval);
+ if ($Apache::lonhomework::type eq 'exam' &&
+ (($tag eq 'formularesponse') || ($tag eq 'mathresponse'))) {
+ $increment=&Apache::response::scored_response($partid,$id);
} else {
- $format=$formats[0];
+ my $response = &Apache::response::getresponse();
+ if ( $response =~ /[^\s]/) {
+ my %previous = &Apache::response::check_for_previous($response,$partid,$id);
+ &Apache::lonxml::debug("submitted a $response
\n");
+ &Apache::lonxml::debug($$parstack[-1] . "\n
");
+
+ if ( &Apache::response::submitted('scantron')) {
+ &add_in_tag_answer($parstack,$safeeval);
+ my ($values,$display)=&make_numerical_bubbles($partid,$id,
+ $target,$parstack,$safeeval);
+ $response=$values->[$response];
+ }
+ $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
+ my ($ad,$msg,$name)=&check_submission($response,$partid,$id,
+ $tag,$parstack,
+ $safeeval);
+
+ &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");
+ if ($Apache::lonhomework::type eq 'survey' &&
+ ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
+ $ad eq 'EXACT_ANS')) {
+ $ad='SUBMITTED';
+ }
+ &Apache::response::handle_previous(\%previous,$ad);
+ $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
+ $Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg;
+ $Apache::lonhomework::results{"resource.$partid.$id.answername"}=$name;
+ $result='';
+ }
+ }
+ } elsif ($target eq 'web' || $target eq 'tex') {
+ &check_for_answer_errors($parstack,$safeeval);
+ my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
+ my $status = $Apache::inputtags::status['-1'];
+ if ($Apache::lonhomework::type eq 'exam') {
+ # FIXME support multi dimensional numerical problems
+ # in exam bubbles
+ my ($bubble_values,$bubble_display)=
+ &make_numerical_bubbles($partid,$id,$target,$parstack,
+ $safeeval);
+ my $number_of_bubbles = scalar(@{ $bubble_values });
+ my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
+ $safeeval);
+ my @alphabet=('A'..'Z');
+ if ($target eq 'web') {
+ if ($tag eq 'numericalresponse') {
+ if ($unit=~/\S/) {$result.=' (in '.$unit.')
';}
+ $result.= '';
+ }
+ } elsif ($target eq 'tex') {
+ if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {
+ $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
+ }
+ if ($tag eq 'numericalresponse') {
+ my ($celllength,$number_of_tables,@table_range)=
+ &get_table_sizes($number_of_bubbles,$bubble_display);
+ 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 \setlength{\tabcolsep}{2 mm}\begin{tabular}{';
+ for (my $ind=0;$ind<$table_range[$j];$ind++) {
+ $result.='p{3 mm}p{'.$celllength.' mm}';
+ }
+ $result.='}';
+ for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
+ $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_display->[$ind].'} ';
+ if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
+ }
+ $cou += $table_range[$j];
+ $j++;
+ $result.='\\\\\end{tabular}\vskip 0 mm ';
+ }
+ $result.='\end{enumerate}';
+ } else {
+ $increment = &Apache::response::repetition();
+ }
+ }
+ }
+ &Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical);
+ } elsif ($target eq 'edit') {
+ $result.=' |
'.&Apache::edit::end_table;
+ } elsif ($target eq 'answer' || $target eq 'analyze') {
+ my $part_id="$partid.$id";
+ if ($target eq 'analyze') {
+ push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+ $Apache::lonhomework::analyze{"$part_id.type"} = $tag;
+ my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
+ if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
+ push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);
+ &Apache::response::check_if_computed($token,$parstack,
+ $safeeval,'answer');
+ }
+ if (scalar(@$tagstack)) {
+ &Apache::response::setup_params($tag,$safeeval);
+ }
+ &add_in_tag_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 'answer') {
+ $result.=&Apache::response::answer_header($tag,undef,
+ scalar(keys(%answer)));
+ if ($tag eq 'numericalresponse'
+ && $Apache::lonhomework::type eq 'exam') {
+ my ($bubble_values,undef,$correct) = &make_numerical_bubbles($partid,
+ $id,$target,$parstack,$safeeval);
+ $result.=&Apache::response::answer_part($tag,$correct);
+ }
+ }
+ foreach my $name (sort(keys(%answer))) {
+ my @answers = @{ $answer{$name}{'answers'} };
+ if ($target eq 'analyze') {
+ foreach my $info ('answer','ans_high','ans_low','format') {
+ $Apache::lonhomework::analyze{"$part_id.$info"}{$name}=[];
+ }
+ }
+ my ($sigline,$tolline);
+ if ($name ne $tag_internal_answer_name
+ || scalar(keys(%answer)) > 1) {
+ $result.=&Apache::response::answer_part($tag,$name);
+ }
+ for(my $i=0;$i<=$#answers;$i++) {
+ my $ans=$answers[$i];
+ my $fmt=$formats[0];
+ if (@formats && $#formats) {$fmt=$formats[$i];}
+ my ($sighigh,$siglow);
+ if ($Apache::inputtags::params{'sig'}) {
+ ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
+ }
+ my @vector;
+ if (ref($ans)) {
+ @vector = @{ $ans };
+ } else {
+ @vector = ($ans);
+ }
+ my @all_answer_info;
+ foreach my $element (@vector) {
+ my ($high,$low);
+ if ($Apache::inputtags::params{'tol'}) {
+ ($high,$low)=&get_tolrange($element,$Apache::inputtags::params{'tol'});
+ }
+ if ($target eq 'answer') {
+ if ($fmt && $tag eq 'numericalresponse') {
+ $fmt=~s/e/E/g;
+ if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; }
+ if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; }
+ $element = &format_number($element,$fmt,$target,$safeeval);
+ #if ($high) {
+ # $high=&format_number($high,$fmt,$target,$safeeval);
+ # $low =&format_number($low,$fmt,$target,$safeeval);
+ #}
+ }
+ if ($high && $tag eq 'numericalresponse') {
+ $element.='; ['.$low.'; '.$high.']';
+ $tolline .= "[$low, $high]";
+ }
+ if (defined($sighigh) && $tag eq 'numericalresponse') {
+ if ($env{'form.answer_output_mode'} eq 'tex') {
+ $element.= "; Sig $siglow - $sighigh";
+ } else {
+ $element.= " Sig