version 1.165, 2014/06/24 17:02:33
|
version 1.171, 2016/12/06 20:51:11
|
Line 1045 sub format_significant_figures {
|
Line 1045 sub format_significant_figures {
|
my $numSig = $xint*10**($x10-$sig+$power); |
my $numSig = $xint*10**($x10-$sig+$power); |
if ($numSig =~ /^(\d+)\.(\d+)/) { |
if ($numSig =~ /^(\d+)\.(\d+)/) { |
# insert trailing zero's if have decimal point |
# insert trailing zero's if have decimal point |
|
my @digarray = split('',$1.$2); |
|
my $sigcount; |
|
while (@digarray > 0) { |
|
my $item = shift(@digarray); |
|
if ($item) { |
|
$sigcount = 1 + @digarray; |
|
last; |
|
} |
|
} |
|
if (($sigcount) && ($sig >= $sigcount)) { |
|
$zeros = substr($zeros,0,($sig - $sigcount)); |
|
} |
$numSig =~ s/^(\d+)\.(\d+)(\e?(.*)?)$/$1\.$2$zeros$3/; |
$numSig =~ s/^(\d+)\.(\d+)(\e?(.*)?)$/$1\.$2$zeros$3/; |
} else { |
} else { |
if ($numSig =~ /0$/) { |
if ($numSig =~ /^(\d+)e([\+\-]\d+)$/i) { |
|
my $pre_exp = $1; |
|
my $exponent = $2; |
|
$numSig = $pre_exp.'.'.$zeros.'E'.$exponent; |
|
} elsif ($numSig =~ /0$/) { |
# add decimal pt for number ending with 0 and length == # of sig figs |
# add decimal pt for number ending with 0 and length == # of sig figs |
if (length($numSig) == $sig) { |
if (length($numSig) == $sig) { |
$numSig.='.'; |
$numSig.='.'; |
Line 1055 sub format_significant_figures {
|
Line 1071 sub format_significant_figures {
|
# exponential form for number ending with 0 and length > # of sig figs |
# exponential form for number ending with 0 and length > # of sig figs |
my $fmtsig = $sig-1; |
my $fmtsig = $sig-1; |
if ($fmtsig) { |
if ($fmtsig) { |
$numSig = sprintf('%.'.$fmtsig.'e',$numSig); |
$numSig = sprintf('%.'.$fmtsig.'E',$numSig); |
} |
} |
|
} elsif (length($numSig) < $sig) { |
|
$numSig.='.'.substr($zeros,0,($sig-length($numSig))); |
|
} |
|
} else { |
|
if (length($numSig) < $sig) { |
|
$numSig.='.'.substr($zeros,0,($sig-length($numSig))); |
} |
} |
} |
|
if (length($numSig) < $sig) { |
|
$numSig.='.'.substr($zeros,0,($sig-length($numSig))); |
|
} |
} |
} |
} |
# return number with sign |
# return number with sign |
Line 1209 sub sec {
|
Line 1228 sub sec {
|
} |
} |
|
|
sub submission { |
sub submission { |
my ($partid,$responseid,$subnumber,$encode)=@_; |
my ($partid,$responseid,$subnumber,$encode,$cleanupnum,$mapalias)=@_; |
my $sub=''; |
my $sub=''; |
if ($subnumber) { $sub=$subnumber.':'; } |
if ($subnumber) { $sub=$subnumber.':'; } |
my $output = |
my $output = |
&EXT('user.resource.'.$sub.'resource.'.$partid.'.'.$responseid.'.submission'); |
&EXT('user.resource.'.$sub.'resource.'.$partid.'.'.$responseid.'.submission',$mapalias); |
if ($encode) { |
if (ref($output) eq 'ARRAY') { |
$output =~ s/&/&/g; |
my @items = @{$output}; |
$output =~ s/</</g; |
if ($encode) { |
$output =~ s/>/>/g; |
@items = map { &encode_response($_); } @items; |
$output =~ s/"/"/g; |
} |
|
if (ref($cleanupnum) eq 'HASH') { |
|
@items = map { &cleanup_numerical_response($cleanupnum,$_); } @items; |
|
} |
|
return \@items; |
|
} else { |
|
if ($encode) { |
|
$output = &encode_response($output); |
|
} |
|
if (ref($cleanupnum) eq 'HASH') { |
|
$output = &cleanup_numerical_response($cleanupnum,$output); |
|
} |
|
return $output; |
} |
} |
return $output; |
} |
|
|
|
sub encode_response { |
|
my ($value) = @_; |
|
$value =~ s/&/&/g; |
|
$value =~ s/</</g; |
|
$value =~ s/>/>/g; |
|
$value =~ s/"/"/g; |
|
return $value; |
|
} |
|
|
|
sub cleanup_numerical_response { |
|
my ($cleanupnum,$value) = @_; |
|
if (ref($cleanupnum) eq 'HASH') { |
|
if ($cleanupnum->{exponent}) { |
|
if ($value =~ m{^(.*)[\*xX]\s*10\s*\^\s*(\+|\-)?\s*(\d+)(.*)$}) { |
|
my $pre_exp = $1; |
|
my $sign = $2; |
|
my $exponent = $3; |
|
my $post_exp = $4; |
|
if ($pre_exp !~ /\./) { |
|
$pre_exp .= '.'; |
|
} |
|
if ($sign eq '') { |
|
$sign = '+'; |
|
} |
|
$value = $pre_exp.'E'.$sign.$exponent.$post_exp; |
|
} |
|
} |
|
if ($cleanupnum->{comma}) { |
|
$value =~ s{(\d+),(\d+)}{$1$2}; |
|
} |
|
if ($cleanupnum->{letterforzero}) { |
|
$value =~ s/^\s*o(\.\d+)/0$1/i; |
|
} |
|
if ($cleanupnum->{spaces}) { |
|
$value =~ s{^\s+|\s+$}{}g; |
|
if ($value =~ m{^(.*)\.\s+(\d+)(.*)$}) { |
|
my $pre_pt = $1; |
|
my $decimal = $2; |
|
my $post_dec = $3; |
|
$value = $pre_pt.'.'.$decimal.$post_dec; |
|
} |
|
} |
|
if ($cleanupnum->{format} =~ /^\d+s$/i) { |
|
$value = &format_significant_figures($value,$cleanupnum->{format}); |
|
} |
|
} |
|
return $value; |
} |
} |
|
|
sub currentpart { |
sub currentpart { |
Line 1379 sub proper_path {
|
Line 1458 sub proper_path {
|
} |
} |
} |
} |
|
|
|
sub input_id { |
|
my ($part_id, $response_id, $textline_id) = @_; |
|
return 'HWVAL_'.$part_id.'_'.$response_id.'_'.$textline_id; |
|
} |
|
|