version 1.17, 2003/05/06 22:08:28
|
version 1.18, 2003/05/16 20:16:18
|
Line 118 sub end_itemgroup {
|
Line 118 sub end_itemgroup {
|
my @names=@{ $Apache::response::itemgroup{'names'} }; |
my @names=@{ $Apache::response::itemgroup{'names'} }; |
my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval); |
my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval); |
if ($randomize ne 'no' ) { |
if ($randomize ne 'no' ) { |
@names=&whichorder($#names+1,$randomize,0, |
@names=&Apache::response::whichorder($#names+1,$randomize,0, |
\%Apache::response::itemgroup) |
\%Apache::response::itemgroup); |
} |
} |
my %letter_name_map; |
my %letter_name_map; |
my %name_letter_map; |
my %name_letter_map; |
Line 258 sub displayanswers {
|
Line 258 sub displayanswers {
|
my ($max,$randomize,@opt)=@_; |
my ($max,$randomize,@opt)=@_; |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @whichfoils = &whichorder(&getfoilcounts($max),$randomize, |
my @whichfoils = &Apache::response::whichorder(&getfoilcounts($max), |
&Apache::response::showallfoils(), |
$randomize, |
\%Apache::response::foilgroup); |
&Apache::response::showallfoils(), |
|
\%Apache::response::foilgroup); |
my $result=&Apache::response::answer_header('matchresponse'); |
my $result=&Apache::response::answer_header('matchresponse'); |
my %name_letter_map; |
my %name_letter_map; |
if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) { |
if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) { |
Line 279 sub displayanswers {
|
Line 280 sub displayanswers {
|
|
|
sub grade_response { |
sub grade_response { |
my ($max,$randomize)=@_; |
my ($max,$randomize)=@_; |
my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize, |
my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), |
&Apache::response::showallfoils(), |
$randomize, |
\%Apache::response::foilgroup); |
&Apache::response::showallfoils(), |
|
\%Apache::response::foilgroup); |
if (!defined($ENV{'form.submitted'})) { return; } |
if (!defined($ENV{'form.submitted'})) { return; } |
my %responsehash; |
my %responsehash; |
my %grade; |
my %grade; |
Line 350 sub displayfoils {
|
Line 352 sub displayfoils {
|
my ($target,$max,$randomize)=@_; |
my ($target,$max,$randomize)=@_; |
my $result; |
my $result; |
my $question; |
my $question; |
my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize, |
my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), |
&Apache::response::showallfoils(), |
$randomize, |
\%Apache::response::foilgroup); |
&Apache::response::showallfoils(), |
|
\%Apache::response::foilgroup); |
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 $status=$Apache::inputtags::status[-1]; |
Line 454 sub getfoilcounts {
|
Line 457 sub getfoilcounts {
|
return $count; |
return $count; |
} |
} |
|
|
sub whichorder { |
|
my ($max,$randomize,$showall,$hash)=@_; |
|
#&Apache::lonxml::debug("man $max randomize $randomize"); |
|
if (!defined(@{ $$hash{'names'} })) { return; } |
|
my @names = @{ $$hash{'names'} }; |
|
my @whichopt =(); |
|
my (%top,@toplist,%bottom,@bottomlist); |
|
if (!($showall || ($randomize eq 'no'))) { |
|
my $current=0; |
|
foreach my $name (@names) { |
|
$current++; |
|
if ($$hash{"$name.location"} eq 'top') { |
|
$top{$name}=$current; |
|
} elsif ($$hash{"$name.location"} eq 'bottom') { |
|
$bottom{$name}=$current; |
|
} |
|
} |
|
} |
|
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
|
#&Apache::lonxml::debug("Have $#whichopt max is $max"); |
|
my $aopt; |
|
if ($showall || ($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); |
|
} |
|
} |
|
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]) } |
|
} |
|
|
|
return @whichopt; |
|
} |
|
|
|
sub start_conceptgroup { |
sub start_conceptgroup { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |