--- loncom/homework/optionresponse.pm 2002/07/16 21:02:29 1.42
+++ loncom/homework/optionresponse.pm 2002/10/28 23:31:48 1.57
@@ -1,7 +1,7 @@
-# The LearningOnline Network with CAPA
+# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.42 2002/07/16 21:02:29 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.57 2002/10/28 23:31:48 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,6 +42,7 @@ sub start_optionresponse {
&Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'optionresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
+ %Apache::hint::option=();
if ($target eq 'edit') {
$result.=&Apache::edit::start_table($token).
"<tr><td>Multiple Option Response Question</td><td>Delete:".
@@ -50,12 +51,14 @@ sub start_optionresponse {
&Apache::edit::end_row().
&Apache::edit::start_spanning_row().
"\n";
- $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
- &Apache::edit::end_row().
- &Apache::edit::start_spanning_row();
+ $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',
+ $token,'4').
+ &Apache::edit::select_arg('Randomize Foil Order','randomize',
+ ['yes','no'],$token).
+ &Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'max');
+ $safeeval,'max','randomize');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
} elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write('optionresponse');
@@ -76,12 +79,12 @@ sub end_optionresponse {
return $result;
}
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
sub start_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- %Apache::response::foilgroup={};
+ %Apache::response::foilgroup=();
$Apache::optionresponse::conceptgroup=0;
&Apache::response::setrandomnumber();
if ($target eq 'edit') {
@@ -140,10 +143,6 @@ ENDTABLE
}
if ($target eq 'tex') {
$result .= ' \begin{enumerate} ';
- my $option_list = &Apache::lonxml::get_param('options',$parstack,$safeeval);
- $option_list =~ s/^\(//;
- $option_list =~ s/\)$//;
- $result .= ' \item[] Use the following options: \textbf{'.$option_list.'}. ';
}
return $result;
}
@@ -154,16 +153,16 @@ sub end_foilgroup {
my $result;
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
my $name;
- my ($count,$max) = &getfoilcounts($parstack,$safeeval);
- if ($count>$max) { $count=$max }
- &Apache::lonxml::debug("Count is $count from $max");
my @opt;
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
&Apache::lonxml::debug("Options are $#opt");
+ my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
+ my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
+ $safeeval,'-2');
if ($target eq 'web' || $target eq 'tex') {
- $result.=&displayfoils($target,$count,@opt);
+ $result.=&displayfoils($target,$max,$randomize,@opt);
} elsif ( $target eq 'answer') {
- $result.=&displayanswers($count,@opt);
+ $result.=&displayanswers($max,$randomize,@opt);
} elsif ( $target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
@@ -175,12 +174,13 @@ sub end_foilgroup {
$Apache::response::foilgroup{"$name.text"};
}
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
- push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($count));
+ push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($max,$randomize));
} elsif ( $target eq 'grade') {
if ( defined $ENV{'form.submitted'}) {
- my @whichopt = &whichfoils($count);
+ my @whichopt = &whichfoils($max,$randomize);
my $temp=1;my $name;
my %responsehash;
+ my %grade;
my $right=0;
my $wrong=0;
my $ignored=0;
@@ -190,7 +190,11 @@ sub end_foilgroup {
if ( $response =~ /[^\s]/) {
my $value=$Apache::response::foilgroup{$name.'.value'};
&Apache::lonxml::debug("submitted a $response for $value<br />\n");
- if ($value eq $response) {$right++;} else {$wrong++;}
+ if ($value eq $response) {
+ $grade{$name}='1'; $right++;
+ } else {
+ $grade{$name}='0'; $wrong++;
+ }
} else {
$ignored++;
}
@@ -199,6 +203,7 @@ sub end_foilgroup {
my $part=$Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+ my $gradestr =&Apache::lonnet::hash2str(%grade);
my %previous=&Apache::response::check_for_previous($responsestr,
$part,$id);
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
@@ -216,6 +221,7 @@ sub end_foilgroup {
}
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
$responsestr;
+ $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
$ad;
&Apache::response::handle_previous(\%previous,$ad);
@@ -229,38 +235,67 @@ sub end_foilgroup {
}
sub getfoilcounts {
- my ($parstack,$safeeval)=@_;
- my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
+ my ($max)=@_;
# +1 since instructors will count from 1
my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
if (&Apache::response::showallfoils()) { $max=$count; }
- return ($count,$max);
+ if ($count>$max) { $count=$max }
+ &Apache::lonxml::debug("Count is $count from $max");
+ return $count;
}
sub whichfoils {
- my ($max)=@_;
+ my ($max,$randomize)=@_;
+ $max = &getfoilcounts($max);
+ &Apache::lonxml::debug("randomize $randomize");
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()) {
+ if (&Apache::response::showallfoils() || ($randomize eq 'no')) {
$aopt=0;
} else {
- $aopt=int(rand($#names+1));
+ $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");
- push (@whichopt,$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 displayanswers {
- my ($max,@opt)=@_;
+ my ($max,$randomize,@opt)=@_;
my @names = @{ $Apache::response::foilgroup{'names'} };
- my @whichopt = &whichfoils($max);
+ my @whichopt = &whichfoils($max,$randomize);
my $result=&Apache::response::answer_header('optionresponse');
foreach my $name (@whichopt) {
$result.=&Apache::response::answer_part('optionresponse',
@@ -271,23 +306,33 @@ sub displayanswers {
}
sub displayfoils {
- my ($target,$max,@opt)=@_;
+ my ($target,$max,$randomize,@opt)=@_;
my @names = @{ $Apache::response::foilgroup{'names'} };
my @truelist;
my @falselist;
my $result;
my $name;
- $Apache::optionresponse::displayoptionintex=0;
- my @whichopt = &whichfoils($max);
+ my $displayoptionintex=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 @whichopt = &whichfoils($max,$randomize);
my $part=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
foreach $name (@whichopt) {
if ($target eq 'web') {
$result.="<br />";
+ } elsif ($target eq 'tex') {
+ $result.='\vskip 0 mm ';
+ }
+ if ($target ne 'tex') {
+ $result .=$Apache::response::foilgroup{$name.'.value'}.
+ ":".$Apache::response::foilgroup{$name.'.text'}."\n";
+ } else {
+ $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
+ $result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.
+ ":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
- $result .=$Apache::response::foilgroup{$name.'.value'}.
- ":".$Apache::response::foilgroup{$name.'.text'}."\n";
}
} else {
my $temp=1;
@@ -307,21 +352,51 @@ sub displayfoils {
$result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
.$optionlist
."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
+ if ($Apache::lonhomework::type eq 'exam') {
+ my $number_of_bubbles = $#opt + 1;
+ $result.= '<table border="1"><tr>';
+ for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
+ $result.='<td>'.$alphabet[$ind].': '.$opt[$ind].'</td>';
+ }
+ $result.='</tr></table>';
+ }
$temp++;
} else {
- if ($Apache::optionresponse::displayoptionintex == 0) {
- my $durtyoptionlist = $optionlist;
- $durtyoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
- $durtyoptionlist =~ s/<option>/{\\bf /g;
- $durtyoptionlist =~ s/<\/option>/},/g;
- $durtyoptionlist =~ s/,$/\./g;
- $durtyoptionlist =~ s/>/\$>\$/g;
- $durtyoptionlist =~ s/</\$<\$/g;
- $durtyoptionlist =~ s/=/\$=\$/g;
- $result.= $durtyoptionlist.$Apache::response::foilgroup{$name.'.text'};
- $Apache::optionresponse::displayoptionintex=1;
+ if ($displayoptionintex == 0) {
+ my $texoptionlist = &optionlist_correction($optionlist);
+ if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';}
+ if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
+ if ($Apache::lonhomework::type eq 'exam') {
+ $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
+ }
+ $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
+ } else {
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result.= $texoptionlist.'\vspace*{-2 mm}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+ } else {
+ $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
+ }
+ }
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result.=&bubbles(\@alphabet,\@opt);
+ }
+ $displayoptionintex=1;
} else {
- $result.= $Apache::response::foilgroup{$name.'.text'};
+ if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
+ if ($Apache::lonhomework::type eq 'exam') {
+ $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
+ }
+ $result.= $Apache::response::foilgroup{$name.'.text'};
+ } else {
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+ } else {
+ $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
+ }
+ }
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result.=&bubbles(\@alphabet,\@opt);
+ }
}
}
}
@@ -335,10 +410,52 @@ sub displayfoils {
}
+sub optionlist_correction {
+
+ my $texoptionlist = shift;
+ $texoptionlist =~ s/<option><\/option>/\\item \[\] Possible answers are:/;
+ $texoptionlist =~ s/<option>/\{\\bf /g;
+ $texoptionlist =~ s/<option selected="on">/\{\\bf /g;
+ $texoptionlist =~ s/<\/option>/\},/g;
+ $texoptionlist =~ s/,$/\./g;
+ $texoptionlist =~ s/>/\$>\$/g;
+ $texoptionlist =~ s/</\$<\$/g;
+ $texoptionlist =~ s/=/\$=\$/g;
+ return $texoptionlist;
+}
+
+
+sub bubbles {
+
+ my ($ralphabit,$ropt) = @_;
+ my @alphabet = @$ralphabit;
+ my @opt = @$ropt;
+ my ($result,$head,$line) =('','','');
+ my $number_of_bubbles = $#opt + 1;
+ my $current_length = 0;
+ for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
+ $current_length += (length($opt[$ind])+length($alphabet[$ind])+2)*2;
+ if ($current_length<0.9*$ENV{'form.textwidth'} and $ind!=$number_of_bubbles) {
+ $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
+ $head.='lr';
+ } else {
+ $line=~s/\&\s*$//;
+ $result.='\vskip -5 mm\begin{tabular}{'.$head.'}\\\\'.$line.'\\\\\end{tabular}';
+ $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
+ $head ='lr';
+ $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;
+ }
+
+ }
+ &Apache::lonxml::increment_counter();
+ return $result;
+}
+
+
sub start_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::optionresponse::conceptgroup=1;
- %Apache::response::conceptgroup={};
+ %Apache::response::conceptgroup=();
my $result;
if ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
@@ -361,13 +478,15 @@ sub end_conceptgroup {
#if not there aren't any foils to display and thus no question
if (defined(@{ $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];
push @{ $Apache::response::foilgroup{'names'} }, $name;
$Apache::response::foilgroup{"$name.value"} =
$Apache::response::conceptgroup{"$name.value"};
$Apache::response::foilgroup{"$name.text"} =
$Apache::response::conceptgroup{"$name.text"};
+ $Apache::response::foilgroup{"$name.location"} =
+ $Apache::response::conceptgroup{"$name.location"};
my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
$Apache::response::foilgroup{"$name.concept"} = $concept;
&Apache::lonxml::debug("Selecting $name in $concept");
@@ -384,7 +503,15 @@ sub end_conceptgroup {
$Apache::response::conceptgroup{"$name.value"};
$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
$Apache::response::conceptgroup{"$name.text"};
+ $Apache::lonhomework::analyze{"$part_id.foil.location.$name"} =
+ $Apache::response::conceptgroup{"$name.location"};
}
+ } elsif ($target eq 'web') {
+ my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ push(@{ $Apache::hint::option{"$part_id.concepts"} },
+ $concept);
+ $Apache::hint::option{"$part_id.concept.$concept"}=
+ $Apache::response::conceptgroup{'names'};
}
}
} elsif ($target eq 'edit') {
@@ -410,10 +537,18 @@ sub start_foil {
my @opt;
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
$result.=&Apache::edit::text_arg('Name:','name',$token);
- $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');
+ $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',
+ ['unused',(@opt)],$token,'15');
+ my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
+ $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();
} elsif ($target eq 'modified') {
- my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 'value','name','location');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
@@ -424,13 +559,15 @@ sub end_foil {
my $text ='';
my $result = '';
if ($target eq 'web' || $target eq 'tex') {
- $text=&Apache::lonxml::endredirection;
+ $text=&Apache::lonxml::endredirection;
+ if ($target eq 'tex') { $text = '\vspace*{-2 mm}\item '.$text; }
}
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'
|| $target eq 'tex' || $target eq 'analyze') {
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
if ($value ne 'unused') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+ my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
&Apache::lonxml::debug("Got a name of :$name:");
if (!$name) { $name=$Apache::lonxml::curdepth; }
&Apache::lonxml::debug("Using a name of :$name:");
@@ -438,15 +575,13 @@ sub end_foil {
&& !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
- $Apache::response::conceptgroup{"$name.text"} = $text;
+ $Apache::response::conceptgroup{"$name.text"} = $text;
+ $Apache::response::conceptgroup{"$name.location"} = $location;
} else {
push @{ $Apache::response::foilgroup{'names'} }, $name;
- if ($target eq 'tex') {
- $Apache::response::foilgroup{"$name.value"} = '\item '.$value;
- } else {
- $Apache::response::foilgroup{"$name.value"} = $value;
- }
+ $Apache::response::foilgroup{"$name.value"} = $value;
$Apache::response::foilgroup{"$name.text"} = $text;
+ $Apache::response::foilgroup{"$name.location"} = $location;
}
}
}