--- loncom/homework/caparesponse/caparesponse.pm	2003/05/19 21:15:21	1.102
+++ loncom/homework/caparesponse/caparesponse.pm	2003/10/23 07:54:55	1.118
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.102 2003/05/19 21:15:21 albertel Exp $
+# $Id: caparesponse.pm,v 1.118 2003/10/23 07:54:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,6 +41,8 @@ sub start_numericalresponse {
     if ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::text_arg('Answer:','answer',$token);
+	$result.=&Apache::edit::text_arg('Incorrect Answers:','incorrect',
+					 $token);
 	if ($token->[1] eq 'numericalresponse') {
 	    $result.=&Apache::edit::text_arg('Unit:','unit',$token,5).
 		&Apache::loncommon::help_open_topic('Physical_Units');
@@ -61,7 +63,8 @@ sub start_numericalresponse {
 	if ($token->[1] eq 'numericalresponse') {
 	    $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						      $safeeval,'answer',
-						      'unit','format');
+						      'incorrect','unit',
+						      'format');
 	} elsif ($token->[1] eq 'stringresponse') {
 	    $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						      $safeeval,'answer',
@@ -114,23 +117,22 @@ sub end_numericalresponse {
 	    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<br>\n");
 		&Apache::lonxml::debug($$parstack[-1] . "\n<br>");
 		
 		if ($ENV{'form.submitted'} eq 'scantron') {
-		    my $number_of_bubbles = 8;#default values for number of bubbles
-		    my (@formats)=&Apache::lonxml::get_param_var('format',
-								 $parstack,$safeeval);
-		    my (@answers)=&Apache::lonxml::get_param_var('answer',
-								 $parstack,$safeeval);
-		    my @values=&make_numerical_bubbles($number_of_bubbles,$target,
-						       $answers[0],$formats[0]);
+		    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);
+		    my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect);
 		    $response=$values[$response];
 		} else {
 		    $response =~ s/\\/\\\\/g;
 		    $response =~ s/\'/\\\'/g;
 		}
+		$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
 		&Apache::lonxml::debug("current $response");
 		my $expression="&caparesponse_check_list('".$response."','".
 		    $$parstack[-1];
@@ -150,6 +152,10 @@ sub end_numericalresponse {
 		    $expression.=';my $type="float";';
 		}
 		$expression.="');";
