Commitd3eaffd

authored

Merge pull request#18374 from jklymak/fix-reshape-pandas

FIX: make _reshape_2D accept pandas df with string indices

2 parentsd9214de +cf9bb88 commitd3eaffdCopy full SHA for d3eaffd

File tree

+28

-0

lines changed

+28

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1355,6 +1355,17 @@ def _reshape_2D(X, name):`
`1355`	`1355`
`1356`	`1356`	`name is used to generate the error message for invalid inputs.`
`1357`	`1357`	`"""`
	`1358`	`+`
	`1359`	`+# unpack if we have a values or to_numpy method.`
	`1360`	`+try:`
	`1361`	`+X=X.to_numpy()`
	`1362`	`+exceptAttributeError:`
	`1363`	`+try:`
	`1364`	`+ifisinstance(X.values,np.ndarray):`
	`1365`	`+X=X.values`
	`1366`	`+exceptAttributeError:`
	`1367`	`+pass`
	`1368`	`+`
`1358`	`1369`	`# Iterate over columns for ndarrays.`
`1359`	`1370`	`ifisinstance(X,np.ndarray):`
`1360`	`1371`	`X=X.T`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -559,6 +559,23 @@ def __getitem__(self, item):`
`559`	`559`	`assertisinstance(xnew[0],np.ndarray)`
`560`	`560`
`561`	`561`
	`562`	`+deftest_reshape2d_pandas(pd):`
	`563`	`+# seperate to allow the rest of the tests to run if no pandas...`
	`564`	`+X=np.arange(30).reshape(10,3)`
	`565`	`+x=pd.DataFrame(X,columns=["a","b","c"])`
	`566`	`+Xnew=cbook._reshape_2D(x,'x')`
	`567`	`+# Need to check each row because _reshape_2D returns a list of arrays:`
	`568`	`+forx,xnewinzip(X.T,Xnew):`
	`569`	`+np.testing.assert_array_equal(x,xnew)`
	`570`	`+`
	`571`	`+X=np.arange(30).reshape(10,3)`
	`572`	`+x=pd.DataFrame(X,columns=["a","b","c"])`
	`573`	`+Xnew=cbook._reshape_2D(x,'x')`
	`574`	`+# Need to check each row because _reshape_2D returns a list of arrays:`
	`575`	`+forx,xnewinzip(X.T,Xnew):`
	`576`	`+np.testing.assert_array_equal(x,xnew)`
	`577`	`+`
	`578`	`+`
`562`	`579`	`deftest_contiguous_regions():`
`563`	`580`	`a,b,c=3,4,5`
`564`	`581`	`# Starts and ends with True`

Comments

(0)