Commit67a8701

committed

Fix transpose of BoolTypeArray, NativeEndiannessArray

1 parent699d895 commit67a8701Copy full SHA for 67a8701

File tree

+30

-1

lines changed

+30

-1

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@ Bug fixes`
`28`	`28`	- Fix Pydap Datatree backend testing. Testing now compares elements of (unordered) two sets (before, lists) (:pull:`10525`).
`29`	`29`	By `Miguel Jimenez-Urias<https://github.com/Mikejmnez>`_.
`30`	`30`
	`31`	+- Fix transpose of boolean arrays read from disk. (:issue:`10536`)
	`32`	+ By `Deepak Cherian<https://github.com/dcherian>`_.
	`33`	`+`
`31`	`34`
`32`	`35`	`Documentation`
`33`	`36`	`~~~~~~~~~~~~~`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ def __getitem__(self, key) -> Self:`
`70`	`70`	`defget_duck_array(self):`
`71`	`71`	`returnduck_array_ops.astype(self.array.get_duck_array(),dtype=self.dtype)`
`72`	`72`
	`73`	`+deftranspose(self,order):`
	`74`	`+returntype(self)(self.array.transpose(order))`
	`75`	`+`
`73`	`76`
`74`	`77`	`classBoolTypeArray(indexing.ExplicitlyIndexedNDArrayMixin):`
`75`	`78`	`"""Decode arrays on the fly from integer to boolean datatype`
`@@ -111,6 +114,9 @@ def __getitem__(self, key) -> Self:`
`111`	`114`	`defget_duck_array(self):`
`112`	`115`	`returnduck_array_ops.astype(self.array.get_duck_array(),dtype=self.dtype)`
`113`	`116`
	`117`	`+deftranspose(self,order):`
	`118`	`+returntype(self)(self.array.transpose(order))`
	`119`	`+`
`114`	`120`
`115`	`121`	`def_apply_mask(`
`116`	`122`	`data:np.ndarray,`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,15 @@ def create_encoded_unsigned_false_masked_scaled_data(dtype: np.dtype) -> Dataset`
`308`	`308`
`309`	`309`	`defcreate_boolean_data()->Dataset:`
`310`	`310`	`attributes= {"units":"-"}`
`311`		`-returnDataset({"x": ("t", [True,False,False,True],attributes)})`
	`311`	`+returnDataset(`
	`312`	`+ {`
	`313`	`+"x": (`
	`314`	`+ ("t","x"),`
	`315`	`+ [[False,True,False,True], [True,False,False,True]],`
	`316`	`+attributes,`
	`317`	`+ )`
	`318`	`+ }`
	`319`	`+ )`
`312`	`320`
`313`	`321`
`314`	`322`	`classTestCommon:`
`@@ -726,6 +734,9 @@ def test_roundtrip_boolean_dtype(self) -> None:`
`726`	`734`	`withself.roundtrip(actual)asactual2:`
`727`	`735`	`assert_identical(original,actual2)`
`728`	`736`	`assertactual2["x"].dtype=="bool"`
	`737`	`+withself.roundtrip(actual)asactual3:`
	`738`	`+# GH10536`
	`739`	`+assert_identical(original.transpose(),actual3.transpose())`
`729`	`740`
`730`	`741`	`deftest_orthogonal_indexing(self)->None:`
`731`	`742`	`in_memory=create_test_data()`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ def test_booltype_array(self) -> None:`
`37`	`37`	`assertbx.dtype==bool`
`38`	`38`	`assert_array_equal(bx,np.array([True,False,True,True,False],dtype=bool))`
`39`	`39`
	`40`	`+x=np.array([[1,0,1], [0,1,0]],dtype="i1")`
	`41`	`+bx=coding.variables.BoolTypeArray(x)`
	`42`	`+assert_array_equal(bx.transpose((1,0)),x.transpose((1,0)))`
	`43`	`+`
`40`	`44`
`41`	`45`	`classTestNativeEndiannessArray:`
`42`	`46`	`deftest(self)->None:`
`@@ -47,6 +51,11 @@ def test(self) -> None:`
`47`	`51`	`asserta.dtype==expected[:].dtype`
`48`	`52`	`assert_array_equal(a,expected)`
`49`	`53`
	`54`	`+x=np.arange(6,dtype=">i8").reshape((2,3))`
	`55`	`+a=coding.variables.NativeEndiannessArray(x)`
	`56`	`+expected=np.arange(6,dtype="int64").reshape((2,3))`
	`57`	`+assert_array_equal(a.transpose((1,0)),expected.transpose((1,0)))`
	`58`	`+`
`50`	`59`
`51`	`60`	`deftest_decode_cf_with_conflicting_fill_missing_value()->None:`
`52`	`61`	`expected=Variable(["t"], [np.nan,np.nan,2], {"units":"foobar"})`

Comments

(0)