--- loncom/homework/caparesponse/caparesponse.pm 2005/11/16 22:52:31 1.181 +++ loncom/homework/caparesponse/caparesponse.pm 2006/03/09 00:41:13 1.188 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.181 2005/11/16 22:52:31 albertel Exp $ +# $Id: caparesponse.pm,v 1.188 2006/03/09 00:41:13 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -76,12 +76,12 @@ sub end_answergroup { } sub start_value { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || $target eq 'webgrade' || $target eq 'answer' || $target eq 'analyze' ) { - my $bodytext = &Apache::lonxml::get_all_text("/value",$parser); + my $bodytext = &Apache::lonxml::get_all_text("/value",$parser,$style); $bodytext = &Apache::run::evaluate($bodytext,$safeeval, $$parstack[-1]); push(@{ $answer{$cur_name}{'answers'} },$bodytext); @@ -96,12 +96,12 @@ sub end_value { } sub start_array { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || $target eq 'webgrade' || $target eq 'answer' || $target eq 'analyze' ) { - my $bodytext = &Apache::lonxml::get_all_text("/value",$parser); + my $bodytext = &Apache::lonxml::get_all_text("/array",$parser,$style); my @values = &Apache::run::evaluate($bodytext,$safeeval, $$parstack[-1]); push(@{ $answer{$cur_name}{'answers'} },@values); @@ -191,17 +191,22 @@ sub start_numericalresponse { $safeeval); for (my $i=0; $i <= $#answers; $i++) { my $answer=$answers[$i]; - my $format; - if ($#formats > 0) { - $format=$formats[$i]; + if ( scalar(@$tagstack) + && $tagstack->[-1] ne 'numericalresponse') { + $answertxt.=$answer.','; } else { - $format=$formats[0]; + my $format; + if ($#formats > 0) { + $format=$formats[$i]; + } else { + $format=$formats[0]; + } + if ($unit=~/\$/) { $format="\$".$format; $unit=~s/\$//g; } + if ($unit=~/\,/) { $format="\,".$format; $unit=~s/\,//g; } + my $formatted=&format_number($answer,$format,$target, + $safeeval); + $answertxt.=$formatted.','; } - if ($unit=~/\$/) { $format="\$".$format; $unit=~s/\$//g; } - if ($unit=~/\,/) { $format="\,".$format; $unit=~s/\,//g; } - my $formatted=&format_number($answer,$format,$target, - $safeeval); - $answertxt.=$formatted.','; } chop $answertxt; if ($target eq 'web') { @@ -300,13 +305,8 @@ sub end_numericalresponse { &Apache::lonxml::debug($$parstack[-1] . "\n
"); if ( &Apache::response::submitted('scantron')) { - my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles'); - if (!$number_of_bubbles) { $number_of_bubbles=8; } - my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); - my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); - my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval); - if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); } - my ($values,$display)=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect,$safeeval); + my ($values,$display)=&make_numerical_bubbles($partid,$id, + $target,$parstack,$safeeval); $response=$values->[$response]; } $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; @@ -339,22 +339,12 @@ sub end_numericalresponse { my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; my $status = $Apache::inputtags::status['-1']; if ($Apache::lonhomework::type eq 'exam') { - my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles'); - if ($Apache::inputtags::params{'numbubbles'}) { - $number_of_bubbles = $Apache::inputtags::params{'numbubbles'}; - } - if (!$number_of_bubbles) { $number_of_bubbles=8; } - - my (@formats)=&Apache::lonxml::get_param_var('format',$parstack, - $safeeval); + 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 (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval); - if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); } - my ($bubble_values,$bubble_display)= - &make_numerical_bubbles($number_of_bubbles, - $target,$answers[0], - $formats[0],\@incorrect,$safeeval); my @alphabet=('A'..'Z'); if ($target eq 'web') { if ($tag eq 'numericalresponse') { @@ -372,10 +362,6 @@ sub end_numericalresponse { $bubble_display->[$ind].''; } $result.=''; - } elsif ($tag eq 'formularesponse') { - $result.= '

-

