Add the ability to parse a sig fig number in the form 1.00 x 10^3 for example.

Removed the sigfig2.t macro.

Updated the latex subroutine to not throw warnings when tests are run.

Author: pstaabp

macros/contexts/contextSignificantFigures.pl

@@ -220,12 +220,13 @@ sub expFor {
 
 sub TeX {
 	my $tex = shift->string;
-	$tex =~ s/E(?:(-)|\+)0*([1-9]\d?)/\\times 10^{$1$2}/;
+	# Capture the + or - in $1, then the digits in $2
+	$tex =~ s/E([-+])0*(\d+)/'\\times 10^{' . ($1 eq '-' ? '-' : '') . $2 . '}' /e;
 	return "{$tex}";
 }
 
 # Format the number in $value in either 'E' (exponential form) or 'f' decimal form using
-# $n signficant figures.
+# $n significant figures.
 
 # Example: format('E', '123.456', 6) returns 1.23456E+02
 # format('f', 1.23E-01, 3) returns '0.123'.
@@ -243,7 +244,7 @@ sub format {
 	return sprintf("%.${n}${f}" . ($n == 0 && $f eq 'f' ? '.' : ''), $value);
 }
 
-# Redefine addition.  The leftmost signifcant place in the result is needed to get the
+# Redefine addition.  The leftmost significant place in the result is needed to get the
 # correct value.
 
 sub add {
@@ -253,7 +254,7 @@ sub add {
 	return $self->new($value, sigfigs => main::max(0, $exp + $self->expFor($value, $exp)));
 }
 
-# Redefine subtraction.  The leftmost signifcant place in the result is needed to get the
+# Redefine subtraction.  The leftmost significant place in the result is needed to get the
 # correct value.
 
 sub sub {
@@ -333,20 +334,18 @@ sub ROUND {
 
 package context::SignificantFigures::BOP::parse;
 our @ISA = ("Parser::BOP");
-use Data::Dumper;
+
 sub _check {
-	my $self = @_;
+	my ($self) = @_;
 	my ($lop, $rop) = ($self->{lop}, $self->{rop});
-print Dumper 'in _check';
-print Dumper [$self, ref $lop, ref $rop];
-
-
 }
 
 sub _eval {
-	my ($self, $a, $b) = @_;
-	print Dumper [ref $self, $a->value, ref $b->value];
-	return $self->package('SignificantFigures')->new("$_[0]E$_[1]");
+	my ($self) = @_;
+	my $exp = $_[2]->string;
+	$exp = "+$exp" unless $exp < 0;
+	$exp =~ s/\.$//;
+	return context::SignificantFigures::Real->new("$_[1]E$exp");
 }
 
 package context::SignificantFigures;
@@ -367,12 +366,13 @@ sub new {
 	$context->{value}{Real}    = 'context::SignificantFigures::Real';
 	$context->functions->disable('All');
 	$context->constants->clear();
-	$context->{precedence}{SignifcantFigures} = $context->{precedence}{special};
+	$context->{precedence}{SignificantFigures} = $context->{precedence}{special};
 	$context->flags->set(limits => [ -1000, 1000, 1 ]);
 
-	$context->operators->add(
-		'x 10^' => { class => 'context::SignificantFigures::BOP::parse'}
-	);
+	$context->operators->add('x 10^' => { class => 'context::SignificantFigures::BOP::parse' });
+	$context->operators->add('x10^'  => { class => 'context::SignificantFigures::BOP::parse' });
+	$context->operators->add('* 10^' => { class => 'context::SignificantFigures::BOP::parse' });
+	$context->operators->add('*10^'  => { class => 'context::SignificantFigures::BOP::parse' });
 
 	return $context;
 }
@@ -408,5 +408,4 @@ sub perl {
 	return $self->context->Package('Real') . '->new(' . $value->value . ',' . $value->N . ')';
 }
 
-
 1;

t/contexts/sigfig2.t

@@ -163,7 +163,7 @@ subtest 'Create numbers with significant digits using Real' => sub {
 
 	my $a16 = Real('0.');
 	is $a16->format('E'), '0E+00', 'Check the format of 0.';
-	is $a16->sigfigs,     1,       '0. has 1 signficant figure';
+	is $a16->sigfigs,     1,       '0. has 1 significant figure';
 	is $a16->E,           0,       'The exponential of +00 is 0';
 	is $a16->string,      '0.',    'The string version is 0.';
 	is $a16->TeX,         '{0.}',  'The TeX version is {0.}';
@@ -384,11 +384,37 @@ subtest 'Division' => sub {
 	is $a2->E,           -1,         '1.0000/4.00 = 0.2500 = 2.50 * 10^(-1) (check exp)';
 
 };
-
-# subtest 'Significant Figures for integers' => sub {
-# 	# my $a1 = Compute('1.0 * 10^2');
-# 	my $a1 = Compute('1.0E+02');
-# 	is $a1->format('E'), '1.0E+02', '1.0 * 10^2 internally is 1.0E+02';
-# };
+use Data::Dumper;
+subtest 'Significant Figures for integers' => sub {
+	my $a1 = Compute('1.0 x 10^2');
+	is $a1->format('E'), '1.0E+02', '1.0 x 10^2 internally is 1.0E+02';
+	is $a1->sigfigs,     2,         '1.0 x 10^2 has 2 significant figures.';
+	is $a1->E,           2,         '1.0 x 10^2 = 1.0 * 10^2 (check exp)';
+
+	my $a2 = Compute('1.0x10^2');
+	is $a2->format('E'), '1.0E+02', '1.0 x 10^2 internally is 1.0E+02';
+	is $a2->sigfigs,     2,         '1.0 x 10^2 has 2 significant figures.';
+	is $a2->E,           2,         '1.0 x 10^2 = 1.0 * 10^2 (check exp)';
+
+	my $a3 = Compute('1.234 x 10^8');
+	is $a3->format('E'), '1.234E+08', '1.234 x 10^8 internally is 1.234E+08';
+	is $a3->sigfigs,     4,           '1.234 x 10^8 has 4 significant figures.';
+	is $a3->E,           8,           '1.234 x 10^8 = 1.234 * 10^8 (check exp)';
+
+	my $a4 = Compute('-1.23 x 10^-4');
+	is $a4->format('E'), '-1.23E-04', '-1.23 x 10^-4 internally is -1.23E-04';
+	is $a4->sigfigs,      3,          '-1.23 x 10^-4 has 3 significant figures.';
+	is $a4->E,           -4,          '-1.23 x 10^-4 = -1.23 * 10^-4 (check exp)';
+
+	my $a5 = Compute('1.23 * 10^3');
+	is $a5->format('E'), '1.23E+03', '1.23 * 10^3 internally is 1.23E+03';
+	is $a5->sigfigs,     3,          '1.23 * 10^3 has 3 significant figures.';
+	is $a5->E,           3,          '1.23 * 10^3 = 1.23 * 10^3 (check exp)';
+
+	my $a6 = Compute('-3.28*10^5');
+	is $a6->format('E'), '-3.28E+05', '-3.28 * 10^5 internally is -3.28E+05';
+	is $a6->sigfigs,     3,           '-3.28 * 10^5 has 3 significant figures.';
+	is $a6->E,           5,           '-3.28 * 10^5 = -3.28 * 10^5 (check exp)';
+};
 
 done_testing();