version 1.221, 2008/02/01 23:00:56
|
version 1.224, 2008/04/05 15:39:20
|
Line 678 sub end_numericalresponse {
|
Line 678 sub end_numericalresponse {
|
#} |
#} |
} |
} |
if ($high && $tag eq 'numericalresponse') { |
if ($high && $tag eq 'numericalresponse') { |
$element.=' ['.$low.','.$high.']'; |
$element.='; ['.$low.'; '.$high.']'; |
$tolline .= "[$low, $high]"; |
$tolline .= "[$low, $high]"; |
} |
} |
if (defined($sighigh) && $tag eq 'numericalresponse') { |
if (defined($sighigh) && $tag eq 'numericalresponse') { |
if ($env{'form.answer_output_mode'} eq 'tex') { |
if ($env{'form.answer_output_mode'} eq 'tex') { |
$element.= " Sig $siglow - $sighigh"; |
$element.= "; Sig $siglow - $sighigh"; |
} else { |
} else { |
$element.= " Sig <i>$siglow - $sighigh</i>"; |
$element.= " Sig <i>$siglow - $sighigh</i>"; |
$sigline .= "[$siglow, $sighigh]"; |
$sigline .= "[$siglow, $sighigh]"; |
Line 703 sub end_numericalresponse {
|
Line 703 sub end_numericalresponse {
|
} |
} |
} |
} |
if ($target eq 'answer') { |
if ($target eq 'answer') { |
$result.= &Apache::response::answer_part($tag,join(', ',@all_answer_info)); |
$result.= &Apache::response::answer_part($tag,join('; ',@all_answer_info)); |
} |
} |
} |
} |
|
|
Line 988 sub make_numerical_bubbles {
|
Line 988 sub make_numerical_bubbles {
|
$ind=&Math::Random::random_uniform_integer(1,0,$#factors); |
$ind=&Math::Random::random_uniform_integer(1,0,$#factors); |
my $factor = $factors[$ind]; |
my $factor = $factors[$ind]; |
my @bubble_display; |
my @bubble_display; |
|
my $answerfactor=$answer; |
|
if ($answer==0) { |
|
$answerfactor=&Math::Random::random_uniform_integer(1,1,100)/ |
|
&Math::Random::random_uniform_integer(1,1,10); |
|
} |
for ($ind=0;$ind<$number_of_bubbles;$ind++) { |
for ($ind=0;$ind<$number_of_bubbles;$ind++) { |
$bubble_values[$ind] = $answer*($factor**($power-$powers[$#powers-$ind])); |
$bubble_values[$ind] = $answerfactor*($factor**($power-$powers[$#powers-$ind])); |
$bubble_display[$ind] = &format_number($bubble_values[$ind], |
$bubble_display[$ind] = &format_number($bubble_values[$ind], |
$format,$target,$safeeval); |
$format,$target,$safeeval); |
|
|
} |
} |
my $correct = $alphabet[$number_of_bubbles-$power]; |
my $correct = $alphabet[$number_of_bubbles-$power]; |
|
if ($answer==0) { |
|
$correct='A'; |
|
$bubble_values[0]=0; |
|
$bubble_display[0] = &format_number($bubble_values[0], |
|
$format,$target,$safeeval); |
|
} |
&Math::Random::random_set_seed(@oldseed); |
&Math::Random::random_set_seed(@oldseed); |
return (\@bubble_values,\@bubble_display,$correct); |
return (\@bubble_values,\@bubble_display,$correct); |
} |
} |