mirror of
https://github.com/wassname/ray.git
synced 2026-07-04 17:23:08 +08:00
[DataFrame] MVP (1/4) (#1495)
* Implement __{getitem, delitem, copy, deepcopy}__
* Implement all(), any()
* Revert "Implement all(), any()"
This reverts commit 784052414f063662cdb30943297dc9ddfd3ca300.
* Address Comments + Fix axis indexing
* Update syntax for test_axes
* Implement bfill, bool, count
* Implement round
* Resolve bfill inplace issue
* Deimplement bfill; wait for the distributed version
* Fix format
* Copy df for __delitem__
This commit is contained in:
Simon Mo
committed by
Robert Nishihara
Robert Nishihara
parent
b948405532
commit
0a79442954
@@ -46,7 +46,8 @@ def test_values(ray_df, pandas_df):
|
||||
|
||||
@pytest.fixture
|
||||
def test_axes(ray_df, pandas_df):
|
||||
assert(np.array_equal(ray_df.axes, pandas_df.axes))
|
||||
for ray_axis, pd_axis in zip(ray_df.axes, pandas_df.axes):
|
||||
assert (np.array_equal(ray_axis, pd_axis))
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@@ -113,7 +114,8 @@ def create_test_dataframe():
|
||||
df = pd.DataFrame({'col1': [0, 1, 2, 3],
|
||||
'col2': [4, 5, 6, 7],
|
||||
'col3': [8, 9, 10, 11],
|
||||
'col4': [12, 13, 14, 15]})
|
||||
'col4': [12, 13, 14, 15],
|
||||
'col5': [0, 0, 0, 0]})
|
||||
|
||||
return rdf.from_pandas(df, 2)
|
||||
|
||||
@@ -124,8 +126,8 @@ def test_int_dataframe():
|
||||
pandas_df = pd.DataFrame({'col1': [0, 1, 2, 3],
|
||||
'col2': [4, 5, 6, 7],
|
||||
'col3': [8, 9, 10, 11],
|
||||
'col4': [12, 13, 14, 15]})
|
||||
|
||||
'col4': [12, 13, 14, 15],
|
||||
'col5': [0, 0, 0, 0]})
|
||||
ray_df = rdf.from_pandas(pandas_df, 2)
|
||||
|
||||
testfuncs = [lambda x: x + 1,
|
||||
@@ -153,6 +155,16 @@ def test_int_dataframe():
|
||||
test_abs(ray_df, pandas_df)
|
||||
test_keys(ray_df, pandas_df)
|
||||
test_transpose(ray_df, pandas_df)
|
||||
test_round(ray_df, pandas_df)
|
||||
|
||||
test_all(ray_df, pandas_df)
|
||||
test_any(ray_df, pandas_df)
|
||||
test___getitem__(ray_df, pandas_df)
|
||||
test___delitem__(ray_df, pandas_df)
|
||||
test___copy__(ray_df, pandas_df)
|
||||
test___deepcopy__(ray_df, pandas_df)
|
||||
test_bool(ray_df, pandas_df)
|
||||
test_count(ray_df, pandas_df)
|
||||
|
||||
|
||||
def test_float_dataframe():
|
||||
@@ -160,7 +172,8 @@ def test_float_dataframe():
|
||||
pandas_df = pd.DataFrame({'col1': [0.0, 1.0, 2.0, 3.0],
|
||||
'col2': [4.0, 5.0, 6.0, 7.0],
|
||||
'col3': [8.0, 9.0, 10.0, 11.0],
|
||||
'col4': [12.0, 13.0, 14.0, 15.0]})
|
||||
'col4': [12.0, 13.0, 14.0, 15.0],
|
||||
'col5': [0.0, 0.0, 0.0, 0.0]})
|
||||
|
||||
ray_df = rdf.from_pandas(pandas_df, 2)
|
||||
|
||||
@@ -189,6 +202,16 @@ def test_float_dataframe():
|
||||
test_abs(ray_df, pandas_df)
|
||||
test_keys(ray_df, pandas_df)
|
||||
test_transpose(ray_df, pandas_df)
|
||||
test_round(ray_df, pandas_df)
|
||||
|
||||
test_all(ray_df, pandas_df)
|
||||
test_any(ray_df, pandas_df)
|
||||
test___getitem__(ray_df, pandas_df)
|
||||
test___delitem__(ray_df, pandas_df)
|
||||
test___copy__(ray_df, pandas_df)
|
||||
test___deepcopy__(ray_df, pandas_df)
|
||||
test_bool(ray_df, pandas_df)
|
||||
test_count(ray_df, pandas_df)
|
||||
|
||||
|
||||
def test_add():
|
||||
@@ -219,18 +242,16 @@ def test_align():
|
||||
ray_df.align(None)
|
||||
|
||||
|
||||
def test_all():
|
||||
ray_df = create_test_dataframe()
|
||||
|
||||
with pytest.raises(NotImplementedError):
|
||||
ray_df.all()
|
||||
@pytest.fixture
|
||||
def test_all(ray_df, pd_df):
|
||||
assert pd_df.all().equals(ray_df.all())
|
||||
assert pd_df.all(axis=1).equals(ray_df.all(axis=1))
|
||||
|
||||
|
||||
def test_any():
|
||||
ray_df = create_test_dataframe()
|
||||
|
||||
with pytest.raises(NotImplementedError):
|
||||
ray_df.any()
|
||||
@pytest.fixture
|
||||
def test_any(ray_df, pd_df):
|
||||
assert pd_df.any().equals(ray_df.any())
|
||||
assert pd_df.any(axis=1).equals(ray_df.any(axis=1))
|
||||
|
||||
|
||||
def test_append():
|
||||
@@ -307,14 +328,19 @@ def test_bfill():
|
||||
ray_df = create_test_dataframe()
|
||||
|
||||
with pytest.raises(NotImplementedError):
|
||||
ray_df.bfill()
|
||||
ray_df.between_time(None, None)
|
||||
|
||||
|
||||
def test_bool():
|
||||
ray_df = create_test_dataframe()
|
||||
|
||||
with pytest.raises(NotImplementedError):
|
||||
@pytest.fixture
|
||||
def test_bool(ray_df, pd_df):
|
||||
with pytest.raises(ValueError):
|
||||
ray_df.bool()
|
||||
pd_df.bool()
|
||||
|
||||
single_bool_pd_df = pd.DataFrame([True])
|
||||
single_bool_ray_df = rdf.from_pandas(single_bool_pd_df, 1)
|
||||
|
||||
assert single_bool_pd_df.bool() == single_bool_ray_df.bool()
|
||||
|
||||
|
||||
def test_boxplot():
|
||||
@@ -394,11 +420,10 @@ def test_corrwith():
|
||||
ray_df.corrwith(None)
|
||||
|
||||
|
||||
def test_count():
|
||||
ray_df = create_test_dataframe()
|
||||
|
||||
with pytest.raises(NotImplementedError):
|
||||
ray_df.count()
|
||||
@pytest.fixture
|
||||
def test_count(ray_df, pd_df):
|
||||
assert ray_df.count().equals(pd_df.count())
|
||||
assert ray_df.count(axis=1).equals(pd_df.count(axis=1))
|
||||
|
||||
|
||||
def test_cov():
|
||||
@@ -1100,11 +1125,10 @@ def test_rolling():
|
||||
ray_df.rolling(None)
|
||||
|
||||
|
||||
def test_round():
|
||||
ray_df = create_test_dataframe()
|
||||
|
||||
with pytest.raises(NotImplementedError):
|
||||
ray_df.round()
|
||||
@pytest.fixture
|
||||
def test_round(ray_df, pd_df):
|
||||
assert ray_df_equals_pandas(ray_df.round(), pd_df.round())
|
||||
assert ray_df_equals_pandas(ray_df.round(1), pd_df.round(1))
|
||||
|
||||
|
||||
def test_rpow():
|
||||
@@ -1520,11 +1544,13 @@ def test_xs():
|
||||
ray_df.xs(None)
|
||||
|
||||
|
||||
def test___getitem__():
|
||||
ray_df = create_test_dataframe()
|
||||
@pytest.fixture
|
||||
def test___getitem__(ray_df, pd_df):
|
||||
ray_col = ray_df.__getitem__('col1')
|
||||
assert isinstance(ray_col, pd.Series)
|
||||
|
||||
with pytest.raises(NotImplementedError):
|
||||
ray_df.__getitem__(None)
|
||||
pd_col = pd_df['col1']
|
||||
assert pd_col.equals(ray_col)
|
||||
|
||||
|
||||
def test___setitem__():
|
||||
@@ -1639,11 +1665,13 @@ def test___setstate__():
|
||||
ray_df.__setstate__(None)
|
||||
|
||||
|
||||
def test___delitem__():
|
||||
ray_df = create_test_dataframe()
|
||||
|
||||
with pytest.raises(NotImplementedError):
|
||||
ray_df.__delitem__(None)
|
||||
@pytest.fixture
|
||||
def test___delitem__(ray_df, pd_df):
|
||||
ray_df = ray_df.copy()
|
||||
pd_df = pd_df.copy()
|
||||
ray_df.__delitem__('col1')
|
||||
pd_df.__delitem__('col1')
|
||||
ray_df_equals_pandas(ray_df, pd_df)
|
||||
|
||||
|
||||
def test___finalize__():
|
||||
@@ -1653,18 +1681,16 @@ def test___finalize__():
|
||||
ray_df.__finalize__(None)
|
||||
|
||||
|
||||
def test___copy__():
|
||||
ray_df = create_test_dataframe()
|
||||
|
||||
with pytest.raises(NotImplementedError):
|
||||
ray_df.__copy__()
|
||||
@pytest.fixture
|
||||
def test___copy__(ray_df, pd_df):
|
||||
ray_df_copy, pd_df_copy = ray_df.__copy__(), pd_df.__copy__()
|
||||
assert ray_df_equals_pandas(ray_df_copy, pd_df_copy)
|
||||
|
||||
|
||||
def test___deepcopy__():
|
||||
ray_df = create_test_dataframe()
|
||||
|
||||
with pytest.raises(NotImplementedError):
|
||||
ray_df.__deepcopy__()
|
||||
@pytest.fixture
|
||||
def test___deepcopy__(ray_df, pd_df):
|
||||
ray_df_copy, pd_df_copy = ray_df.__deepcopy__(), pd_df.__deepcopy__()
|
||||
assert ray_df_equals_pandas(ray_df_copy, pd_df_copy)
|
||||
|
||||
|
||||
def test_blocks():
|
||||
|
||||
Reference in New Issue
Block a user