Skip to content

Commit 4180dae

Browse files
Change module (folder) naming for better readability.
1 parent 2173a7a commit 4180dae

File tree

9 files changed

+16
-13
lines changed

9 files changed

+16
-13
lines changed
File renamed without changes.

src/backtest_bay/analysis/task_backtest_signals.py renamed to src/backtest_bay/backtest/task_backtest.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import pandas as pd
22
import pytask
33

4-
from backtest_bay.analysis.backtest_signals import backtest_signals
5-
from backtest_bay.analysis.generate_signals import generate_signals
4+
from backtest_bay.backtest.backtest_signals import backtest_signals
5+
from backtest_bay.backtest.generate_signals import generate_signals
66
from backtest_bay.config import BLD, INITIAL_CASH, PARAMS, SRC, TAC, TRADE_PCT
77

88
scripts = [
99
SRC / "config.py",
10-
SRC / "analysis" / "generate_signals.py",
11-
SRC / "analysis" / "backtest_signals.py",
10+
SRC / "backtest" / "generate_signals.py",
11+
SRC / "backtest" / "backtest_signals.py",
1212
]
1313

1414
for row in PARAMS.itertuples(index=False):
@@ -18,11 +18,14 @@
1818

1919
data_path = BLD / f"{row.stock}_{row.start_date}_{row.end_date}_{row.interval}.pkl"
2020
produces = BLD / f"{id_backtest}.pkl"
21+
strategy = row.strategy
2122

2223
@pytask.task(id=id_backtest)
23-
def task_backtest(scripts=scripts, data_path=data_path, produces=produces, row=row):
24+
def task_backtest(
25+
scripts=scripts, data_path=data_path, produces=produces, strategy=strategy
26+
):
2427
data = pd.read_pickle(data_path)
25-
signals = generate_signals(data=data, method=row.strategy)
28+
signals = generate_signals(data=data, method=strategy)
2629
portfolio = backtest_signals(
2730
data=data,
2831
signals=signals,

src/backtest_bay/data/task_download_data.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
produces = BLD / f"{id_download}.pkl"
1616

1717
@pytask.task(id=id_download)
18-
def task_download_data(depends_on=scripts, produces=produces, row=row):
18+
def task_download_data(depends_on=scripts, produces=produces, param=row):
1919
data = download_data(
20-
symbol=row.stock,
21-
start_date=row.start_date,
22-
end_date=row.end_date,
23-
interval=row.interval,
20+
symbol=param.stock,
21+
start_date=param.start_date,
22+
end_date=param.end_date,
23+
interval=param.interval,
2424
)
2525
data.to_pickle(produces)
File renamed without changes.
File renamed without changes.

tests/analysis/test_backtest_signals.py renamed to tests/backtest/test_backtest_signals.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pandas as pd
22
import pandas.testing as pdt
33

4-
from backtest_bay.analysis.backtest_signals import (
4+
from backtest_bay.backtest.backtest_signals import (
55
_execute_buy,
66
_execute_sell,
77
_is_buy_trade_affordable,

tests/analysis/test_generate_signals.py renamed to tests/backtest/test_generate_signals.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import pandas as pd
33
import pytest
44

5-
from backtest_bay.analysis.generate_signals import (
5+
from backtest_bay.backtest.generate_signals import (
66
_bollinger_signals,
77
_macd_signals,
88
_roc_signals,

0 commit comments

Comments
 (0)