'; } } elsif ($target eq 'tex') { if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) { @@ -403,14 +389,7 @@ sub end_numericalresponse { } $result.='\end{enumerate}'; } else { - $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}'; - my $repetition = &Apache::response::repetition(); - $result.='\begin{enumerate}'; - for (my $i=0;$i<$repetition;$i++) { - $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).'}.]\textit{Leave blank on scoring form}\vskip 0 mm'; - } - $increment=$repetition; - $result.= '\end{enumerate}'; + $increment = &Apache::response::repetition(); } } } @@ -437,6 +416,12 @@ sub end_numericalresponse { if ($target eq 'answer') { $result.=&Apache::response::answer_header($tag); + 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); + } } my ($sigline,$tolline); for(my $i=0;$i<=$#answers;$i++) { @@ -517,7 +502,7 @@ sub end_numericalresponse { if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') { my $error; if ($tag eq 'formularesponse') { - $error=&mt('Computer\'s answer is incorrect ("[_1]").'); + $error=&mt('Computer\'s answer is incorrect ("[_1]").',$response); } else { # answer failed check if it is sig figs that is failing my ($ad,$msg)=&check_submission($response,$partid,$id, @@ -613,7 +598,7 @@ sub format_number { my $ans; if ($format eq '') { #What is the number? (integer,decimal,floating point) - if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) { + if ($number=~/^(\d*\.?\d*)(E|e)[+\-]?(\d*)$/) { $format = '3e'; } elsif ($number=~/^(\d*)\.(\d*)$/) { $format = '4f'; @@ -629,35 +614,56 @@ sub format_number { } sub make_numerical_bubbles { - my ($number_of_bubbles,$target,$answer,$format,$incorrect,$safeeval) =@_; + my ($part,$id,$target,$parstack,$safeeval) =@_; + + my $number_of_bubbles = + &Apache::response::get_response_param($part.'_'.$id,'numbubbles',8); + + my ($format)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); + my ($answer)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); + my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack, + $safeeval); + if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); } + my @bubble_values=(); - &Apache::lonxml::debug("answer is $answer incorrect is $incorrect"); + my @alphabet=('A'..'Z'); + + &Apache::lonxml::debug("answer is $answer incorrect is @incorrect"); my @oldseed=&Math::Random::random_get_seed(); - if (defined($incorrect) && ref($incorrect)) { - &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1 gt $number_of_bubbles)); - if (defined($$incorrect[0]) && - scalar(@$incorrect)+1 >= $number_of_bubbles) { - &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1).":$number_of_bubbles"); + if (@incorrect) { + &Apache::lonxml::debug("inside ".(scalar(@incorrect)+1 gt $number_of_bubbles)); + if (defined($incorrect[0]) && + scalar(@incorrect)+1 >= $number_of_bubbles) { + &Apache::lonxml::debug("inside ".(scalar(@incorrect)+1).":$number_of_bubbles"); &Apache::response::setrandomnumber(); - my @rand_inc=&Math::Random::random_permutation(@$incorrect); + my @rand_inc=&Math::Random::random_permutation(@incorrect); @bubble_values=@rand_inc[0..($number_of_bubbles-2)]; @bubble_values=sort {$a <=> $b} (@bubble_values,$answer); - &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values)); + &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": which are :".join(':',@bubble_values)); &Math::Random::random_set_seed(@oldseed); + + my $correct; + for(my $i=0; $i<=$#bubble_values;$i++) { + if ($bubble_values[$i] eq $answer) { + $correct = $alphabet[$i]; + last; + } + } + if (defined($format) && $format ne '') { my @bubble_display; foreach my $value (@bubble_values) { push(@bubble_display, &format_number($value,$format,$target,$safeeval)); } - return (\@bubble_values,\@bubble_display); + return (\@bubble_values,\@bubble_display,$correct); } else { - return (\@bubble_values,\@bubble_values); + return (\@bubble_values,\@bubble_values,$correct); } } - if (defined($$incorrect[0]) && - scalar(@$incorrect)+1 < $number_of_bubbles) { - &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them (".join(',',@$incorrect).")."); + if (defined($incorrect[0]) && + scalar(@incorrect)+1 < $number_of_bubbles) { + &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them (".join(',',@incorrect).")."); } } my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors @@ -674,8 +680,9 @@ sub make_numerical_bubbles { $format,$target,$safeeval); } + my $correct = $alphabet[$number_of_bubbles-$power]; &Math::Random::random_set_seed(@oldseed); - return (\@bubble_values,\@bubble_display); + return (\@bubble_values,\@bubble_display,$correct); } sub get_tolrange { @@ -838,19 +845,6 @@ sub end_stringresponse { $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg; } } - } elsif ($target eq 'web' || $target eq 'tex') { - my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; - my $status = $Apache::inputtags::status['-1']; - if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') { - $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}'; - $increment = &Apache::response::repetition(); - $result.='\begin{enumerate}'; - for (my $i=0;$i<$increment;$i++) { - $result.='\item[\textbf{'.($Apache::lonxml::counter+$i). - '}.]\textit{Leave blank on scoring form}\vskip 0 mm'; - } - $result.= '\end{enumerate}'; - } } elsif ($target eq 'answer' || $target eq 'analyze') { if ($target eq 'analyze') { push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");