--- loncom/homework/caparesponse/caparesponse.pm 2004/02/05 18:41:06 1.126
+++ loncom/homework/caparesponse/caparesponse.pm 2004/03/12 21:06:19 1.141
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# caparesponse definition
#
-# $Id: caparesponse.pm,v 1.126 2004/02/05 18:41:06 albertel Exp $
+# $Id: caparesponse.pm,v 1.141 2004/03/12 21:06:19 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,6 +29,7 @@
package Apache::caparesponse;
use strict;
use capa;
+use Apache::lonlocal;
BEGIN {
&Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
@@ -98,7 +99,7 @@ sub end_numericalresponse {
my $tag;
if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
- &Apache::response::setup_params($tag);
+ &Apache::response::setup_params($tag,$safeeval);
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
my $partid = $Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
@@ -132,33 +133,34 @@ sub end_numericalresponse {
my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
foreach my $key (keys(%Apache::inputtags::params)) {
- $expression.= ';my $'. #'
+ $expression.= ';my $__LC__'. #'
$key.'="'.$Apache::inputtags::params{$key}.'"';
}
#no way to enter units, with radio buttons
if ($Apache::lonhomework::type eq 'exam' ||
lc($hideunit) eq "yes") {
- $expression.=';my $unit=undef;';
+ $expression.=';my $__LC__unit=undef;';
}
#sig fig don't make much sense either
if (($Apache::lonhomework::type eq 'exam' ||
$ENV{'form.submitted'} eq 'scantron') &&
$tag eq 'numericalresponse') {
- $expression.=';my $sig=undef;';
+ $expression.=';my $__LC__sig=undef;';
}
if ($tag eq 'formularesponse') {
- $expression.=';my $type="fml";';
+ $expression.=';my $__LC__type="fml";';
} elsif ($tag eq 'numericalresponse') {
- $expression.=';my $type="float";';
+ $expression.=';my $__LC__type="float";';
}
$expression.="');";
my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
&Apache::lonxml::debug('answer is'.join(':',@answer));
@{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer;
- $result = &Apache::run::run($expression,$safeeval);
+ ($result,my @msgs) = &Apache::run::run($expression,$safeeval);
+ &Apache::lonxml::debug('msgs are'.join(':',@msgs));
my ($awards) = split /:/ , $result;
($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
&Apache::lonxml::debug("$expression");
@@ -179,7 +181,7 @@ sub end_numericalresponse {
my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
$safeeval);
if ($target eq 'web') {
- $result="
The correct answer is ";
+ $result="
".&mt('The correct answer is')." ";
}
for (my $i=0; $i <= $#answers; $i++) {
my $answer=$answers[$i];
@@ -254,18 +256,18 @@ sub end_numericalresponse {
}
if ($tag eq 'numericalresponse') {
my ($celllength,$number_of_tables,@table_range)=
- &get_table_sizes($formats[0],$number_of_bubbles);
+ &get_table_sizes($number_of_bubbles,\@bubble_values);
my $j=0;
my $cou=0;
$result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
for (my $i=0;$i<$number_of_tables;$i++) {
$result.='\vskip -1 mm \noindent \begin{tabular}{';
for (my $ind=0;$ind<$table_range[$j];$ind++) {
- $result.='lp{'.$celllength.' mm}';
+ $result.='p{3 mm}p{'.$celllength.' mm}';
}
$result.='}';
for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
- $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$bubble_values[$ind].'} ';
+ $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_values[$ind].'} ';
if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
}
$cou += $table_range[$j];
@@ -297,7 +299,7 @@ sub end_numericalresponse {
push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);
}
if (scalar(@$tagstack)) {
- &Apache::response::setup_params($tag);
+ &Apache::response::setup_params($tag,$safeeval);
}
my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
@@ -376,23 +378,43 @@ sub end_numericalresponse {
}
sub get_table_sizes {
- my ($format,$number_of_bubbles)=@_;
- my $max_val = 0;
- if ($format=~m/^(\d+)E([^\d]*)(\d*)$/) {
- $max_val=$1+$2+4;
+ my ($number_of_bubbles,$rbubble_values)=@_;
+ my $scale=2; #mm for one digit
+ my $cell_width=0;
+ foreach my $member (@$rbubble_values) {
+ my $cell_width_real=0;
+ if ($member=~/(\+|-)?(\d*)\.?(\d*)\s*\$\\times\s*10\^{(\+|-)?(\d+)}\$/) {
+ $cell_width_real=(length($2)+length($3)+length($5)+7)*$scale;
+ } elsif ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {
+ $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale;
+ } elsif ($member=~/(\d*)\.(\d*)/) {
+ $cell_width_real=(length($1)+length($2)+3)*$scale;
+ } else {
+ $cell_width_real=(length($member)+1)*$scale*0.9;
+ }
+ if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;}
+ }
+ $cell_width+=8;
+ my $textwidth;
+ if ($ENV{'form.textwidth'} ne '') {
+ $ENV{'form.textwidth'}=~/(\d*)\.?(\d*)/;
+ $textwidth=$1.'.'.$2;
} else {
- $max_val=4;
+ $ENV{'textwidth'}=~/(\d+)\.?(\d*)/;
+ $textwidth=$1.'.'.$2;
}
- $max_val = int(0.9*$ENV{'form.textwidth'}/(($max_val+6)*2));
- my $celllength = 0.9*$ENV{'form.textwidth'}/$max_val-10;
+ my $bubbles_per_line=int($textwidth/$cell_width);
+ if (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==0)) {$bubbles_per_line=$number_of_bubbles/2;}
+ my $number_of_tables = int($number_of_bubbles/$bubbles_per_line);
my @table_range = ();
- my $number_of_tables = int($number_of_bubbles/$max_val);
- for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$max_val;}
- if ($number_of_bubbles % $max_val != 0) {
+ for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}
+ if ($number_of_bubbles % $bubbles_per_line) {
$number_of_tables++;
- push @table_range,($number_of_bubbles % $max_val);
+ push @table_range,($number_of_bubbles % $bubbles_per_line);
}
- return ($celllength,$number_of_tables,@table_range);
+ $cell_width-=8;
+ $cell_width=$cell_width*3/4;
+ return ($cell_width,$number_of_tables,@table_range);
}
sub format_number {
@@ -441,9 +463,17 @@ sub make_numerical_bubbles {
@bubble_values=sort {$a <=> $b} (@bubble_values,$answer);
&Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values));
&Math::Random::random_set_seed(@oldseed);
+ if (defined($format) && $format ne '') {
+ foreach my $value (@bubble_values) {
+ $value=&format_number($value,$format,$target);
+ }
+ }
return @bubble_values;
}
- #FIXME what to do when not enough incorrects specified?
+ if (defined($$incorrect[0]) &&
+ scalar(@$incorrect)+1 < $number_of_bubbles) {
+ &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them.");
+ }
}
my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors
my @powers = (1..$number_of_bubbles);
@@ -493,6 +523,16 @@ sub get_sigrange {
}
if (!$sig_ubound) { $sig_ubound=$sig_lbound; }
}
+ if (($sig_ubound<$sig_lbound) ||
+ ($sig_lbound > 15) ||
+ ($sig =~/(\+|-)/ ) ) {
+ my $errormsg=&mt("Invalid Significant figures detected")." ($sig)";
+ if ($ENV{'request.state'} eq 'construct') {
+ $errormsg.=
+ &Apache::loncommon::help_open_topic('Significant_Figures');
+ }
+ &Apache::lonxml::error($errormsg);
+ }
return ($sig_ubound,$sig_lbound);
}
@@ -511,16 +551,18 @@ sub start_stringresponse {
[['cs','Case Sensitive'],['ci','Case Insensitive'],
['mc','Case Insensitive, Any Order'],
['re','Regular Expression']],$token);
+ $result.=&Apache::edit::checked_arg('Answer Display:','answerdisplay',
+ [['inline','Inline']],$token);
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
- my $constructtag;
- $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'answer',
- 'type');
- if ($constructtag) {
- $result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
- }
+ my $constructtag;
+ $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'answer',
+ 'type','answerdisplay');
+ if ($constructtag) {
+ $result = &Apache::edit::rebuild_tag($token);
+ $result.=&Apache::edit::handle_insert();
+ }
} elsif ($target eq 'answer' || $target eq 'grade') {
&Apache::response::reset_params();
}
@@ -535,12 +577,13 @@ sub end_stringresponse {
my $id=$Apache::inputtags::response[-1];
my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
+ my $answerdisplay=&Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval);
&Apache::lonxml::debug("current $answer ".$token->[2]);
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
- &Apache::response::setup_params('stringresponse');
+ &Apache::response::setup_params('stringresponse',$safeeval);
$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
if ($Apache::lonhomework::type eq 'exam' ||
$ENV{'form.submitted'} eq 'scantron') {
@@ -597,7 +640,8 @@ sub end_stringresponse {
my $status = $Apache::inputtags::status['-1'];
if ( &Apache::response::show_answer() ) {
if ($target eq 'web') {
- $result="
The correct answer is ".$answer;
+ $result=($answerdisplay eq 'inline'?'':"
".&mt('The correct answer is')." ")
+ .$answer;
# join(', ',@answers).".
";
}
}
@@ -616,7 +660,7 @@ sub end_stringresponse {
push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");
$Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse';
}
- &Apache::response::setup_params('stringresponse');
+ &Apache::response::setup_params('stringresponse',$safeeval);
if ($target eq 'answer') {
$result.=&Apache::response::answer_header('stringresponse');
}