--- loncom/homework/caparesponse/caparesponse.pm 2003/04/07 23:19:58 1.89 +++ loncom/homework/caparesponse/caparesponse.pm 2003/04/08 03:54:22 1.90 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.89 2003/04/07 23:19:58 albertel Exp $ +# $Id: caparesponse.pm,v 1.90 2003/04/08 03:54:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -85,62 +85,60 @@ sub start_numericalresponse { sub end_numericalresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $increment=1; my $result = ''; if (!$Apache::lonxml::default_homework_loaded) { &Apache::lonxml::default_homework_load($safeeval); } - if ( $target eq 'grade' ) { - if ( defined $ENV{'form.submitted'}) { - &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']; - my $response = &Apache::response::getresponse(); - if ( $response =~ /[^\s]/) { - my $ad; - 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
"); - if ($Apache::lonhomework::type eq 'exam' && - ($$tagstack[-1] eq 'numericalresponse')) { - &Apache::response::setrandomnumber(); - #FIXME the 8 here is based off of number of powers need a parameter - my $ind=&Math::Random::random_uniform_integer(1,0,8); - if ($ind eq $response) { $ad='CORRECT'; } else { $ad='INCORRECT'; } - } else { - $response =~ s/\\/\\\\/g; - $response =~ s/\'/\\\'/g; - &Apache::lonxml::debug("current $response"); - my $expression="&caparesponse_check_list('".$response."','". - $$parstack[-1]; - foreach my $key (keys(%Apache::inputtags::params)) { - $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; - ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); - &Apache::lonxml::debug("$expression"); - &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); - } - &Apache::response::handle_previous(\%previous,$ad); - $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; - $result=''; - } + if ( $target eq 'grade' && defined $ENV{'form.submitted'}) { + &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']; + my $response = &Apache::response::getresponse(); + if ( $response =~ /[^\s]/) { + my $ad; + 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
"); + + if ($ENV{'form.submitted'} eq 'scantron') { + &Apache::response::setrandomnumber(); + #FIXME the 8 here is based off of number of powers need a parameter + my $ind=&Math::Random::random_uniform_integer(1,0,8); + if ($ind eq $response) { $ad='CORRECT'; } else { $ad='INCORRECT'; } + } + $response =~ s/\\/\\\\/g; + $response =~ s/\'/\\\'/g; + &Apache::lonxml::debug("current $response"); + my $expression="&caparesponse_check_list('".$response."','". + $$parstack[-1]; + foreach my $key (keys(%Apache::inputtags::params)) { + $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; + ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); + &Apache::lonxml::debug("$expression"); + &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); + &Apache::response::handle_previous(\%previous,$ad); + $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; + $result=''; } } elsif ($target eq 'web' || $target eq 'tex') { + my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack, + $safeeval); my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; my $status = $Apache::inputtags::status['-1']; if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) { - 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, @@ -183,113 +181,51 @@ sub end_numericalresponse { } } if ($Apache::lonhomework::type eq 'exam') { - my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack, - $safeeval); + my $number_of_bubbles = 8; #default values for number of bubbles my (@formats)=&Apache::lonxml::get_param_var('format',$parstack, $safeeval); my $unit=&Apache::lonxml::get_param_var('unit',$parstack, $safeeval); - my $number_of_bubbles = 8; #default values for number of bubbles - my @bubbles_values = (); - my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors - my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers - &Apache::response::setrandomnumber(); - my $ind=&Math::Random::random_uniform_integer(1,0,$#powers); - my $power = $powers[$ind]; - $ind=&Math::Random::random_uniform_integer(1,0,$#factors); - my $factor = $factors[$ind]; - for ($ind=0;$ind<$number_of_bubbles;$ind++) { - $bubbles_values[$ind] = $answers[0]*($factor**($power-$powers[$#powers-$ind])); - } + my @bubble_values=&make_numerical_bubbles($number_of_bubbles, + @answers); my @alphabet=('A'..'Z'); + my $id=$Apache::inputtags::response[-1]; if ($target eq 'web') { if ($$tagstack[-1] eq 'numericalresponse') { - my $id=$Apache::inputtags::response[-1]; if ($unit=~/\S/) {$result.=' (in '.$unit.')

';} $result.= ''; - for ($ind=0;$ind<$number_of_bubbles;$ind++) { - my $ans; - if ($formats[0] ne '') { - $ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]); - } else { - my $badans = $bubbles_values[$ind]; - my $format = ''; - #What is the number? (integer,decimal,floating point) - if ($badans=~/^(\d*\.?\d*)(E|e)(\d*)$/) { - $format = 'e'.$2; - } elsif ($badans=~/^(\d*)\.(\d*)$/) { - $format = '4f'; - } elsif ($badans=~/^(\d*)$/) { - $format = 'd'; - } - $ans = sprintf('%.'.$format,$bubbles_values[$ind]); - } - $result.=''; + for (my $ind=0;$ind<$number_of_bubbles;$ind++) { + my $ans=&format_number($bubble_values[$ind], + $formats[0]); + $result.=''; } $result.='
'.$alphabet[$ind].': '.$ans.''.$alphabet[$ind]. + ': '.$ans.'
'; } elsif ($$tagstack[-1] eq 'formularesponse') { - $result.= '



'; + $result.= '

+

'; } } elsif ($target eq 'tex') { if (defined $unit and $Apache::lonhomework::type eq 'exam') { $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} '; } if ($$tagstack[-1] eq 'numericalresponse') { - my $max_val = 0; - if ($formats[0]=~m/^(\d+)E([^\d]*)(\d*)$/) { - $max_val=$1+$2+4; - } else { - $max_val=4; - } - $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;} - if ($number_of_bubbles % $max_val != 0) { - $number_of_tables++; - push @table_range,($number_of_bubbles % $max_val); - } + my ($celllength,$number_of_tables,@table_range)= + &get_table_sizes($formats[0],$number_of_bubbles); 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 \begin{tabular}{'; - for ($ind=0;$ind<$table_range[$j];$ind++) { + for (my $ind=0;$ind<$table_range[$j];$ind++) { $result.='lp{'.$celllength.' mm}'; } $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 = ''; - #What is the number? (integer,decimal,floating point) - if ($badans=~/^(\d*\.?\d*)(E|e)(\d*)$/) { - $format = 'e'.$2; - } elsif ($badans=~/^(\d*)\.(\d*)$/) { - $format = '4f'; - } elsif ($badans=~/^(\d*)$/) { - $format = 'd'; - } - $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 - } - } + for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) { + my $ans=&format_number($bubble_values[$ind], + $formats[0],$target); $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} '; if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';} } @@ -298,7 +234,6 @@ sub end_numericalresponse { $result.='\\\\\end{tabular}\vskip 0 mm '; } $result.='\end{enumerate}'; - &Apache::lonxml::increment_counter(); } else { $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}'; my $id = $Apache::inputtags::part; @@ -308,8 +243,8 @@ sub end_numericalresponse { $result.='\begin{enumerate}'; for (my $i=0;$i<$repetition;$i++) { $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm'; - &Apache::lonxml::increment_counter(); } + $increment=$repetition; $result.= '\end{enumerate}'; } } @@ -334,14 +269,8 @@ sub end_numericalresponse { } for(my $i=0;$i<=$#answers;$i++) { my $ans=$answers[$i]; - my $fmt; - if (@formats) { - if ($#formats) { - $fmt=$formats[$i]; - } else { - $fmt=$formats[0]; - } - } + my $fmt=$formats[0]; + if (@formats && $#formats) {$fmt=$formats[$i];} my ($high,$low); if ($Apache::inputtags::params{'tol'}) { ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'}); @@ -353,7 +282,8 @@ sub end_numericalresponse { if ($fmt) { $ans = sprintf('%.'.$fmt,$ans); if ($high) { - $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low); + $high=sprintf('%.'.$fmt,$high); + $low =sprintf('%.'.$fmt,$low); } } if ($target eq 'answer') { @@ -404,10 +334,79 @@ sub end_numericalresponse { $result.=&Apache::response::answer_footer($$tagstack[-1]); } } + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::lonxml::increment_counter($increment); + } &Apache::response::end_response; return $result; } +sub get_table_sizes { + my ($format,$number_of_bubbles)=@_; + my $max_val = 0; + if ($format=~m/^(\d+)E([^\d]*)(\d*)$/) { + $max_val=$1+$2+4; + } else { + $max_val=4; + } + $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;} + if ($number_of_bubbles % $max_val != 0) { + $number_of_tables++; + push @table_range,($number_of_bubbles % $max_val); + } + return ($celllength,$number_of_tables,@table_range); +} + +sub format_number { + my ($number,$format,$target)=@_; + my $ans; + if ($format ne '') { + $ans = sprintf('%.'.$format,$number); + } else { + my $format = ''; + #What is the number? (integer,decimal,floating point) + if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) { + $format = 'e'.$2; + } elsif ($number=~/^(\d*)\.(\d*)$/) { + $format = '4f'; + } elsif ($number=~/^(\d*)$/) { + $format = 'd'; + } + $ans = sprintf('%.'.$format,$number); + } + if ($target eq 'tex') { + 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 + } + } + return $ans; +} + +sub make_numerical_bubbles { + my ($number_of_bubbles,@answers) =@_; + my @bubbles_values = (); + my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors + my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers + &Apache::response::setrandomnumber(); + my $ind=&Math::Random::random_uniform_integer(1,0,$#powers); + my $power = $powers[$ind]; + $ind=&Math::Random::random_uniform_integer(1,0,$#factors); + my $factor = $factors[$ind]; + for ($ind=0;$ind<$number_of_bubbles;$ind++) { + $bubbles_values[$ind] = $answers[0]*($factor**($power-$powers[$#powers-$ind])); + } + return @bubbles_values; +} + sub get_tolrange { my ($ans,$tol)=@_; my ($high,$low);