version 1.83, 2004/05/27 03:46:02
|
version 1.86, 2004/06/09 21:08:21
|
Line 106 sub caparesponse_check {
|
Line 106 sub caparesponse_check {
|
} |
} |
} |
} |
|
|
if ($sig eq '') { |
($sig_ubound,$sig_lbound)=&LONCAPA_INTERNAL_get_sigrange($sig); |
$sig_lbound = 0; #SIG_LB_DEFAULT |
|
$sig_ubound =15; #SIG_UB_DEFAULT |
|
} else { |
|
($sig_lbound,$sig_ubound) = split /,/,$sig; |
|
if (!defined($sig_lbound)) { |
|
$sig_lbound = 0; #SIG_LB_DEFAULT |
|
$sig_ubound =15; #SIG_UB_DEFAULT |
|
} |
|
if (!defined($sig_ubound)) { $sig_ubound=$sig_lbound; } |
|
} |
|
my $reterror=""; |
my $reterror=""; |
my $result = &caparesponse_capa_check_answer($response,$answer,$type, |
my $result = &caparesponse_capa_check_answer($response,$answer,$type, |
$tol_type,$tol, |
$tol_type,$tol, |
Line 242 sub random {
|
Line 233 sub random {
|
if ( ! $hidden::RANDOMINIT ) { |
if ( ! $hidden::RANDOMINIT ) { |
if ($external::randomseed == 0) { $external::randomseed=1; } |
if ($external::randomseed == 0) { $external::randomseed=1; } |
if ($external::randomseed =~/,/) { |
if ($external::randomseed =~/,/) { |
my ($num1,$num2)=split(/,/,$seed); |
my ($num1,$num2)=split(/,/,$external::randomseed); |
|
&random_set_seed(1,abs($num1)); |
|
} elsif ($external::randomseed =~/:/) { |
|
my ($num1,$num2)=split(/:/,$external::randomseed); |
&random_set_seed(abs($num1),abs($num2)); |
&random_set_seed(abs($num1),abs($num2)); |
} else { |
} else { |
&random_set_seed(1,int(abs($external::randomseed))); |
&random_set_seed(1,int(abs($external::randomseed))); |
Line 541 sub prettyprint {
|
Line 535 sub prettyprint {
|
if ($fmt =~ /chem/i) { return(&chemparse($value)); } |
if ($fmt =~ /chem/i) { return(&chemparse($value)); } |
my ($dollarmode,$commamode,$alwaysperiod,$options); |
my ($dollarmode,$commamode,$alwaysperiod,$options); |
if ($fmt =~ /^([^\d]*)(.*)/) { $options=$1; $fmt=$2; } |
if ($fmt =~ /^([^\d]*)(.*)/) { $options=$1; $fmt=$2; } |
if ($options =~ /\$/) { $dollamode=1; } |
if ($options =~ /\$/) { $dollarmode=1; } |
if ($options =~ /,/) { $commamode=1; } |
if ($options =~ /,/) { $commamode=1; } |
if ($options =~ /\./) { $alwaysperiod=1; } |
if ($options =~ /\./) { $alwaysperiod=1; } |
if ($fmt) { $value=sprintf('%.'.$fmt,$value); } |
if ($fmt) { $value=sprintf('%.'.$fmt,$value); } |
Line 574 sub prettyprint {
|
Line 568 sub prettyprint {
|
} |
} |
} else { |
} else { |
$result=$value; |
$result=$value; |
if ($dollarmode) { $result=&dollarformat($result,$target); } |
if ($dollarmode) { $result=&dollarformat($result,$target); } |
if ($commamode) { $result=&commaformat($result,$target); } |
elsif ($commamode) { $result=&commaformat($result,$target); } |
} |
} |
return $result; |
return $result; |
} |
} |