Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.50 and 1.57

version 1.50, 2002/09/25 19:39:49 version 1.57, 2002/10/17 17:13:44
Line 79  sub end_radiobuttonresponse { Line 79  sub end_radiobuttonresponse {
   
 %Apache::response::foilgroup=();  %Apache::response::foilgroup=();
 sub start_foilgroup {  sub start_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
   %Apache::response::foilgroup=();    %Apache::response::foilgroup=();
   $Apache::radiobuttonresponse::conceptgroup=0;    $Apache::radiobuttonresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();    &Apache::response::setrandomnumber();
   return '';    if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
         $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
         &Apache::lonxml::increment_counter();
     }
     return $result;
 }  }
   
 sub storesurvey {  sub storesurvey {
Line 102  sub storesurvey { Line 108  sub storesurvey {
   
 sub grade_response {  sub grade_response {
   my ($max,$randomize)=@_;    my ($max,$randomize)=@_;
     #keep the random numbers the same must always call this
     my ($answer,@whichfoils)=&whichfoils($max,$randomize);
   if (!defined($ENV{'form.submitted'})) { return; }    if (!defined($ENV{'form.submitted'})) { return; }
   my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};    my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
   if ( $response !~ /[0-9]+/) { return; }    if ( $response !~ /[0-9]+/) { return; }
   my $part=$Apache::inputtags::part;    my $part=$Apache::inputtags::part;
   my $id = $Apache::inputtags::response['-1'];    my $id = $Apache::inputtags::response['-1'];
   my ($answer,@whichfoils)=&whichfoils($max,$randomize);  
   my %responsehash;    my %responsehash;
   $responsehash{$whichfoils[$response]}=$response;    $responsehash{$whichfoils[$response]}=$response;
   my $responsestr=&Apache::lonnet::hash2str(%responsehash);    my $responsestr=&Apache::lonnet::hash2str(%responsehash);
Line 218  sub whichfoils { Line 225  sub whichfoils {
   my $count=0;    my $count=0;
   # we will add in 1 of the true statements    # we will add in 1 of the true statements
   if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }    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");    &Apache::lonxml::debug("Count is $count, $answer is $answer");
   my @names;    my @names;
   if ( $Apache::response::foilgroup{'names'} ) {    if ( $Apache::response::foilgroup{'names'} ) {
Line 268  sub whichfoils { Line 275  sub whichfoils {
  }   }
     }      }
     #pick a true statement      #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");      &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
     my $numinserted;      my $numinserted;
     my (@toplist, @bottomlist);      my (@toplist, @bottomlist);
Line 277  sub whichfoils { Line 284  sub whichfoils {
     # which false is randomized, toplist bottomlist are in order      # which false is randomized, toplist bottomlist are in order
     while ((($numinserted) < $max-1) && ($#falselist > -1)) {      while ((($numinserted) < $max-1) && ($#falselist > -1)) {
  &Apache::lonxml::debug("Have $#whichfalse max is $max");   &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");   &Apache::lonxml::debug("From $#falselist elms, picking $afalse");
  $afalse=splice(@falselist,$afalse,1);   $afalse=splice(@falselist,$afalse,1);
  &Apache::lonxml::debug("Picked $afalse");   &Apache::lonxml::debug("Picked $afalse");
Line 313  sub whichfoils { Line 320  sub whichfoils {
  $answer+=$topcount+$#whichfalse+1;   $answer+=$topcount+$#whichfalse+1;
  $dosplice=0;   $dosplice=0;
     } else {      } 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      #add the top items to the top, bottom items to the bottom
     for (my $i=0;$i<=$#toplist;$i++) {      for (my $i=0;$i<=$#toplist;$i++) {
Line 356  sub displayfoils { Line 366  sub displayfoils {
       }        }
     }      }
   } else {    } else {
     my $temp=0;      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');
       my $i = 0;
       my $temp=0;  
     my $id=$Apache::inputtags::response['-1'];      my $id=$Apache::inputtags::response['-1'];
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};      my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
Line 366  sub displayfoils { Line 378  sub displayfoils {
   $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";    $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
   if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }    if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
   $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";    $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
     if ($Apache::lonhomework::type eq 'exam') {
         $result .= '<table border="1"><tr><td>A: &nbsp;&nbsp;Correct</td><td>B: &nbsp;&nbsp;Incorrect</td></tr></table>';
     }
       } else {        } else {
   $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};    if ($Apache::lonhomework::type eq 'exam') {
         $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';
         $i++;
     } else {
         $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
     }
       }        }
       $temp++;        $temp++;
     }      }
Line 412  sub end_conceptgroup { Line 432  sub end_conceptgroup {
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex') {
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {      if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $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];        my $name=$names[$pick];
       push @{ $Apache::response::foilgroup{'names'} }, $name;        push @{ $Apache::response::foilgroup{'names'} }, $name;
       $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};        $Apache::response::foilgroup{"$name.text"} =  $Apache::response::conceptgroup{"$name.text"};
Line 443  sub start_foil { Line 463  sub start_foil {
     $result.=&Apache::edit::text_arg('Name:','name',$token);      $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.=&Apache::edit::select_or_text_arg('Correct Option:','value',      $result.=&Apache::edit::select_or_text_arg('Correct Option:','value',
        ['unused','true','false'],$token);         ['unused','true','false'],$token);
     $result.=&Apache::edit::select_arg('Location:','location',      my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
        ['random','bottom','top'],$token);       $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();      $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,       my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,

Removed from v.1.50  
changed lines
  Added in v.1.57


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>