Skip to content

Commit

Permalink
Add __getitem__ and __getattr__ to _DataFrameWrapper.
Browse files Browse the repository at this point in the history
They return a Series, either from the wrapped frame or
from an added computed column.
  • Loading branch information
jiffyclub committed Jul 17, 2014
1 parent e0689c7 commit 9440fed
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 0 deletions.
29 changes: 29 additions & 0 deletions urbansim/sim/simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ def columns(self):
"""
return self._frame.columns + _list_columns_for_table(self.name)

@property
def index(self):
"""
Table index.
"""
return self._frame.index

def to_frame(self, columns=None):
"""
Make a DataFrame with the given columns.
Expand Down Expand Up @@ -92,6 +100,27 @@ def update_col(self, column_name, series):
def __setitem__(self, key, value):
return self.update_col(key, value)

def get_column(self, column_name):
"""
Returns a column as a Series.
Parameters
----------
column_name : str
Returns
-------
column : pandas.Series
"""
return self.to_frame(columns=[column_name])[column_name]

def __getitem__(self, key):
return self.get_column(key)

def __getattr__(self, key):
return self.get_column(key)


class _TableFuncWrapper(object):
"""
Expand Down
6 changes: 6 additions & 0 deletions urbansim/sim/tests/test_simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ def test_func(test_frame):

assert set(sim.list_tables()) == {'test_frame', 'test_func'}

table = sim.get_table('test_frame')
pdt.assert_index_equal(table.index, df.index)
pdt.assert_series_equal(table.get_column('a'), df.a)
pdt.assert_series_equal(table.a, df.a)
pdt.assert_series_equal(table['b'], df['b'])

table = sim.get_table('test_func')

pdt.assert_frame_equal(table.to_frame(), df / 2)
Expand Down

0 comments on commit 9440fed

Please sign in to comment.