--- loncom/homework/radiobuttonresponse.pm	2002/07/17 18:06:18	1.42
+++ loncom/homework/radiobuttonresponse.pm	2002/09/26 21:45:53	1.53
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.42 2002/07/17 18:06:18 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.53 2002/09/26 21:45:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,11 +51,14 @@ sub start_radiobuttonresponse {
 	."</td><td>&nbsp".&Apache::edit::end_row()
         .&Apache::edit::start_spanning_row();
 
-    $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
-	&Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n";
+    $result.=
+	&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
+	&Apache::edit::select_arg('Randomize Foil Order','randomize',
+				  ['yes','no'],$token).
+        &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n";
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						 $safeeval,'max');
+						 $safeeval,'max','randomize');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } elsif ($target eq 'tex') {
       $result .= '\begin{enumerate}';
@@ -74,9 +77,9 @@ sub end_radiobuttonresponse {
   return $result;
 }
 
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
 sub start_foilgroup {
-  %Apache::response::foilgroup={};
+  %Apache::response::foilgroup=();
   $Apache::radiobuttonresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();
   return '';
@@ -98,13 +101,13 @@ sub storesurvey {
 }
 
 sub grade_response {
-  my ($max,$answer)=@_;
+  my ($max,$randomize)=@_;
   if (!defined($ENV{'form.submitted'})) { return; }
   my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
   if ( $response !~ /[0-9]+/) { return; }
   my $part=$Apache::inputtags::part;
   my $id = $Apache::inputtags::response['-1'];
-  my @whichfoils=&whichfoils($max,$answer);
+  my ($answer,@whichfoils)=&whichfoils($max,$randomize);
   my %responsehash;
   $responsehash{$whichfoils[$response]}=$response;
   my $responsestr=&Apache::lonnet::hash2str(%responsehash);
@@ -137,18 +140,15 @@ sub end_foilgroup {
       }
     } else {
       my $name;
-      my ($truecnt,$falsecnt,$max) = &getfoilcounts($parstack,$safeeval);
-      my $count=0;
-      # we will add in 1 of the true statements
-      if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }
-      my $answer = int(rand ($count));
-      &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");
+      my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
+      my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
+						 $safeeval,'-2');
       if ($target eq 'web' || $target eq 'tex') {
-	$result=&displayfoils($target,$max,$answer);
+	$result=&displayfoils($target,$max,$randomize);
       } elsif ($target eq 'answer' ) {
-	$result=&displayanswers($max,$answer);
+	$result=&displayanswers($max,$randomize);
       } elsif ( $target eq 'grade') {
-	&grade_response($max,$answer);
+	&grade_response($max,$randomize);
       }
     }
   }
@@ -156,8 +156,6 @@ sub end_foilgroup {
 }
 
 sub getfoilcounts {
-  my ($parstack,$safeeval)=@_;
-  my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
   my @names;
   my $truecnt=0;
   my $falsecnt=0;
@@ -172,7 +170,7 @@ sub getfoilcounts {
       $falsecnt++;
     }
   }
