--- loncom/homework/caparesponse/caparesponse.pm 2002/11/13 23:37:56 1.72 +++ loncom/homework/caparesponse/caparesponse.pm 2003/03/21 15:33:46 1.84 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.72 2002/11/13 23:37:56 albertel Exp $ +# $Id: caparesponse.pm,v 1.84 2003/03/21 15:33:46 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -85,14 +85,17 @@ sub start_numericalresponse { $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); + $result.=&Apache::edit::text_arg('Unit:','unit',$token,5). + &Apache::loncommon::help_open_topic('Physical_Units'); + $result.=&Apache::edit::text_arg('Format:','format',$token,4). + &Apache::loncommon::help_open_topic('Numerical_Response_Format'); } elsif ($token->[1] eq 'stringresponse') { $result.=&Apache::edit::select_arg('Type:','type', [['cs','Case Sensitive'],['ci','Case Insensitive'], ['mc','Case Insensitive, Any Order']],$token); } elsif ($token->[1] eq 'formularesponse') { - $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40); + $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40). + &Apache::loncommon::help_open_topic('Formula_Response_Sampling'); } $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { @@ -113,6 +116,8 @@ sub start_numericalresponse { } } elsif ($target eq 'meta') { $result=&Apache::response::meta_package_write('numericalresponse'); + } elsif ($target eq 'answer' || $target eq 'grade') { + &Apache::response::reset_params(); } return $result; } @@ -120,6 +125,9 @@ sub start_numericalresponse { sub end_numericalresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; 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]); @@ -128,9 +136,6 @@ sub end_numericalresponse { my $id = $Apache::inputtags::response['-1']; my $response = $ENV{'form.HWVAL'.$id}; if ( $response =~ /[^\s]/) { - if (!$Apache::lonxml::default_homework_loaded) { - &Apache::lonxml::default_homework_load($safeeval); - } 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"); @@ -139,7 +144,7 @@ sub end_numericalresponse { $response =~ s/\'/\\\'/g; &Apache::lonxml::debug("current $response"); my $expression="&caparesponse_check_list('".$response."','". - $$parstack[$#$parstack]; + $$parstack[-1]; foreach my $key (keys(%Apache::inputtags::params)) { $expression.= ';my $'. #' $key.'="'.$Apache::inputtags::params{$key}.'"'; @@ -173,7 +178,7 @@ sub end_numericalresponse { if ($target eq 'web') { $result="
The correct answer is "; } elsif ($target eq 'tex') { - $result='\vskip 0 mm The correct answer is \\texttt{'; + #$result='\vskip 0 mm The correct answer is \\texttt{'; } for (my $i=0; $i <= $#answers; $i++) { my $answer=$answers[$i]; @@ -191,15 +196,19 @@ sub end_numericalresponse { &Apache::lonxml::debug("no format answer :$answer:"); $formatted="$answer,"; } - if ($target eq 'tex') {$formatted=&Apache::lonxml::latex_special_symbols($formatted);} - $result.=$formatted; - } + + if ($target eq 'tex') { + $formatted=''; + #$formatted=&Apache::lonxml::latex_special_symbols($formatted); + } + $result.=$formatted; + } chop $result; if ($target eq 'web') { $result.=" $unit.
"; } elsif ($target eq 'tex') { - $result.=&Apache::lonxml::latex_special_symbols($unit); - $result.="}. \\vskip 0 mm "; + #$result.=&Apache::lonxml::latex_special_symbols($unit); + #$result.="}. \\vskip 0 mm "; } } if ($Apache::lonhomework::type eq 'exam') { @@ -214,19 +223,20 @@ sub end_numericalresponse { my $powers_number = 8; #default values for number of powers my $symb; if ($ENV{'form.symb'}=~/___\d+___/) {$symb=$ENV{'form.symb'};} else {$symb=$ENV{'request.symb'};} - my $randomseed = srand(&Apache::lonnet::rndseed($symb,$ENV{'request.course.id'}, - $ENV{'user.domain'},$ENV{'user.name'})); - my $ind=1+int(rand()*($factors_number-1)); - my $factor = $factors[$ind]; - $ind=1+int(rand()*($powers_number-1)); + + &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_number-$ind-1]); - } - my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P', - 'Q','R','S','T','U','V','W','X','Y','Z'); + $bubbles_values[$ind] = $answers[0]*($factor**($power-$powers[$#powers-$ind])); + } + my @alphabet=('A'..'Z'); if ($target eq 'web') { + if ($$tagstack[-1] eq 'numericalresponse') { my $id=$Apache::inputtags::response[-1]; + $result.=' (in '.$unit.')

'; $result.= ''; for ($ind=0;$ind<$number_of_bubbles;$ind++) { my $ans; @@ -248,71 +258,91 @@ sub end_numericalresponse { $result.=''; } $result.='
'.$alphabet[$ind].': '.$ans.'
'; + } elsif ($$tagstack[-1] eq 'formularesponse') { + $result.= '

Formula have to be entered here!

'; + } } elsif ($target eq 'tex') { - 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 $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++) { - $result.='lp{'.$celllength.' mm}'; + 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); } - $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 - } - } - $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} '; - if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';} - } - $cou += $table_range[$j]; - $j++; - $result.='\\\\\end{tabular}\vskip 0 mm '; + 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++) { + $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 + } + } + $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} '; + if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';} + } + $cou += $table_range[$j]; + $j++; + $result.='\\\\\end{tabular}\vskip 0 mm '; + } + $result.='\end{enumerate}'; + &Apache::lonxml::increment_counter(); + } else { + $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}'; + my $id = $Apache::inputtags::part; + my $weight = &Apache::lonnet::EXT("resource.$id.weight"); + my $repetition = int $weight/9; + if ($weight % 9 != 0) {$repetition++;} + $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(); + } + $result.= '\end{enumerate}'; } - $result.='\end{enumerate}'; - &Apache::lonxml::increment_counter(); } } } elsif ($target eq 'edit') { @@ -358,8 +388,8 @@ sub end_numericalresponse { } } if ($target eq 'answer') { - if ($high) { $ans.=' ['.$low.','.$high.'] '; } - if ($sighigh) { $ans.= "Sig $siglow - $sighigh"; } + if ($high) { $ans.=' ['.$low.','.$high.']'; } + if ($sighigh) { $ans.= " Sig $siglow - $sighigh"; } $result.=&Apache::response::answer_part($$tagstack[-1],$ans); } elsif ($target eq 'analyze') { push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} },