[BACK]Return to rankresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/rankresponse.pm between versions 1.7 and 1.24

version 1.7, 2003/03/20 17:59:19 version 1.24, 2003/10/24 18:04:55
Line 104  sub end_foilgroup { Line 104  sub end_foilgroup {
  } elsif ( $target eq 'grade') {   } elsif ( $target eq 'grade') {
     &grade_response($max,$randomize,$tol);      &grade_response($max,$randomize,$tol);
  }   }
    &Apache::lonxml::increment_counter(&getfoilcounts($max));
       } elsif ($target eq 'edit') {
    $result=&Apache::edit::end_table();
     }      }
     return $result;      return $result;
 }  }
Line 118  sub get_correct_order { Line 121  sub get_correct_order {
     }      }
     @value_names =      @value_names =
  sort {   sort {
     if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] cmp $b->[0]);}      if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] <=> $b->[0]);}
     return 0;      return 0;
  } @value_names;   } @value_names;
     my @value_names_tmp=@value_names;      my @value_names_tmp=@value_names;
Line 184  sub grade_response { Line 187  sub grade_response {
     my ($temp,$right,$wrong,$ignored)=(0,0,0,0);      my ($temp,$right,$wrong,$ignored)=(0,0,0,0);
     my @correctorder=&get_correct_order($tol,@whichfoils);      my @correctorder=&get_correct_order($tol,@whichfoils);
     foreach my $name (@whichfoils) {      foreach my $name (@whichfoils) {
  my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};   my $response = &Apache::response::getresponse($temp);
  $responsehash{$name}=$response;   $responsehash{$name}=$response;
  my $value=shift(@correctorder);   my $value=shift(@correctorder);
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
Line 235  sub displayfoils { Line 238  sub displayfoils {
     my (@whichfoils)=&whichfoils($max,$randomize);      my (@whichfoils)=&whichfoils($max,$randomize);
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};      my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
     my $status=$Apache::inputtags::status[-1];  
     my @whichopt=(1..($#whichfoils+1));      my @whichopt=(1..($#whichfoils+1));
     my @correctorder=&get_correct_order($tol,@whichfoils);      my @correctorder=&get_correct_order($tol,@whichfoils);
     if (($solved =~ /^correct/) || ($status eq  'SHOW_ANSWER')) {      if ( &Apache::response::show_answer() && ($target ne 'tex')) {
  foreach my $name (@whichfoils) {   foreach my $name (@whichfoils) {
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
     my $value=shift(@correctorder);      my $value=shift(@correctorder);
     $result.='<br />'.$value.':'.$text;      if ($target eq 'web') {$result.='<br />';} else {$result.=' \strut\\\\\strut ';}
       $result.=$value.':'.$text;
  }   }
     } else {      } else {
  my $i = 0;   my $i = 0;
Line 252  sub displayfoils { Line 255  sub displayfoils {
  my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};   my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
  my %lastresponse=&Apache::lonnet::str2hash($lastresponse);    my %lastresponse=&Apache::lonnet::str2hash($lastresponse); 
  my @alp = splice @alphabet, 0, $#whichopt + 1;   my @alp = splice @alphabet, 0, $#whichopt + 1;
    my $internal_counter=$Apache::lonxml::counter;
  foreach my $name (@whichfoils) {   foreach my $name (@whichfoils) {
     my $lastopt=$lastresponse{$name};      my $lastopt=$lastresponse{$name};
     my $optionlist='';      my $optionlist='';
Line 264  sub displayfoils { Line 268  sub displayfoils {
     if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}      if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
  }   }
     }      }
     if ($target ne 'tex') {      if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
  $optionlist='<select name="HWVAL_'.   $optionlist='<select name="HWVAL_'.
     $Apache::inputtags::response[-1].':'.$temp.'">'.      $Apache::inputtags::response[-1].':'.$temp.'">'.
         $optionlist."</select>\n";          $optionlist."</select>\n";
Line 273  sub displayfoils { Line 277  sub displayfoils {
     }      }
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
     if ($target ne 'tex') {      if ($target ne 'tex') {
  $result.='<br />'.$optionlist.$text."\n";   if ($Apache::lonhomework::type ne 'exam') {
       $result.='<br />'.$optionlist.$text."\n";
    } else {
       $result.='<br />'.$text."\n";
    }
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt);      my @values=(1..scalar(@whichopt));
       $result.=&Apache::optionresponse::webbubbles(\@values,\@whichopt,$temp,$lastopt);
  }   }
     } else {      } else {
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\vskip 0 mm '.$text."\n";      $result.='\vskip 0 mm   '.$text.' \vskip -3 mm '."\n";
     $result.=&Apache::optionresponse::bubbles(\@alp,\@whichopt).'\end{enumerate} \vskip -7 mm \strut ';      $result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut ';
       $internal_counter++;
  } else {   } else {
     $result.=' \\\\ \framebox[5 mm][s]{\tiny\strut} '.$text."\n";      $result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
  }   }
     }      }
     $temp++;      $temp++;
Line 304  sub getfoilcounts { Line 314  sub getfoilcounts {
   
 sub whichfoils {  sub whichfoils {
     my ($max,$randomize)=@_;      my ($max,$randomize)=@_;
     $max = &getfoilcounts($max);      return &Apache::response::whichorder($max,$randomize,
  #   &Apache::lonxml::debug("man $max randomize $randomize");   &Apache::response::showallfoils(),
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }   \%Apache::response::foilgroup);
     my @names = @{ $Apache::response::foilgroup{'names'} };  
     my @whichopt =();  
     my (%top,@toplist,%bottom,@bottomlist);  
     if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) {  
  my $current=0;  
  foreach my $name (@names) {  
     $current++;  
     if ($Apache::response::foilgroup{"$name.location"} eq 'top') {  
  $top{$name}=$current;  
     } elsif ($Apache::response::foilgroup{"$name.location"} eq  
      'bottom') {  
  $bottom{$name}=$current;  
     }  
  }  
     }  
     while ((($#whichopt+1) < $max) && ($#names > -1)) {  
 # &Apache::lonxml::debug("Have $#whichopt max is $max");  
  my $aopt;  
  if (&Apache::response::showallfoils() || ($randomize eq 'no')) {  
     $aopt=0;  
  } else {  
     $aopt=int(&Math::Random::random_uniform() * ($#names+1));  
  }  
 # &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");  
  $aopt=splice(@names,$aopt,1);  
 # &Apache::lonxml::debug("Picked $aopt");  
  if ($top{$aopt}) {  
     $toplist[$top{$aopt}]=$aopt;  
  } elsif ($bottom{$aopt}) {  
     $bottomlist[$bottom{$aopt}]=$aopt;  
  } else {  
     push (@whichopt,$aopt);  
  }  
     }  
 #    &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist);  
     for (my $i=0;$i<=$#toplist;$i++) {  
  if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }  
     }  
     for (my $i=0;$i<=$#bottomlist;$i++) {  
  if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }  
     }  
     &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist);  
     return @whichopt;  
 }  }
   
 sub start_conceptgroup {  sub start_conceptgroup {
Line 375  sub end_conceptgroup { Line 342  sub end_conceptgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     $Apache::rankresponse::conceptgroup=0;      $Apache::rankresponse::conceptgroup=0;
     my $result='';      my $result='';
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
  #if not there aren't any foils to display and thus no question   #if not there aren't any foils to display and thus no question
  if (defined(@{ $Apache::response::conceptgroup{'names'} })) {   if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
     my @names = @{ $Apache::response::conceptgroup{'names'} };      my @names = @{ $Apache::response::conceptgroup{'names'} };
Line 392  sub end_conceptgroup { Line 359  sub end_conceptgroup {
      $safeeval);       $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");
     if ($target eq 'web') {      if ($target eq 'web' || $target eq 'tex') {
  my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";   my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
  push(@{ $Apache::hint::rank{"$part_id.concepts"} },   push(@{ $Apache::hint::rank{"$part_id.concepts"} },
      $concept);       $concept);
Line 457  sub end_foil { Line 424  sub end_foil {
  && !&Apache::response::showallfoils() ) {   && !&Apache::response::showallfoils() ) {
  push @{ $Apache::response::conceptgroup{'names'} }, $name;   push @{ $Apache::response::conceptgroup{'names'} }, $name;
  $Apache::response::conceptgroup{"$name.value"} = $value;   $Apache::response::conceptgroup{"$name.value"} = $value;
  $Apache::response::conceptgroup{"$name.text"} = $text;   if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
       $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
    } else {
       $Apache::response::conceptgroup{"$name.text"} = $text;
    }
  $Apache::response::conceptgroup{"$name.location"} = $location;   $Apache::response::conceptgroup{"$name.location"} = $location;
     } else {      } else {
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
  $Apache::response::foilgroup{"$name.value"} = $value;   $Apache::response::foilgroup{"$name.value"} = $value;
  $Apache::response::foilgroup{"$name.text"} = $text;   if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
       $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
    } else {
       if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
    $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
       } else {
    $Apache::response::foilgroup{"$name.text"} = $text;
       } 
    }
  $Apache::response::foilgroup{"$name.location"} = $location;   $Apache::response::foilgroup{"$name.location"} = $location;
     }      }
  }   }
Removed from v.1.7  
changed lines
  Added in v.1.24

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