--- loncom/homework/caparesponse/caparesponse.pm 2003/02/23 20:31:51 1.77 +++ loncom/homework/caparesponse/caparesponse.pm 2003/04/07 22:44:32 1.87 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.77 2003/02/23 20:31:51 www Exp $ +# $Id: caparesponse.pm,v 1.87 2003/04/07 22:44:32 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,7 +46,7 @@ sub end_caparesponse { if ( $target eq 'grade' ) { if ( defined $ENV{'form.submitted'}) { $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); - my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}; + my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']}; if ( $response =~ /[^\s]/) { my $id = $Apache::inputtags::response['-1']; my $previous= &Apache::response::check_for_previous($response,$id,$response); @@ -94,7 +94,8 @@ sub start_numericalresponse { [['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') { @@ -132,31 +133,34 @@ sub end_numericalresponse { &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 = $ENV{'form.HWVAL'.$id}; + my $response = &Apache::response::getresponse(); 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}.'"'; - } - if ($$tagstack[-1] eq 'formularesponse') { - $expression.=';my $type="fml";'; - } elsif ($$tagstack[-1] eq 'numericalresponse') { - $expression.=';my $type="float";'; + if ($Apache::lonhomework::type eq 'exam') { + + } 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; + my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); } - $expression.="');"; - $result = &Apache::run::run($expression,$safeeval); - my ($awards) = split /:/ , $result; - my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; &Apache::lonxml::debug("$expression"); @@ -220,22 +224,20 @@ sub end_numericalresponse { my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers my $factors_number = 5; #default values for number of factors 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]; + if ($unit=~/\S/) {$result.=' (in '.$unit.')

';} $result.= ''; for ($ind=0;$ind<$number_of_bubbles;$ind++) { my $ans; @@ -254,13 +256,16 @@ sub end_numericalresponse { } $ans = sprintf('%.'.$format,$bubbles_values[$ind]); } - $result.=''; + $result.=''; } $result.='
'.$alphabet[$ind].': '.$ans.''.$alphabet[$ind].': '.$ans.'
'; } elsif ($$tagstack[-1] eq 'formularesponse') { - $result.= '

Formula have to be entered here!

'; + $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*)$/) { @@ -327,10 +332,18 @@ sub end_numericalresponse { $result.='\end{enumerate}'; &Apache::lonxml::increment_counter(); } else { - $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}'; - $result.= '\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Live blank on scoring form}\vskip 0 mm \end{enumerate}'; - &Apache::lonxml::increment_counter(); - } + $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\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}'; + } } } } elsif ($target eq 'edit') {