-  return ($truecnt,$falsecnt,$max);
+  return ($truecnt,$falsecnt);
 }
 
 sub displayallfoils {
@@ -184,75 +182,181 @@ sub displayallfoils {
   my $part=$Apache::inputtags::part;
   my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
   my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
-  &Apache::lonhomework::showhash(%lastresponse);
-  foreach my $name (@names) {
-    if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
-      $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
-      if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
-      $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
-      $temp++;
+  if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
+    foreach my $name (@names) {
+      if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
+	$result.="<br />".$Apache::response::foilgroup{$name.'.value'};
+	if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	  $result.='<b>';
+	}
+	$result .= $Apache::response::foilgroup{$name.'.text'};
+	if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	  $result.='</b>';
+	}
+      }
+    }
+  } else {
+    foreach my $name (@names) {
+      if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
+	$result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+	if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
+	$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+	$temp++;
+      }
     }
   }
   return $result;
 }
 
 sub whichfoils {
-  my ($max,$answer)=@_;
+  my ($max,$randomize)=@_;
 
   my @truelist;
   my @falselist;
   my @whichfalse =();
-
+  my ($truecnt,$falsecnt) = &getfoilcounts();
+  my $count=0;
+  # we will add in 1 of the true statements
+  if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }
+  my $answer=int(&Math::Random::random_uniform() * ($count));
+  &Apache::lonxml::debug("Count is $count, $answer is $answer");
   my @names;
   if ( $Apache::response::foilgroup{'names'} ) {
-    @names= @{ $Apache::response::foilgroup{'names'} };
+      @names= @{ $Apache::response::foilgroup{'names'} };
   }
   if (&Apache::response::showallfoils()) {
-    @whichfalse=@names;
+      @whichfalse=@names;
+  } elsif ($randomize eq 'no') {
+      &Apache::lonxml::debug("No randomization");
+      my $havetrue=0;
+      foreach my $name (@names) {
+	  if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	      if (!$havetrue ) {
+		  push(@whichfalse,$name); $havetrue++; $answer=$#whichfalse;
+	      }
+	  } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
+	      push (@whichfalse,$name);
+	  } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
+	  } else {
+	      &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
+	  }
+      }
   } else {
+    my $current=0;
+    &Apache::lonhomework::showhash(%Apache::response::foilgroup);
+    my (%top,%bottom);
+    #first find out where everyone wants to be
     foreach my $name (@names) {
-      #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";
-      if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
-	push (@truelist,$name);
-      } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
-	push (@falselist,$name);
-      } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
-      } else {
-	&Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
-      }
+	$current++;
+	if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	    push (@truelist,$name);
+	    if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
+		$top{$name}=$current;
+	    } elsif ($Apache::response::foilgroup{$name.'.location'} eq 'bottom') {
+		$bottom{$name}=$current;
+	    }
+	} elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
+	    push (@falselist,$name);
+	    if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
+		$top{$name}=$current;
+	    } elsif ($Apache::response::foilgroup{$name.'.location'} eq 'bottom') {
+		$bottom{$name}=$current;
+	    }
+	} elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
+	} else {
+	    &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
+	}
     }
-    my $whichtrue = int(rand($#truelist+1));
+    #pick a true statement
+    my $whichtrue = int(&Math::Random::random_uniform() * ($#truelist+1));
     &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
-    while ((($#whichfalse+1) < $max-1) && ($#falselist > -1)) {
-      &Apache::lonxml::debug("Have $#whichfalse max is $max");
-      my $afalse=int(rand($#falselist+1));
-      &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
-      $afalse=splice(@falselist,$afalse,1);
-      &Apache::lonxml::debug("Picked $afalse");
-      push (@whichfalse,$afalse);
+    my $numinserted;
+    my (@toplist, @bottomlist);
+    my $topcount=0;
+    # assign everyone to either toplist/bottomlist or whichfalse
+    # which false is randomized, toplist bottomlist are in order
+    while ((($numinserted) < $max-1) && ($#falselist > -1)) {
+	&Apache::lonxml::debug("Have $#whichfalse max is $max");
+	my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1));
+	&Apache::lonxml::debug("From $#falselist elms, picking $afalse");
+	$afalse=splice(@falselist,$afalse,1);
+	&Apache::lonxml::debug("Picked $afalse");
+	&Apache::lonhomework::showhash(('names'=>\@names));
+	&Apache::lonhomework::showhash(%top);
+	if ($top{$afalse}) {
+	    $toplist[$top{$afalse}]=$afalse;
+	    $topcount++;
+	} elsif ($bottom{$afalse}) {
+	    $bottomlist[$bottom{$afalse}]=$afalse;
+	} else {
+	    push (@whichfalse,$afalse);
+	}
     }
-    splice(@whichfalse,$answer,0,$truelist[$whichtrue]);
-    &Apache::lonxml::debug("the true statement is $answer");
+    my $truename=$truelist[$whichtrue];
+    my $dosplice=1;
+    #insert the true statement, keeping track of where it wants to be
+    if ($Apache::response::foilgroup{$truename.'.location'} eq 'top' ) {
+	$toplist[$top{$truename}]=$truename;
+	$answer=-1;
+	foreach my $top (reverse(@toplist)) {
+	    if ($top) { $answer++;}
+	    if ($top eq $truename) { last; }
+	}
+	$dosplice=0;
+    } elsif ($Apache::response::foilgroup{$truename.'.location'} eq 'bottom') {
+	$bottomlist[$bottom{$truename}]=$truename;
+	$answer=-1;
+	foreach my $bot (@bottomlist) {
+	    if ($bot) { $answer++;}
+	    if ($bot eq $truename) { last; }
+	}
+	$answer+=$topcount+$#whichfalse+1;
+	$dosplice=0;
+    } else {
+	if ($topcount>0) { 
+	  $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1))
+	    + $topcount;
+	}
+    }
+    #add the top items to the top, bottom items to the bottom
+    for (my $i=0;$i<=$#toplist;$i++) {
+	if ($toplist[$i]) { unshift(@whichfalse,$toplist[$i]) }
+    }
+    for (my $i=0;$i<=$#bottomlist;$i++) {
+	if ($bottomlist[$i]) { push(@whichfalse,$bottomlist[$i]) }
+    }
+    #if the true statement is randomized insert it into the list
+    if ($dosplice) { splice(@whichfalse,$answer,0,$truelist[$whichtrue]); }
   }
-  return @whichfalse;
+  &Apache::lonxml::debug("Answer is $answer");
+  return ($answer,@whichfalse);
 }
 
 sub displayfoils {
-  my ($target,$max,$answer)=@_;
+  my ($target,$max,$randomize)=@_;
   my $result;
 
-  my @whichfoils=&whichfoils($max,$answer);
-  if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+  my ($answer,@whichfoils)=&whichfoils($max,$randomize);
+  if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
     foreach my $name (@whichfoils) {
       if ($target ne 'tex') {
 	  $result.="<br />";
+      } else {
+	  $result.='\vskip 0 mm \item ';
       }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
-	$result.='Correct';
+	  if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: ';}
+      } else {
+	$result.='Incorrect:';
+      }
+      if ($target ne 'tex') {
+	  $result.=$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       } else {
-	$result.='Incorrect';
+	  $result.=$Apache::response::foilgroup{$name.'.text'};
+      }
+      if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	  if ($target ne 'tex') { $result.='</b>';}
       }
-      $result.=":".$Apache::response::foilgroup{$name.'.text'}."</input>\n";
     }
   } else {
     my $temp=0;
@@ -266,18 +370,18 @@ sub displayfoils {
 	  if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
 	  $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       } else {
-	  $result .= $Apache::response::foilgroup{$name.'.text'};
+	  $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
       }
       $temp++;
     }
   }
-  if ($target ne 'tex') { $result.="<br />"; }
+  if ($target ne 'tex') { $result.="<br />"; } else { $result.='\vskip 0 mm '; }
   return $result;
 }
 
 sub displayanswers {
-  my ($max,$answer)=@_;
-  my @whichopt = &whichfoils($max,$answer);
+  my ($max,$randomize)=@_;
+  my ($answer,@whichopt) = &whichfoils($max,$randomize);
   my $result=&Apache::response::answer_header('radiobuttonresponse');
   foreach my $name (@whichopt) {
     $result.=&Apache::response::answer_part('radiobuttonresponse',
@@ -290,7 +394,7 @@ sub displayanswers {
 sub start_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::radiobuttonresponse::conceptgroup=1;
-  %Apache::response::conceptgroup={};
+  %Apache::response::conceptgroup=();
   my $result;
   if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
@@ -311,11 +415,12 @@ sub end_conceptgroup {
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex') {
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };
-      my $pick=int(rand($#names+1));
+      my $pick=int(&Math::Random::random_uniform() * ($#names+1));
       my $name=$names[$pick];
       push @{ $Apache::response::foilgroup{'names'} }, $name;
       $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
       $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"};
+      $Apache::response::foilgroup{"$name.location"} = $Apache::response::conceptgroup{"$name.location"};
       my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
       $Apache::response::foilgroup{"$name.concept"} = $concept;
       &Apache::lonxml::debug("Selecting $name in $concept");
@@ -336,18 +441,21 @@ sub start_foil {
   my $result='';
   if ($target eq 'web' || $target eq 'tex') {
     &Apache::lonxml::startredirection;
-    if ($target eq 'tex') {
-	$result .= '\item ';
-    }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.=&Apache::edit::select_or_text_arg('Correct Option:','value',
 				       ['unused','true','false'],$token);
+    my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
+					     $safeeval,'-3');
+    if ($randomize ne 'no') {
+      $result.=&Apache::edit::select_arg('Location:','location',
+					 ['random','top','bottom'],$token);
+    }
     $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
-						  'value','name');
+						  'value','name','location');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } 
   return $result;
@@ -361,16 +469,19 @@ sub end_foil {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+      my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
       if (!$name) { $name=$Apache::lonxml::curdepth; }
       if ( $Apache::radiobuttonresponse::conceptgroup
 	   && !&Apache::response::showallfoils() ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
 	$Apache::response::conceptgroup{"$name.text"} = $text;	
+	$Apache::response::conceptgroup{"$name.location"} = $location;	
       } else {
 	push @{ $Apache::response::foilgroup{'names'} }, $name;
 	$Apache::response::foilgroup{"$name.value"} = $value;
 	$Apache::response::foilgroup{"$name.text"} = $text;
+	$Apache::response::foilgroup{"$name.location"} = $location;
       }
     }
   }