Diff for /loncom/homework/radiobuttonresponse.pm between versions 1.48 and 1.49

version 1.48, 2002/09/23 19:09:52 version 1.49, 2002/09/23 22:32:41
Line 101  sub storesurvey { Line 101  sub storesurvey {
 }  }
   
 sub grade_response {  sub grade_response {
   my ($max,$answer,$randomize)=@_;    my ($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 @whichfoils=&whichfoils($max,$answer,$randomize);    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 140  sub end_foilgroup { Line 140  sub end_foilgroup {
       }        }
     } else {      } else {
       my $name;        my $name;
       my ($truecnt,$falsecnt,$max) = &getfoilcounts($parstack,$safeeval);        my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
       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 $randomize = &Apache::lonxml::get_param('randomize',$parstack,        my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
  $safeeval,'-2');   $safeeval,'-2');
       if ($target eq 'web' || $target eq 'tex') {        if ($target eq 'web' || $target eq 'tex') {
  $result=&displayfoils($target,$max,$answer,$randomize);   $result=&displayfoils($target,$max,$randomize);
       } elsif ($target eq 'answer' ) {        } elsif ($target eq 'answer' ) {
  $result=&displayanswers($max,$answer,$randomize);   $result=&displayanswers($max,$randomize);
       } elsif ( $target eq 'grade') {        } elsif ( $target eq 'grade') {
  &grade_response($max,$answer,$randomize);   &grade_response($max,$randomize);
       }        }
     }      }
   }    }
Line 161  sub end_foilgroup { Line 156  sub end_foilgroup {
 }  }
   
 sub getfoilcounts {  sub getfoilcounts {
   my ($parstack,$safeeval)=@_;    my ($max)=@_;
   my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');  
   my @names;    my @names;
   my $truecnt=0;    my $truecnt=0;
   my $falsecnt=0;    my $falsecnt=0;
Line 216  sub displayallfoils { Line 210  sub displayallfoils {
 }  }
   
 sub whichfoils {  sub whichfoils {
   my ($max,$answer,$randomize)=@_;    my ($max,$randomize)=@_;
   
   my @truelist;    my @truelist;
   my @falselist;    my @falselist;
   my @whichfalse =();    my @whichfalse =();
     my ($truecnt,$falsecnt,$max) = &getfoilcounts($max);
     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("Count is $count, $answer is $answer");
   my @names;    my @names;
   if ( $Apache::response::foilgroup{'names'} ) {    if ( $Apache::response::foilgroup{'names'} ) {
     @names= @{ $Apache::response::foilgroup{'names'} };        @names= @{ $Apache::response::foilgroup{'names'} };
   }    }
   if (&Apache::response::showallfoils()) {    if (&Apache::response::showallfoils()) {
     @whichfalse=@names;        @whichfalse=@names;
   } elsif ($randomize eq 'no') {    } elsif ($randomize eq 'no') {
       &Apache::lonxml::debug("No randomization");        &Apache::lonxml::debug("No randomization");
       my $havetrue=0;        my $havetrue=0;
       foreach my $name (@names) {        foreach my $name (@names) {
   if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {    if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
       if (!$havetrue ) { push(@whichfalse,$name); $havetrue++; }        if (!$havetrue ) {
     push(@whichfalse,$name); $havetrue++; $answer=$#whichfalse;
         }
   } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {    } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {
       push (@whichfalse,$name);        push (@whichfalse,$name);
   } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {    } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
Line 242  sub whichfoils { Line 243  sub whichfoils {
   }    }
       }        }
   } else {    } 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) {      foreach my $name (@names) {
       #result.="<br /><b>$name</b> is <i> $Apache::response::foilgroup{$name.'.value'} </i>";   $current++;
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {   if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
  push (@truelist,$name);      push (@truelist,$name);
       } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') {      if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
  push (@falselist,$name);   $top{$name}=$current;
       } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {      } elsif ($Apache::response::foilgroup{$name.'.location'} eq 'bottom') {
       } else {   $bottom{$name}=$current;
  &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));      }
       }   } 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>"));
    }
     }      }
       #pick a true statement
     my $whichtrue = int(rand($#truelist+1));      my $whichtrue = int(rand($#truelist+1));
     &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");      &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue");
     while ((($#whichfalse+1) < $max-1) && ($#falselist > -1)) {      my $numinserted;
       &Apache::lonxml::debug("Have $#whichfalse max is $max");      my (@toplist, @bottomlist);
       my $afalse=int(rand($#falselist+1));      my $topcount=0;
       &Apache::lonxml::debug("From $#falselist elms, picking $afalse");      # assign everyone to either toplist/bottomlist or whichfalse
       $afalse=splice(@falselist,$afalse,1);      # which false is randomized, toplist bottomlist are in order
       &Apache::lonxml::debug("Picked $afalse");      while ((($numinserted) < $max-1) && ($#falselist > -1)) {
       push (@whichfalse,$afalse);   &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");
    &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);
    }
       }
       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(rand($#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]) }
     }      }
     splice(@whichfalse,$answer,0,$truelist[$whichtrue]);      #if the true statement is randomized insert it into the list
     &Apache::lonxml::debug("the true statement is $answer");      if ($dosplice) { splice(@whichfalse,$answer,0,$truelist[$whichtrue]); }
   }    }
   return @whichfalse;    &Apache::lonxml::debug("Answer is $answer");
     return ($answer,@whichfalse);
 }  }
   
 sub displayfoils {  sub displayfoils {
   my ($target,$max,$answer,$randomize)=@_;    my ($target,$max,$randomize)=@_;
   my $result;    my $result;
   
   my @whichfoils=&whichfoils($max,$answer,$randomize);    my ($answer,@whichfoils)=&whichfoils($max,$randomize);
   if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {    if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
     foreach my $name (@whichfoils) {      foreach my $name (@whichfoils) {
       if ($target ne 'tex') {        if ($target ne 'tex') {
Line 317  sub displayfoils { Line 378  sub displayfoils {
 }  }
   
 sub displayanswers {  sub displayanswers {
   my ($max,$answer,$randomize)=@_;    my ($max,$randomize)=@_;
   my @whichopt = &whichfoils($max,$answer,$randomize);    my ($answer,@whichopt) = &whichfoils($max,$randomize);
   my $result=&Apache::response::answer_header('radiobuttonresponse');    my $result=&Apache::response::answer_header('radiobuttonresponse');
   foreach my $name (@whichopt) {    foreach my $name (@whichopt) {
     $result.=&Apache::response::answer_part('radiobuttonresponse',      $result.=&Apache::response::answer_part('radiobuttonresponse',
Line 357  sub end_conceptgroup { Line 418  sub end_conceptgroup {
       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"};
       $Apache::response::foilgroup{"$name.value"} = $Apache::response::conceptgroup{"$name.value"};        $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);        my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
       $Apache::response::foilgroup{"$name.concept"} = $concept;        $Apache::response::foilgroup{"$name.concept"} = $concept;
       &Apache::lonxml::debug("Selecting $name in $concept");        &Apache::lonxml::debug("Selecting $name in $concept");
Line 382  sub start_foil { Line 444  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_or_text_arg('Location:','location',      $result.=&Apache::edit::select_arg('Location:','location',
        ['random','bottom','top'],$token);         ['random','bottom','top'],$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') {

Removed from v.1.48  
changed lines
  Added in v.1.49


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