Shorten a couple of names

- rename "total_orders" columns into "n_orders"
- rename `.make_*_time_series()` methods into `.make_*_ts()`
This commit is contained in:
Alexander Hess 2021-01-31 20:19:12 +01:00
commit 7b824a4a12
Signed by: alexander
GPG key ID: 344EA5AB10D868E0
4 changed files with 71 additions and 71 deletions

View file

@ -91,9 +91,9 @@ class TestAggregateOrders:
# The resulting `DataFrame` has 12 rows holding `1`s.
assert len(result) == 12
assert result['total_orders'].min() == 1
assert result['total_orders'].max() == 1
assert result['total_orders'].sum() == 12
assert result['n_orders'].min() == 1
assert result['n_orders'].max() == 1
assert result['n_orders'].sum() == 12
def test_evenly_distributed_ad_hoc_orders_with_no_demand_late( # noqa:WPS218
self, db_session, one_pixel_grid, restaurant, make_order,
@ -123,10 +123,10 @@ class TestAggregateOrders:
# Even though there are only 10 orders, there are 12 rows in the `DataFrame`.
# That is so as `0`s are filled in for hours without any demand at the end.
assert len(result) == 12
assert result['total_orders'].min() == 0
assert result['total_orders'].max() == 1
assert result.iloc[:10]['total_orders'].sum() == 10
assert result.iloc[10:]['total_orders'].sum() == 0
assert result['n_orders'].min() == 0
assert result['n_orders'].max() == 1
assert result.iloc[:10]['n_orders'].sum() == 10
assert result.iloc[10:]['n_orders'].sum() == 0
def test_one_ad_hoc_order_every_other_hour(
self, db_session, one_pixel_grid, restaurant, make_order,
@ -155,9 +155,9 @@ class TestAggregateOrders:
# The resulting `DataFrame` has 12 rows, 6 holding `0`s, and 6 holding `1`s.
assert len(result) == 12
assert result['total_orders'].min() == 0
assert result['total_orders'].max() == 1
assert result['total_orders'].sum() == 6
assert result['n_orders'].min() == 0
assert result['n_orders'].max() == 1
assert result['n_orders'].sum() == 6
def test_one_ad_hoc_and_one_pre_order(
self, db_session, one_pixel_grid, restaurant, make_order,
@ -199,9 +199,9 @@ class TestAggregateOrders:
# The resulting `DataFrame` has 12 rows, 11 holding `0`s, and one holding a `1`.
assert len(result) == 12
assert result['total_orders'].min() == 0
assert result['total_orders'].max() == 1
assert result['total_orders'].sum() == 1
assert result['n_orders'].min() == 0
assert result['n_orders'].max() == 1
assert result['n_orders'].sum() == 1
def test_evenly_distributed_ad_hoc_orders_with_half_hour_time_steps( # noqa:WPS218
self, db_session, one_pixel_grid, restaurant, make_order,
@ -234,10 +234,10 @@ class TestAggregateOrders:
# The resulting `DataFrame` has 24 rows for the 24 30-minute time steps.
# The rows' values are `0` and `1` alternating.
assert len(result) == 24
assert result['total_orders'].min() == 0
assert result['total_orders'].max() == 1
assert result.iloc[::2]['total_orders'].sum() == 12
assert result.iloc[1::2]['total_orders'].sum() == 0
assert result['n_orders'].min() == 0
assert result['n_orders'].max() == 1
assert result.iloc[::2]['n_orders'].sum() == 12
assert result.iloc[1::2]['n_orders'].sum() == 0
def test_ad_hoc_orders_over_two_days(
self, db_session, one_pixel_grid, restaurant, make_order,
@ -285,9 +285,9 @@ class TestAggregateOrders:
# The resulting `DataFrame` has 24 rows, 12 for each day.
assert len(result) == 24
assert result['total_orders'].min() == 0
assert result['total_orders'].max() == 1
assert result['total_orders'].sum() == 18
assert result['n_orders'].min() == 0
assert result['n_orders'].max() == 1
assert result['n_orders'].sum() == 18
@pytest.fixture
def two_pixel_grid( # noqa:WPS211
@ -381,6 +381,6 @@ class TestAggregateOrders:
# The resulting `DataFrame` has 24 rows, 12 for each pixel.
assert len(result) == 24
assert result['total_orders'].min() == 0
assert result['total_orders'].max() == 2
assert result['total_orders'].sum() == 30
assert result['n_orders'].min() == 0
assert result['n_orders'].max() == 2
assert result['n_orders'].sum() == 30