';
+ $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);
+ } elsif ($token->[1] eq 'stringresponse') {
+ $result.=&Apache::edit::select_arg('Type:','type',
+ ['cs','ci','mc'],$token);
+ } elsif ($token->[1] eq 'formularesponse') {
+ $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
+ }
+ $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
- my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
- 'answer','unit');
+ my $constructtag;
+ if ($token->[1] eq 'numericalresponse') {
+ $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 'answer','unit','format');
+ } elsif ($token->[1] eq 'stringresponse') {
+ $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 'answer','type');
+ } elsif ($token->[1] eq 'formularesponse') {
+ $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 'answer','samples');
+ }
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;
}
@@ -76,56 +121,310 @@ sub end_numericalresponse {
my $result = '';
if ( $target eq 'grade' ) {
if ( defined $ENV{'form.submitted'}) {
+ &Apache::response::setup_params($$tagstack[-1]);
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
- my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+ my $partid = $Apache::inputtags::part;
+ my $id = $Apache::inputtags::response['-1'];
+ my $response = $ENV{'form.HWVAL'.$id};
if ( $response =~ /[^\s]/) {
- my $id = $Apache::inputtags::response['-1'];
- my $previous= &Apache::response::check_for_previous($response,$id,$response);
- if ( $previous ) {
- $result = 'PREVIOUSLY_USED';
- } else {
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$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].
- ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
- ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
- "');";
- $result = &Apache::run::run($expression,$safeeval);
- my ($awards) = split /:/ , $result;
- my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
- &Apache::lonxml::debug("$expression");
- &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n");
- $result='';
+ 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";';
}
+ $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");
+ &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::run::run("{$$parstack['-1'];".'return $answer}',$safeeval);
- my (@answers)=&Apache::run::run("$answervar",$safeeval);
- my $unit=&Apache::run::run("{$$parstack['-1'];".'return $unit}',$safeeval);
-
- $result="
The computer got ";
- my $answer;
- foreach $answer (@answers) { $result.="$answer,"; }
- chop $result;
- $result.=" $unit.
";
+ } elsif ($target eq 'web' || $target eq 'tex') {
+ if ($Apache::lonhomework::type ne 'exam') {
+ 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,$safeeval);
+
+ if ($target eq 'web') {
+ $result="
The correct answer is ";
+ } elsif ($target eq 'tex') {
+ $result='\vskip 0 mm The correct answer is \\texttt{';
+ }
+ for (my $i=0; $i <= $#answers; $i++) {
+ my $answer=$answers[$i];
+ my $format;
+ if ($#formats > 0) {
+ $format=$formats[$i];
+ } else {
+ $format=$formats[0];
+ }
+ my $formatted;
+ if ((defined($format)) && ($format ne '')) {
+ &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
+ $formatted=sprintf('%.'.$format,$answer).',';
+ } else {
+ &Apache::lonxml::debug("no format answer :$answer:");
+ $formatted="$answer,";
+ }
+ if ($target eq 'tex') {$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 ";
+ }
+ }
+ } else {
+ 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,$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
+ 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));
+ my $power = $powers[$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');
+ if ($target eq 'web') {
+ $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.='| '.$alphabet[$ind].': '.$ans.' | ';
+ }
+ $result.='
';
+ } elsif ($target eq 'tex') {
+ my $max_val = 0;
+ if ($formats[0]=~m/^(\d+)E([^\d]*)(\d*)$/) {
+ $max_val=$1+$2+4;
+ } else {
+ $max_val=5;
+ }
+ $max_val = int(90/(($max_val+6)*2));
+ my $celllength = 90/$max_val-12;
+ 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 2 mm \noindent ';
+ for (my $i=0;$i<$number_of_tables;$i++) {
+ $result.='\vskip 0 mm \noindent \begin{tabular}{|';
+ for ($ind=0;$ind<$table_range[$j];$ind++) {
+ $result.='lp{'.$celllength.' mm}|';
+ }
+ $result.='}\hline';
+ for ($ind=$cou;$ind<$cou+$table_range[$j];$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.=' '.$alphabet[$ind].': & '.$ans.' ';
+ if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
+ }
+ $cou += $table_range[$j];
+ $j++;
+ $result.='\\\\\hline\end{tabular}\vskip 0 mm ';
+ }
+ }
}
} elsif ($target eq 'edit') {
$result.=' |
'.&Apache::edit::end_table;
+ } elsif ($target eq 'answer') {
+
+ &Apache::response::setup_params($$tagstack[-1]);
+ 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,$safeeval);
+ my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
+
+ $result.=&Apache::response::answer_header($$tagstack[-1]);
+ 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 ($high,$low);
+ if ($Apache::inputtags::params{'tol'}) {
+ ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});
+ }
+ my ($sighigh,$siglow);
+ if ($Apache::inputtags::params{'sig'}) {
+ ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
+ }
+ if ($fmt) {
+ $ans = sprintf('%.'.$fmt,$ans);
+ if ($high) {
+ $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low);
+ }
+ }
+ if ($high) { $ans.=' ['.$low.','.$high.'] '; }
+ if ($sighigh) { $ans.= "Sig