diff --git a/src/components/ftbot/BacktestResultAnalysis.vue b/src/components/ftbot/BacktestResultAnalysis.vue index bb94554c..34a22404 100644 --- a/src/components/ftbot/BacktestResultAnalysis.vue +++ b/src/components/ftbot/BacktestResultAnalysis.vue @@ -24,18 +24,29 @@ - - - - - - - - - - - - + + + + + @@ -56,9 +67,8 @@ import { StrategyBacktestResult } from '@/types'; import { formatObjectForTable } from '@/shared/objectToTableItems'; -import { formatPercent, formatPrice } from '@/shared/formatters'; import { generateBacktestMetricRows, generateBacktestSettingRows } from '@/shared/backtestMetrics'; -import { TableField, TableItem } from 'bootstrap-vue-next'; +import { TableField } from 'bootstrap-vue-next'; const props = defineProps({ backtestResult: { required: true, type: Object as () => StrategyBacktestResult }, @@ -75,96 +85,6 @@ const backtestResultSettings = computed(() => { return formatObjectForTable({ value: tmp }, 'setting'); }); - -const resultsPerPair = computed( - () => props.backtestResult.results_per_pair as unknown as TableItem[], -); -const exitReasonSummary = computed( - () => - (props.backtestResult.exit_reason_summary || - props.backtestResult.sell_reason_summary) as unknown as TableItem[], -); - -const enterTagSummary = computed( - () => props.backtestResult.results_per_enter_tag as unknown as TableItem[], -); - -const perPairFields = computed(() => { - return [ - { key: 'key', label: 'Pair' }, - { key: 'trades', label: 'Buys' }, - { - key: 'profit_mean', - label: 'Avg Profit %', - formatter: (value) => formatPercent(value, 2), - }, - { - key: 'profit_total_abs', - label: `Tot Profit ${props.backtestResult.stake_currency}`, - formatter: (value) => formatPrice(value, props.backtestResult.stake_currency_decimals), - }, - { - key: 'profit_total', - label: 'Tot Profit %', - formatter: (value) => formatPercent(value, 2), - }, - { key: 'duration_avg', label: 'Avg Duration' }, - { key: 'wins', label: 'Wins' }, - { key: 'draws', label: 'Draws' }, - { key: 'losses', label: 'Losses' }, - ]; -}); - -const perExitReason = computed(() => { - return [ - { key: 'exit_reason', label: 'Exit Reason' }, - { key: 'trades', label: 'Buys' }, - { - key: 'profit_mean', - label: 'Avg Profit %', - formatter: (value) => formatPercent(value, 2), - }, - { - key: 'profit_total_abs', - label: `Tot Profit ${props.backtestResult.stake_currency}`, - - formatter: (value) => formatPrice(value, props.backtestResult.stake_currency_decimals), - }, - { - key: 'profit_total', - label: 'Tot Profit %', - formatter: (value) => formatPercent(value, 2), - }, - { key: 'wins', label: 'Wins' }, - { key: 'draws', label: 'Draws' }, - { key: 'losses', label: 'Losses' }, - ]; -}); -const perTagReason = computed(() => { - return [ - { key: 'key', label: 'Tag', formatter: (value) => value || 'OTHER' }, - { key: 'trades', label: 'Buys' }, - { - key: 'profit_mean', - label: 'Avg Profit %', - formatter: (value) => formatPercent(value, 2), - }, - { - key: 'profit_total_abs', - label: `Tot Profit ${props.backtestResult.stake_currency}`, - - formatter: (value) => formatPrice(value, props.backtestResult.stake_currency_decimals), - }, - { - key: 'profit_total', - label: 'Tot Profit %', - formatter: (value) => formatPercent(value, 2), - }, - { key: 'wins', label: 'Wins' }, - { key: 'draws', label: 'Draws' }, - { key: 'losses', label: 'Losses' }, - ]; -}); const backtestResultFields: TableField[] = [ { key: 'metric', label: 'Metric' }, { key: 'value', label: 'Value' }, diff --git a/src/components/ftbot/BacktestResultTablePer.vue b/src/components/ftbot/BacktestResultTablePer.vue new file mode 100644 index 00000000..fbdc0ae2 --- /dev/null +++ b/src/components/ftbot/BacktestResultTablePer.vue @@ -0,0 +1,50 @@ + +