Skip to content
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

Updated _trades dataframe with 1D Indicator variables for Entry and E… #1116

Merged
merged 5 commits into from
Jan 22, 2025
Merged

Updated _trades dataframe with 1D Indicator variables for Entry and E… #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03b004b
Updated _trades dataframe with 1D Indicator variables for Entry and E…
lachyn21 Feb 12, 2024
46f1946
Merge branch 'master' into my-techdoc-contribution
kernc Jan 22, 2025
6d4c70c
Shorter form, vectorized over index
kernc Jan 22, 2025
e91103b
Remove Strategy.get_indicators_dataframe() public helper method
kernc Jan 22, 2025
3461dcf
Account for multi-dim indicators and/or no trades
kernc Jan 22, 2025
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
10 changes: 10 additions & 0 deletions backtesting/_stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ def compute_stats(
})
trades_df['Duration'] = trades_df['ExitTime'] - trades_df['EntryTime']
trades_df['Tag'] = [t.tag for t in trades]

# Add indicator values
if len(trades_df):
for ind in strategy_instance._indicators:
ind = np.atleast_2d(ind)
for i, values in enumerate(ind): # multi-d indicators
suffix = f'_{i}' if len(ind) > 1 else ''
trades_df[f'Entry_{ind.name}{suffix}'] = values[trades_df['EntryBar'].values]
trades_df[f'Exit_{ind.name}{suffix}'] = values[trades_df['ExitBar'].values]

commissions = sum(t._commissions for t in trades)
del trades

Expand Down
7 changes: 6 additions & 1 deletion backtesting/test/_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,15 @@ def almost_equal(a, b):

self.assertEqual(len(stats['_trades']), 66)

indicator_columns = [
f'{entry}_SMA(C,{n})'
for entry in ('Entry', 'Exit')
for n in (SmaCross.fast, SmaCross.slow)]
self.assertSequenceEqual(
sorted(stats['_trades'].columns),
sorted(['Size', 'EntryBar', 'ExitBar', 'EntryPrice', 'ExitPrice', 'SL', 'TP',
'PnL', 'ReturnPct', 'EntryTime', 'ExitTime', 'Duration', 'Tag']))
'PnL', 'ReturnPct', 'EntryTime', 'ExitTime', 'Duration', 'Tag',
*indicator_columns]))

def test_compute_stats_bordercase(self):

Expand Down
Loading