Commitb61bb0b

authored

Merge pull request#25547 from rcomer/safe_first_finite

FIX: `_safe_first_finite` on all non-finite array

2 parentsa179199 +f8bc604 commitb61bb0bCopy full SHA for b61bb0b

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
`@@ -2243,19 +2243,11 @@ def _convert_dx(dx, x0, xconv, convert):`
`2243`	`2243`	`x0=cbook._safe_first_finite(x0)`
`2244`	`2244`	`except (TypeError,IndexError,KeyError):`
`2245`	`2245`	`pass`
`2246`		`-exceptStopIteration:`
`2247`		`-# this means we found no finite element, fall back to first`
`2248`		`-# element unconditionally`
`2249`		`-x0=cbook.safe_first_element(x0)`
`2250`	`2246`
`2251`	`2247`	`try:`
`2252`	`2248`	`x=cbook._safe_first_finite(xconv)`
`2253`	`2249`	`except (TypeError,IndexError,KeyError):`
`2254`	`2250`	`x=xconv`
`2255`		`-exceptStopIteration:`
`2256`		`-# this means we found no finite element, fall back to first`
`2257`		`-# element unconditionally`
`2258`		`-x=cbook.safe_first_element(xconv)`
`2259`	`2251`
`2260`	`2252`	`delist=False`
`2261`	`2253`	`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
`@@ -611,6 +611,18 @@ def test_flatiter():`
`611`	`611`	`assert1==next(it)`
`612`	`612`
`613`	`613`
	`614`	`+deftest__safe_first_finite_all_nan():`
	`615`	`+arr=np.full(2,np.nan)`
	`616`	`+ret=cbook._safe_first_finite(arr)`
	`617`	`+assertnp.isnan(ret)`
	`618`	`+`
	`619`	`+`
	`620`	`+deftest__safe_first_finite_all_inf():`
	`621`	`+arr=np.full(2,np.inf)`
	`622`	`+ret=cbook._safe_first_finite(arr)`
	`623`	`+assertnp.isinf(ret)`
	`624`	`+`
	`625`	`+`
`614`	`626`	`deftest_reshape2d():`
`615`	`627`
`616`	`628`	`classDummy:`

Comments

(0)