version 1.126.2.1, 2004/02/19 19:24:38
|
version 1.126.2.2, 2004/02/26 18:24:24
|
Line 383 sub get_table_sizes {
|
Line 383 sub get_table_sizes {
|
my $cell_width_real=0; |
my $cell_width_real=0; |
if ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) { |
if ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) { |
$cell_width_real=(length($1)+length($2)+length($5)+9)*$scale; |
$cell_width_real=(length($1)+length($2)+length($5)+9)*$scale; |
} elsif ($member=~/(\d*)\.?(\d*)/) { |
} elsif ($member=~/(\d*)\.(\d*)/) { |
$cell_width_real=(length($1)+length($2)+2)*$scale; |
$cell_width_real=(length($1)+length($2)+3)*$scale; |
} else { |
} else { |
$cell_width_real=(length($member)+1)*$scale; |
$cell_width_real=(length($member)+1)*$scale; |
} |
} |
if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;} |
if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;} |
} |
} |
$cell_width+=8; |
$cell_width+=8; |
my $textwidth; |
my $textwidth; |
if ($ENV{'form.textwidth'} ne '') { |
if ($ENV{'form.textwidth'} ne '') { |
$ENV{'form.textwidth'}=~/(\d+)/; |
$ENV{'form.textwidth'}=~/(\d*)\.?(\d*)/; |
$textwidth=$1; |
$textwidth=$1.'.'.$2; |
} else { |
} else { |
$ENV{'textwidth'}=~/(\d+)/; |
$ENV{'textwidth'}=~/(\d+)\.?(\d*)/; |
$textwidth=$1; |
$textwidth=$1.'.'.$2; |
} |
} |
my $bubbles_per_line=int($textwidth/$cell_width); |
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 $number_of_tables = int($number_of_bubbles/$bubbles_per_line); |
my @table_range = (); |
my @table_range = (); |
for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;} |
for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;} |
Line 457 sub make_numerical_bubbles {
|
Line 458 sub make_numerical_bubbles {
|
@bubble_values=sort {$a <=> $b} (@bubble_values,$answer); |
@bubble_values=sort {$a <=> $b} (@bubble_values,$answer); |
&Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values)); |
&Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values)); |
&Math::Random::random_set_seed(@oldseed); |
&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; |
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 @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors |
my @powers = (1..$number_of_bubbles); |
my @powers = (1..$number_of_bubbles); |