Commitf8bc604

committed

FIX: _safe_first_finite on all non-finite array

1 parent161c96c commitf8bc604Copy full SHA for f8bc604

File tree

+17

-13

lines changed

+17

-13

lines changed

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -2208,19 +2208,11 @@ def _convert_dx(dx, x0, xconv, convert):`
`2208`	`2208`	`x0=cbook._safe_first_finite(x0)`
`2209`	`2209`	`except (TypeError,IndexError,KeyError):`
`2210`	`2210`	`pass`
`2211`		`-exceptStopIteration:`
`2212`		`-# this means we found no finite element, fall back to first`
`2213`		`-# element unconditionally`
`2214`		`-x0=cbook.safe_first_element(x0)`
`2215`	`2211`
`2216`	`2212`	`try:`
`2217`	`2213`	`x=cbook._safe_first_finite(xconv)`
`2218`	`2214`	`except (TypeError,IndexError,KeyError):`
`2219`	`2215`	`x=xconv`
`2220`		`-exceptStopIteration:`
`2221`		`-# this means we found no finite element, fall back to first`
`2222`		`-# element unconditionally`
`2223`		`-x=cbook.safe_first_element(xconv)`
`2224`	`2216`
`2225`	`2217`	`delist=False`
`2226`	`2218`	`ifnotnp.iterable(dx):`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1619,13 +1619,13 @@ def safe_first_element(obj):`
`1619`	`1619`
`1620`	`1620`	`def_safe_first_finite(obj,*,skip_nonfinite=True):`
`1621`	`1621`	`"""`
`1622`		`- Return the first non-None (and optionally finite) element in obj.`
	`1622`	`+ Return the first finite element in obj if one is available and skip_nonfinite is`
	`1623`	`+ True. Otherwise return the first element.`
`1623`	`1624`
`1624`	`1625`	`This is a method for internal use.`
`1625`	`1626`
`1626`		`- This is a type-independent way of obtaining the first non-None element,`
`1627`		`- supporting both index access and the iterator protocol.`
`1628`		`- The first non-None element will be obtained when skip_none is True.`
	`1627`	`+ This is a type-independent way of obtaining the first finite element, supporting`
	`1628`	`+ both index access and the iterator protocol.`
`1629`	`1629`	`"""`
`1630`	`1630`	`defsafe_isfinite(val):`
`1631`	`1631`	`ifvalisNone:`
`@@ -1657,7 +1657,7 @@ def safe_isfinite(val):`
`1657`	`1657`	`raiseRuntimeError("matplotlib does not "`
`1658`	`1658`	`"support generators as input")`
`1659`	`1659`	`else:`
`1660`		`-returnnext(valforvalinobjifsafe_isfinite(val))`
	`1660`	`+returnnext((valforvalinobjifsafe_isfinite(val)),safe_first_element(obj))`
`1661`	`1661`
`1662`	`1662`
`1663`	`1663`	`defsanitize_sequence(data):`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -608,6 +608,18 @@ def test_flatiter():`
`608`	`608`	`assert1==next(it)`
`609`	`609`
`610`	`610`
	`611`	`+deftest__safe_first_finite_all_nan():`
	`612`	`+arr=np.full(2,np.nan)`
	`613`	`+ret=cbook._safe_first_finite(arr)`
	`614`	`+assertnp.isnan(ret)`
	`615`	`+`
	`616`	`+`
	`617`	`+deftest__safe_first_finite_all_inf():`
	`618`	`+arr=np.full(2,np.inf)`
	`619`	`+ret=cbook._safe_first_finite(arr)`
	`620`	`+assertnp.isinf(ret)`
	`621`	`+`
	`622`	`+`
`611`	`623`	`deftest_reshape2d():`
`612`	`624`
`613`	`625`	`classDummy:`

Comments

(0)