--- loncom/homework/radiobuttonresponse.pm 2007/06/19 10:00:23 1.116
+++ loncom/homework/radiobuttonresponse.pm 2008/03/22 00:36:57 1.133
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.116 2007/06/19 10:00:23 foxr Exp $
+# $Id: radiobuttonresponse.pm,v 1.133 2008/03/22 00:36:57 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -18,8 +18,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with LON-CAPA; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with LON-CAPA; if not, write to the Free Software# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# /home/httpd/html/adm/gpl.txt
#
@@ -33,12 +32,25 @@ use Apache::lonlocal;
use Apache::lonnet;
use Apache::response;
-my $bubbles_per_line = 10;
+my $default_bubbles_per_line = 10;
+
BEGIN {
&Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
}
+sub bubble_line_count {
+ my ($numfoils, $bubbles_per_line) = @_;
+ my $bubble_lines;
+ $bubble_lines = int($numfoils / $bubbles_per_line);
+ if (($numfoils % $bubbles_per_line) != 0) {
+ $bubble_lines++;
+ }
+ return $bubble_lines;
+
+}
+
+
sub start_radiobuttonresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
@@ -47,6 +59,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=();
undef(%Apache::response::foilnames);
if ($target eq 'meta') {
@@ -90,6 +103,7 @@ sub start_radiobuttonresponse {
$result .= '\begin{enumerate}';
} elsif ($target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$id";
+ $Apache::lonhomework::analyze{"$part_id.type"} = 'radiobuttonresponse';
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
}
return $result;
@@ -140,71 +154,29 @@ sub storesurvey {
return '';
}
+
sub grade_response {
- my ($max,$randomize)=@_;
- #keep the random numbers the same must always call this
- my ($answer,@whichfoils)=&whichfoils($max,$randomize);
+ my ($answer, $whichfoils, $bubbles_per_line)=@_;
+
if ( !&Apache::response::submitted() ) { return; }
my $response;
+
if ($env{'form.submitted'} eq 'scantron') {
- # Need to know how many foils we have so that I know how many
- # bubble lines to consume:
-
- my $numfoils = scalar @whichfoils;
- my $bubble_lines = int($numfoils / $bubbles_per_line);
- if (($numfoils % $bubbles_per_line) != 0) {
- $bubble_lines++; # Partial line of bubbles too.
- }
- # Get an array of the lines... note offsets seem to go from 1??...
-
- my @responses;
- for (my $i = 1; $i <= $bubble_lines; $i++) {
- my $this_line = &Apache::response::getresponse($i);
- push(@responses, $this_line);
-
- }
- # Update the lonxml::counter so that the next problem
- # Gets the right set of answers:
-
- &Apache::lonxml::increment_counter($bubble_lines-1);
-
- # This code assumes that unbubbled lines will be
- # blank while bubbled lines nonblank.
- # .. multiple answers awards the student 'INCORRECT'.
- # This is done by setting resopnse to "Multiple" which will
- # not match anything.
- #.. otherwise response is set to the line*$bubble_per_line+answer
- #
- # --- note:
- # If it is not possible to do double bubble detection
- # easily in grades.pm separating this loop makes it pretty
- # easy to do it here.
- # Just count the number of non-blank entries, and
- # below the loop, check for non-blank entries != 1
- # and report a wrong answer if so.
- #
- my $answer_line;
- my $answer_value = ''; # By default no answer given...
- my $num_bubbled_lines=0;
- for (my $line_number = 0; $line_number < $bubble_lines; $line_number++) {
- if ($responses[$line_number] ne "") {
- $answer_line = $line_number;
- $answer_value = $responses[$line_number];
- last;
- }
- }
-
- $response = $answer_line * $bubbles_per_line + $answer_value;
-
+ $response = &Apache::response::getresponse(1,undef,
+ &bubble_line_count(scalar(@{ $whichfoils}),
+ $bubbles_per_line),
+ $bubbles_per_line);
} else {
$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 %responsehash;
- $responsehash{$whichfoils[$response]}=$response;
+ $responsehash{$whichfoils->[$response]}=$response;
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
my %previous=&Apache::response::check_for_previous($responsestr,
$part,$id);
@@ -225,6 +197,17 @@ sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
+ my $bubble_lines;
+ my $bubbles_per_line;
+ my $answer_count;
+ my $id = $Apache::inputtags::response['-1'];
+ my $part = $Apache::inputtags::part;
+ $bubbles_per_line =
+ &Apache::response::get_response_param($Apache::inputtags::part."_$id",
+ 'numbubbles',
+ $default_bubbles_per_line);
+
+
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
my $style = $Apache::lonhomework::type;
@@ -238,25 +221,36 @@ sub end_foilgroup {
} elsif ( $target eq 'grade' ) {
$result=&storesurvey();
}
+ $answer_count = scalar(@{$Apache::response::foilgroup{'names'}});
+
} else {
+
my $name;
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,
'-2');
my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
$safeeval,'-2');
+ my ($answer, @shown) = &whichfoils($max, $randomize);
+ $answer_count = scalar(@shown);
+
if ($target eq 'web' || $target eq 'tex') {
- $result=&displayfoils($target,$max,$randomize,$direction);
+ $result=&displayfoils($target,
+ $answer, \@shown,
+ $direction,
+ $bubbles_per_line);
} elsif ($target eq 'answer' ) {
- $result=&displayanswers($max,$randomize);
+ $result=&displayanswers($answer, \@shown, $bubbles_per_line);
} elsif ( $target eq 'grade') {
- &grade_response($max,$randomize);
+ &grade_response($answer, \@shown, $bubbles_per_line);
} elsif ( $target eq 'analyze') {
- my @shown = &whichfoils($max,$randomize);
+ my $bubble_lines = &bubble_line_count($answer_count,
+ $bubbles_per_line);
&Apache::response::analyze_store_foilgroup(\@shown,
['text','value','location']);
- my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ my $part_id="$part.$id";
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },
('true','false'));
+
}
}
$Apache::lonxml::post_evaluate=0;
@@ -265,9 +259,13 @@ sub end_foilgroup {
&Apache::response::setup_prior_tries_hash(\&format_prior_answer,
[\%Apache::response::foilgroup]);
}
-
&Apache::response::poprandomnumber();
- &Apache::lonxml::increment_counter();
+ $bubble_lines = &bubble_line_count($answer_count, $bubbles_per_line);
+ &Apache::lonxml::increment_counter($bubble_lines,
+ "$part.$id");
+ if ($target eq 'analyze') {
+ &Apache::lonhomework::set_bubble_lines();
+ }
return $result;
}
@@ -307,6 +305,7 @@ sub displayallfoils {
if ( $Apache::response::foilgroup{'names'} ) {
@names= @{ $Apache::response::foilgroup{'names'} };
}
+
my $temp=0;
my $i =0;
my $id=$Apache::inputtags::response['-1'];
@@ -376,10 +375,39 @@ sub displayallfoils {
}
}
}
+
if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.='</tr></table>'; }
return $result;
}
+=pod
+
+=item &whichfoils($max,$randomize)
+
+Randomizes the list of foils.
+Respects
+ - each foils desire to be randomized
+ - the existance of Concept groups of foils (select 1 foil from each)
+ - and selects a single correct statement from all possilble true statments
+ - and limits it to a toal of $max foils
+
+WARNING: this routine uses the random number generator, it should only
+be called once per target, otherwise it can cause randomness changes in
+homework problems.
+
+Arguments
+ $max - maximum number of foils to select (including the true one)
+ (so a max of 5 is: 1 true, 4 false)
+
+ $randomize - whether to randomize the listing of foils, by default
+ will randomize, only if randomize is 'no' will it not
+
+Returns
+ $answer - location in the array of the correct answer
+ @foils - array of foil names in to display order
+
+=cut
+
sub whichfoils {
my ($max,$randomize)=@_;
@@ -517,10 +545,9 @@ sub whichfoils {
}
sub displayfoils {
- my ($target,$max,$randomize,$direction)=@_;
+ my ($target,$answer,$whichfoils,$direction, $bubbles_per_line)=@_;
my $result;
- my ($answer,@whichfoils)=&whichfoils($max,$randomize);
my $part=$Apache::inputtags::part;
my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
if ( ($target ne 'tex') &&
@@ -530,7 +557,7 @@ sub displayfoils {
$result.='<table><tr>';
}
}
- foreach my $name (@whichfoils) {
+ foreach my $name (@{ $whichfoils }) {
if ($direction eq 'horizontal') {
if ($target ne 'tex') { $result.='<td>'; }
}
@@ -540,9 +567,13 @@ sub displayfoils {
$result.='\item \vskip -2 mm ';
}
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
- if ($target ne 'tex') { $result.='Correct:<b>'; } else { $result.='Correct: \textbf{';}
+ if ($target ne 'tex') {
+ $result.=&mt('Correct:').'<b>';
+ } else {
+ $result.=&mt('Correct:').' \textbf{';
+ }
} else {
- $result.='Incorrect:';
+ $result.=&mt('Incorrect:');
}
if ($target eq 'web') { $result.="<label>"; }
$result.=$Apache::response::foilgroup{$name.'.text'};
@@ -563,6 +594,7 @@ sub displayfoils {
my @alphabet = ('A'..'Z');
my $i = 0;
my $bubble_number = 0;
+ my $line = 0;
my $temp=0;
my $id=$Apache::inputtags::response['-1'];
my $part=$Apache::inputtags::part;
@@ -571,7 +603,7 @@ sub displayfoils {
if ($target ne 'tex' && $direction eq 'horizontal') {
$result.="<table><tr>";
}
- foreach my $name (@whichfoils) {
+ foreach my $name (@{ $whichfoils }) {
if ($target ne 'tex') {
if ($direction eq 'horizontal') {
$result.="<td>";
@@ -590,15 +622,15 @@ sub displayfoils {
$result .= ' />'.$Apache::response::foilgroup{$name.'.text'}."</label>";
} else {
if ($Apache::lonhomework::type eq 'exam') {
- $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs
- $i++;
- $bubble_number++;
if($bubble_number >= $bubbles_per_line) {
+ $line++;
$i = 0;
$bubble_number = 0;
- &Apache::lonxml::increment_counter(1);
- $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
+ $result.='\item[\textbf{'.($Apache::lonxml::counter+$line).'}.]';
}
+ $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs
+ $i++;
+ $bubble_number++;
} else {
$result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
}
@@ -621,7 +653,6 @@ sub displayallanswers {
if ( $Apache::response::foilgroup{'names'} ) {
@names= @{ $Apache::response::foilgroup{'names'} };
}
-
my $result=&Apache::response::answer_header('radiobuttonresponse');
foreach my $name (@names) {
$result.=&Apache::response::answer_part('radiobuttonresponse',
@@ -632,15 +663,20 @@ sub displayallanswers {
}
sub displayanswers {
- my ($max,$randomize)=@_;
- my ($answer,@whichopt) = &whichfoils($max,$randomize);
- my $result=&Apache::response::answer_header('radiobuttonresponse');
+ my ($answer, $whichopt, $bubbles_per_line)=@_;
+ my $result;
+
if ($Apache::lonhomework::type eq 'exam') {
- my $correct = ('A'..'Z')[$answer];
- $result.=&Apache::response::answer_part('radiobuttonresponse',
- $correct);
+ my $line = int($answer/$bubbles_per_line);
+ my $correct = ('A'..'Z')[$answer%$bubbles_per_line];
+ $result .= &Apache::response::answer_header('radiobuttonresponse',
+ $line);
+ $result .= &Apache::response::answer_part('radiobuttonresponse',
+ $correct);
+ } else {
+ $result .= &Apache::response::answer_header('radiobuttonresponse');
}
- foreach my $name (@whichopt) {
+ foreach my $name (@{ $whichopt }) {
$result.=&Apache::response::answer_part('radiobuttonresponse',
$Apache::response::foilgroup{$name.'.value'});
}