Commitc98ba91

committed

more complete handling of corner-case roundings + add proper tests

1 parent0bde03a commitc98ba91Copy full SHA for c98ba91

File tree

+11

-7

lines changed

+11

-7

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -564,11 +564,13 @@ class TestEngFormatter(object):`
`564`	`564`	`(0.1, ('100 m','100 m','100.00 m')),`
`565`	`565`	`(1, ('1','1','1.00')),`
`566`	`566`	`(1.23456789, ('1.23457','1','1.23')),`
`567`		`- (999.9, ('999.9','1 k','999.90')),`
	`567`	`+ (999.9, ('999.9','1 k','999.90')),# places=0: corner-case rounding`
	`568`	`+ (999.9999, ('1 k','1 k','1.00 k')),# corner-case roudning for all`
`568`	`569`	`(1000, ('1 k','1 k','1.00 k')),`
`569`	`570`	`(1001, ('1.001 k','1 k','1.00 k')),`
`570`	`571`	`(100001, ('100.001 k','100 k','100.00 k')),`
`571`		`- (987654.321, ('987.654 k','988 k','987.65 k'))`
	`572`	`+ (987654.321, ('987.654 k','988 k','987.65 k')),`
	`573`	`+ (1.23e27, ('1230 Y','1230 Y','1230.00 Y'))# OoR value (> 1000 Y)`
`572`	`574`	`]`
`573`	`575`
`574`	`576`	`@pytest.mark.parametrize('input, expected',raw_format_data)`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1265,6 +1265,7 @@ def format_eng(self, num):`
`1265`	`1265`	`"""`
`1266`	`1266`	`dnum=float(num)`
`1267`	`1267`	`sign=1`
	`1268`	`+fmt="g"ifself.placesisNoneelse".{:d}f".format(self.places)`
`1268`	`1269`
`1269`	`1270`	`ifdnum<0:`
`1270`	`1271`	`sign=-1`
`@@ -1283,17 +1284,18 @@ def format_eng(self, num):`
`1283`	`1284`
`1284`	`1285`	`mant=signdnum/ (10.0*pow10)`
`1285`	`1286`	`# Taking care of the cases like 999.9..., which`
`1286`		`-# may be rounded to 1000 instead of 1 k.`
`1287`		`-if (self.placesisnotNoneand`
`1288`		`-round(mant,self.places)>=1000):`
	`1287`	`+# may be rounded to 1000 instead of 1 k. Beware`
	`1288`	`+# of the corner case of values that are beyond`
	`1289`	`+# the range of SI prefixes (i.e. > 'Y').`
	`1290`	`+_fmant=float("{mant:{fmt}}".format(mant=mant,fmt=fmt))`
	`1291`	`+if_fmant>=1000andpow10!=max(self.ENG_PREFIXES):`
`1289`	`1292`	`mant/=1000`
`1290`	`1293`	`pow10+=3`
`1291`	`1294`
`1292`	`1295`	`prefix=self.ENG_PREFIXES[int(pow10)]`
`1293`	`1296`
`1294`	`1297`	`formatted="{mant:{fmt}}{sep}{prefix}".format(`
`1295`		`-mant=mant,sep=self.sep,prefix=prefix,`
`1296`		`-fmt="g"ifself.placesisNoneelse".{:d}f".format(self.places))`
	`1298`	`+mant=mant,sep=self.sep,prefix=prefix,fmt=fmt)`
`1297`	`1299`
`1298`	`1300`	`returnformatted`
`1299`	`1301`

Comments

(0)