--- loncom/homework/radiobuttonresponse.pm 2002/09/23 22:32:41 1.49
+++ loncom/homework/radiobuttonresponse.pm 2002/10/28 14:28:04 1.59
@@ -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.59 2002/10/28 14:28:04 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,6 +42,7 @@ sub start_radiobuttonresponse {
&Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'radiobuttonresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
+ %Apache::hint::radiobutton=();
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('radiobuttonresponse');
} elsif ($target eq 'edit' ) {
@@ -79,10 +80,16 @@ sub end_radiobuttonresponse {
%Apache::response::foilgroup=();
sub start_foilgroup {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
%Apache::response::foilgroup=();
$Apache::radiobuttonresponse::conceptgroup=0;
&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 {
@@ -102,12 +109,13 @@ sub storesurvey {
sub grade_response {
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; }
my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
if ( $response !~ /[0-9]+/) { return; }
my $part=$Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
- my ($answer,@whichfoils)=&whichfoils($max,$randomize);
my %responsehash;
$responsehash{$whichfoils[$response]}=$response;
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
@@ -156,7 +164,6 @@ sub end_foilgroup {
}
sub getfoilcounts {
- my ($max)=@_;
my @names;
my $truecnt=0;
my $falsecnt=0;
@@ -171,7 +178,7 @@ sub getfoilcounts {
$falsecnt++;
}
}
- return ($truecnt,$falsecnt,$max);
+ return ($truecnt,$falsecnt);
}
sub displayallfoils {
@@ -215,11 +222,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 +276,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 +285,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 +321,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++) {
@@ -357,7 +367,9 @@ sub displayfoils {
}
}
} 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 $part=$Apache::inputtags::part;
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
@@ -367,8 +379,16 @@ sub displayfoils {
$result.="
\n";
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result .= '
A: Correct | B: Incorrect |