--- loncom/homework/radiobuttonresponse.pm	2002/09/23 22:32:41	1.49
+++ 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.49 2002/09/23 22:32:41 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.53 2002/09/26 21:45:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -156,7 +156,6 @@ sub end_foilgroup {
 }
 
 sub getfoilcounts {
-  my ($max)=@_;
   my @names;
   my $truecnt=0;
   my $falsecnt=0;
@@ -171,7 +170,7 @@ sub getfoilcounts {
       $falsecnt++;
     }
   }
-  return ($truecnt,$falsecnt,$max);
+  return ($truecnt,$falsecnt);
 }
 
 sub displayallfoils {
@@ -215,11 +214,11 @@ sub whichfoils {
   my @truelist;
   my @falselist;
   my @whichfalse =();
-  my ($truecnt,$falsecnt,$max) = &getfoilcounts($max);
+  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(rand($count));
+  my $answer=int(&Math::Random::random_uniform() * ($count));
   &Apache::lonxml::debug("Count is $count, $answer is $answer");
   my @names;
   if ( $Apache::response::foilgroup{'names'} ) {
@@ -269,7 +268,7 @@ sub whichfoils {
 	}
     }
     #pick a true statement
-    my $whichtrue = int(rand($#truelist+1));
+    my $whichtrue = int(&Math::Random::random_uniform() * ($#truelist+1));
     &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
     my $numinserted;
     my (@toplist, @bottomlist);
@@ -278,7 +277,7 @@ sub whichfoils {
     # 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(rand($#falselist+1));
+	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");
@@ -314,7 +313,10 @@ sub whichfoils {
 	$answer+=$topcount+$#whichfalse+1;
 	$dosplice=0;
     } else {
-	if ($topcount>0) { $answer = int(rand($#whichfalse+1))+$topcount; }
+	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++) {
@@ -413,7 +415,7 @@ 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"};
@@ -444,8 +446,12 @@ sub start_foil {
     $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.=&Apache::edit::select_or_text_arg('Correct Option:','value',
 				       ['unused','true','false'],$token);
-    $result.=&Apache::edit::select_arg('Location:','location',
-				       ['random','bottom','top'],$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,