+		my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+		&Apache::lonxml::debug('answer is'.join(':',@answer));
+		@{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer;
+		
 		$result = &Apache::run::run($expression,$safeeval);
 		my ($awards) = split /:/ , $result;
 		($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
@@ -165,20 +171,13 @@ sub end_numericalresponse {
 						     $safeeval);
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
-	if (   ($award =~ /^correct/
-                && lc($Apache::lonhomework::problemstatus) ne 'no')
-             || $status eq "SHOW_ANSWER"
-             || $ENV{'form.texaward'} eq 'SHOW_ANSWER') {
+	if (  &Apache::response::show_answer() ) {
 	    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="<br />The correct answer is ";
-	    } elsif ($target eq 'tex') {
-		if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {
-		    $result='\vskip 0 mm The correct answer is \\texttt{ ';
-		}
 	    }
 	    for (my $i=0; $i <= $#answers; $i++) {
 		my $answer=$answers[$i];
@@ -190,15 +189,13 @@ sub end_numericalresponse {
 		}
 		my $formatted;
 		if ((defined($format)) && ($format ne '')) {
+		    $format=~s/e/E/g;
 		    &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
 		    $formatted=sprintf('%.'.$format,$answer).',';
 		} else {
 		    &Apache::lonxml::debug("no format answer :$answer:");
 		    $formatted="$answer,";
 		}
-		if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {
-		    $result.=$formatted;
-		}
 		if ($target eq 'tex') {
 		    $formatted='';
 		    #$formatted=&Apache::lonxml::latex_special_symbols($formatted);
@@ -208,33 +205,36 @@ sub end_numericalresponse {
 	    chop $result;
 	    if ($target eq 'web') {
 		$result.=" $unit.<br />";
-	    } elsif ($target eq 'tex') {		
-		if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {
-		    $result.=&Apache::lonxml::latex_special_symbols($unit);
-		    $result.="}. \\vskip 0 mm ";
-		}
 	    }
 	}
 	if ($Apache::lonhomework::type eq 'exam') {
-	    my $number_of_bubbles = 8; #default values for number of bubbles
+	    my $partid=$Apache::inputtags::part;
+	    my $id=$Apache::inputtags::response[-1];
+	    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 $unit=&Apache::lonxml::get_param_var('unit',$parstack,
 						    $safeeval);
+	    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
 	    my @bubble_values=&make_numerical_bubbles($number_of_bubbles,
 						      $target,$answers[0],
-						      $formats[0]);
+						      $formats[0],\@incorrect);
 	    my @alphabet=('A'..'Z');
-	    my $id=$Apache::inputtags::response[-1];
 	    if ($target eq 'web') {
 		if ($$tagstack[-1] eq 'numericalresponse') {
 		    if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}
 		    $result.= '<table border="1"><tr>';
+		    my $previous=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.$id.submission"};
 		    for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
+			my $checked='';
+			if ($previous eq $bubble_values[$ind]) {
+			    $checked=" checked='on' ";
+			}
 			$result.='<td><input type="radio" name="HWVAL_'.$id.
-			    '" value="'.$bubble_values[$ind].'"><b>'.
-				$alphabet[$ind].'</b>: '.
-				    $bubble_values[$ind].'</td>';
+			    '" value="'.$bubble_values[$ind].'" '.$checked
+			    .' /><b>'.$alphabet[$ind].'</b>: '.
+			    $bubble_values[$ind].'</td>';
 		    }
 		    $result.='</tr></table>';
 		} elsif ($$tagstack[-1] eq 'formularesponse') {
@@ -243,7 +243,7 @@ sub end_numericalresponse {
                            </textarea></font> <br /><br />';
 		}
 	    } elsif ($target eq 'tex') {
-		if (defined $unit and $Apache::lonhomework::type eq 'exam') {
+		if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {
 		    $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
 		}
 		if ($$tagstack[-1] eq 'numericalresponse') {
@@ -287,6 +287,8 @@ sub end_numericalresponse {
 	if ($target eq 'analyze') {
 	    push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
 	    $Apache::lonhomework::analyze{"$part_id.type"} = $$tagstack[-1];
+	    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
+	    push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);
 	}
 	&Apache::response::setup_params($$tagstack[-1]);
 	my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
@@ -310,6 +312,7 @@ sub end_numericalresponse {
 		($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
 	    }
 	    if ($fmt && $$tagstack[-1] eq 'numericalresponse') {
+		$fmt=~s/e/E/g;
 		$ans = sprintf('%.'.$fmt,$ans);
 		if ($high) {
 		    $high=sprintf('%.'.$fmt,$high);
@@ -320,7 +323,7 @@ sub end_numericalresponse {
 		if ($high && $$tagstack[-1] eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }
 		if ($sighigh && $$tagstack[-1] eq 'numericalresponse') {
 		    if ($ENV{'form.answer_output_mode'} eq 'tex') {
-			$ans.= " Sig \\textit{$siglow - $sighigh}";
+			$ans.= " Sig $siglow - $sighigh";
 		    } else {
 			$ans.= " Sig <i>$siglow - $sighigh</i>";
 		    }
@@ -339,17 +342,16 @@ sub end_numericalresponse {
 	    if ($target eq 'answer') {
 		if ($ENV{'form.answer_output_mode'} eq 'tex') {
 		    $result.=&Apache::response::answer_part($$tagstack[-1],
-							    "Unit: \\verb|$unit|");
+							    " Unit: $unit ");
 		} else {
 		    $result.=&Apache::response::answer_part($$tagstack[-1],
 							    "Unit: <b>$unit</b>");
 		}
 	    } elsif ($target eq 'analyze') {
-		push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} },
-		      $unit);
+		push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit);
 	    }
 	}
-	if ($type || $token->[1] eq 'stringresponse') {
+	if ($type || $$tagstack[-1] eq 'stringresponse') {
 	    my $string='Case Insensitive';
 	    if ($type eq 'mc') {
 		$string='Multiple Choice';
@@ -363,13 +365,13 @@ sub end_numericalresponse {
 	    if ($target eq 'answer') {
 		if ($ENV{'form.answer_output_mode'} eq 'tex') {
 		    $result.=&Apache::response::answer_part($$tagstack[-1],
-							  "\\textbf{$string}");
+							  "$string");
 		} else {
 		    $result.=&Apache::response::answer_part($$tagstack[-1],
 							    "<b>$string</b>");
 		}
 	    } elsif ($target eq 'analyze') {
-		push (@{ $Apache::lonhomework::analyze{"$part_id.type"} },
+		push (@{ $Apache::lonhomework::analyze{"$part_id.str_type"} },
 		      $type);
 	    }
 	}
@@ -413,12 +415,13 @@ sub format_number {
     my ($number,$format,$target)=@_;
     my $ans;
     if ($format ne '') {
+	$format=~s/e/E/g;
 	$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;
+	    $format = '3e';
 	} elsif ($number=~/^(\d*)\.(\d*)$/) {
 	    $format = '4f';
 	} elsif ($number=~/^(\d*)$/) {
@@ -439,8 +442,22 @@ sub format_number {
 }
 
 sub make_numerical_bubbles {
-    my ($number_of_bubbles,$target,$answer,$format) =@_;
+    my ($number_of_bubbles,$target,$answer,$format,$incorrect) =@_;
     my @bubble_values = ();
+    &Apache::lonxml::debug("incorrect is $incorrect");
+    if (defined($incorrect) && ref($incorrect)) {
+	&Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1 gt $number_of_bubbles));
+	if (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);
+	    @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));
+	    return @bubble_values;
+	}
+	#FIXME what to do when not enough incorrects specified?
+    }
     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();
@@ -495,7 +512,9 @@ sub start_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
+	&Apache::response::start_response($parstack,$safeeval);
 	$result=&Apache::response::meta_package_write('stringresponse');
+	&Apache::response::end_response();
     } else {
 	$result.=&start_numericalresponse(@_);
     }
@@ -510,7 +529,9 @@ sub start_formularesponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
+	&Apache::response::start_response($parstack,$safeeval);
 	$result=&Apache::response::meta_package_write('formularesponse');
+	&Apache::response::end_response();
     } else {
 	$result.=&start_numericalresponse(@_);
     }