Commit604299f

committed

BUG: when autoscaling, handle tiny but non-zero values;closes#4318

1 parentcefab28 commit604299fCopy full SHA for 604299f

File tree

+19

-3

lines changed

+19

-3

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -552,6 +552,15 @@ def test_transform_angles():`
`552`	`552`	`assert_raises(ValueError,t.transform_angles,angles,points[0:2, :])`
`553`	`553`
`554`	`554`
	`555`	`+deftest_nonsingular():`
	`556`	`+# test for zero-expansion type cases; other cases may be added later`
	`557`	`+zero_expansion=np.array([-0.001,0.001])`
	`558`	`+cases= [(0,np.nan), (0,0), (0,7.9e-317)]`
	`559`	`+forargsincases:`
	`560`	`+out=np.array(mtrans.nonsingular(*args))`
	`561`	`+assert_array_equal(out,zero_expansion)`
	`562`	`+`
	`563`	`+`
`555`	`564`	`if__name__=='__main__':`
`556`	`565`	`importnose`
`557`	`566`	`nose.runmodule(argv=['-s','--with-doctest'],exit=False)`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2726,16 +2726,23 @@ def nonsingular(vmin, vmax, expander=0.001, tiny=1e-15, increasing=True):`
`2726`	`2726`
`2727`	`2727`	`Returns vmin, vmax, expanded and/or swapped if necessary.`
`2728`	`2728`
`2729`		`- If either input is inf or NaN, or if both inputs are 0,`
`2730`		`- returns -expander, expander.`
	`2729`	`+ If either input is inf or NaN, or if both inputs are 0 or very`
	`2730`	`+close to zero, itreturns -expander, expander.`
`2731`	`2731`	`'''`
`2732`	`2732`	`if (notnp.isfinite(vmin))or (notnp.isfinite(vmax)):`
`2733`	`2733`	`return-expander,expander`
	`2734`	`+`
`2734`	`2735`	`swapped=False`
`2735`	`2736`	`ifvmax<vmin:`
`2736`	`2737`	`vmin,vmax=vmax,vmin`
`2737`	`2738`	`swapped=True`
`2738`		`-ifvmax-vmin<=max(abs(vmin),abs(vmax))*tiny:`
	`2739`	`+`
	`2740`	`+maxabsvalue=max(abs(vmin),abs(vmax))`
	`2741`	`+ifmaxabsvalue< (1e6/tiny)*np.MachAr(float).xmin:`
	`2742`	`+vmin=-expander`
	`2743`	`+vmax=expander`
	`2744`	`+`
	`2745`	`+elifvmax-vmin<=maxabsvalue*tiny:`
`2739`	`2746`	`ifvmax==0andvmin==0:`
`2740`	`2747`	`vmin=-expander`
`2741`	`2748`	`vmax=expander`

Comments

(0)