Skip to content

Use _data instead of data for decode_cf_variable #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 3, 2014
Merged

Use _data instead of data for decode_cf_variable #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af0ed49
Use _data instead of data for decode_cf_variable
shoyer Mar 3, 2014
b2e61aa
Added test for lazily data decoding
shoyer Mar 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/xray/conventions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,8 @@ def get_to(source, dest, k):


def decode_cf_variable(var, mask_and_scale=True):
data = var.data
# use _data instead of data so as not to trigger loading data
data = var._data
dimensions = var.dimensions
attributes = var.attributes.copy()
encoding = var.encoding.copy()
Expand Down
21 changes: 11 additions & 10 deletions test/test_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

def create_test_data():
obj = Dataset()
obj['time'] = ('time', pd.date_range('2000-01-01', periods=1000))
obj['time'] = ('time', pd.date_range('2000-01-01', periods=20))
for k, d in sorted(_dims.items()):
obj[k] = (k, np.arange(d))
for v, dims in sorted(_vars.items()):
Expand All @@ -36,7 +36,7 @@ def create_test_data():
class TestDataset(TestCase):
def test_repr(self):
data = create_test_data()
self.assertEqual('<xray.Dataset (time: 1000, dim1: 100, '
self.assertEqual('<xray.Dataset (time: 20, dim1: 100, '
'dim2: 50, dim3: 10): var1 var2 var3>', repr(data))

def test_init(self):
Expand Down Expand Up @@ -170,7 +170,7 @@ def test_indexed_by(self):
data.indexed_by(not_a_dim=slice(0, 2))

ret = data.indexed_by(dim1=0)
self.assertEqual({'time': 1000, 'dim2': 50, 'dim3': 10}, ret.dimensions)
self.assertEqual({'time': 20, 'dim2': 50, 'dim3': 10}, ret.dimensions)

ret = data.indexed_by(time=slice(2), dim1=0, dim2=slice(5))
self.assertEqual({'time': 2, 'dim2': 5, 'dim3': 10}, ret.dimensions)
Expand All @@ -184,7 +184,7 @@ def test_labeled_by(self):
loc_slicers = {'dim1': slice(None, None, 2), 'dim2': slice(0, 1)}
self.assertEqual(data.indexed_by(**int_slicers),
data.labeled_by(**loc_slicers))
data['time'] = ('time', pd.date_range('2000-01-01', periods=1000))
data['time'] = ('time', pd.date_range('2000-01-01', periods=20))
self.assertEqual(data.indexed_by(time=0),
data.labeled_by(time='2000-01-01'))
self.assertEqual(data.indexed_by(time=slice(10)),
Expand Down Expand Up @@ -291,13 +291,13 @@ def test_merge(self):

def test_getitem(self):
data = create_test_data()
data['time'] = ('time', pd.date_range('2000-01-01', periods=1000))
data['time'] = ('time', pd.date_range('2000-01-01', periods=20))
self.assertIsInstance(data['var1'], DatasetArray)
self.assertXArrayEqual(data['var1'], data.variables['var1'])
self.assertIs(data['var1'].dataset, data)
# access virtual variables
self.assertXArrayEqual(data['time.dayofyear'][:300],
XArray('time', 1 + np.arange(300)))
self.assertXArrayEqual(data['time.dayofyear'],
XArray('time', 1 + np.arange(20)))
self.assertArrayEqual(data['time.month'].data,
data.variables['time'].data.month)

Expand All @@ -324,8 +324,6 @@ def test_delitem(self):
self.assertItemsEqual(data, all_items)
del data['var1']
self.assertItemsEqual(data, all_items - {'var1'})
print data.keys()
print data._variables.keys()
del data['dim1']
self.assertItemsEqual(data, {'time', 'dim2', 'dim3'})

Expand All @@ -344,7 +342,6 @@ def test_to_dataframe(self):
w = np.random.randn(2, 3)
ds = Dataset({'w': (('x', 'y'), w)})
ds['y'] = ('y', list('abc'))
print ds.dimensions
exp_index = pd.MultiIndex.from_arrays(
[[0, 0, 0, 1, 1, 1], ['a', 'b', 'c', 'a', 'b', 'c']],
names=['x', 'y'])
Expand Down Expand Up @@ -521,6 +518,10 @@ def test_0dimensional_variable(self):
expected = Dataset({'x': ((), 123)})
self.assertDatasetEqual(expected, ds)

def test_lazy_decode(self):
data = self.roundtrip(create_test_data(), decode_cf=True)
self.assertIsInstance(data['var1']._data, nc4.Variable)


class ScipyDataTest(DatasetIOCases, TestCase):
def get_store(self):
Expand Down