From 95732e8991094668ab2cc43224503177709905a9 Mon Sep 17 00:00:00 2001 From: hoeckxer Date: Tue, 5 Jan 2021 21:03:23 +0100 Subject: [PATCH 1/3] Clarification in documentation Signed-off-by: hoeckxer --- docs/includes/protections.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/includes/protections.md b/docs/includes/protections.md index 87db17fd8..7d2107bee 100644 --- a/docs/includes/protections.md +++ b/docs/includes/protections.md @@ -62,9 +62,9 @@ The below example stops trading for all pairs for 4 candles after the last trade #### MaxDrawdown -`MaxDrawdown` uses all trades within `lookback_period` (in minutes) to determine the maximum drawdown. If the drawdown is below `max_allowed_drawdown`, trading will stop for `stop_duration` (in minutes) after the last trade - assuming that the bot needs some time to let markets recover. +`MaxDrawdown` uses all trades within `lookback_period` (in minutes or candles) to determine the maximum drawdown. If the drawdown is below `max_allowed_drawdown`, trading will stop for `stop_duration` (in minutes or candles) after the last trade - assuming that the bot needs some time to let markets recover. -The below sample stops trading for 12 candles if max-drawdown is > 20% considering all trades within the last 48 candles. +The below sample stops trading for 12 candles if max-drawdown is > 20% considering all trades within the last 48 candles. If desired, `lookback_period_minutes` and/or `stop_duration_minutes` can be used. ```json "protections": [ From f7b055a58c9573778af3f517cc57b36873cf2e1a Mon Sep 17 00:00:00 2001 From: hoeckxer Date: Wed, 6 Jan 2021 09:26:03 +0100 Subject: [PATCH 2/3] Attempt to improve wording Signed-off-by: hoeckxer --- docs/includes/protections.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/includes/protections.md b/docs/includes/protections.md index 7d2107bee..560100e4d 100644 --- a/docs/includes/protections.md +++ b/docs/includes/protections.md @@ -62,9 +62,9 @@ The below example stops trading for all pairs for 4 candles after the last trade #### MaxDrawdown -`MaxDrawdown` uses all trades within `lookback_period` (in minutes or candles) to determine the maximum drawdown. If the drawdown is below `max_allowed_drawdown`, trading will stop for `stop_duration` (in minutes or candles) after the last trade - assuming that the bot needs some time to let markets recover. +`MaxDrawdown` uses all trades within `lookback_period` in minutes (or in candles when using `lookback_period_candles`) to determine the maximum drawdown. If the drawdown is below `max_allowed_drawdown`, trading will stop for `stop_duration` in minutes (or in candles when using `stop_duration_candles`) after the last trade - assuming that the bot needs some time to let markets recover. -The below sample stops trading for 12 candles if max-drawdown is > 20% considering all trades within the last 48 candles. If desired, `lookback_period_minutes` and/or `stop_duration_minutes` can be used. +The below sample stops trading for 12 candles if max-drawdown is > 20% considering all trades within the last 48 candles. If desired, `lookback_period` and/or `stop_duration` can be used. ```json "protections": [ From a90609315307583738fee87dd565cec799edfbfd Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 6 Jan 2021 09:45:21 +0100 Subject: [PATCH 3/3] FIx doc wording for all guards --- docs/includes/protections.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/includes/protections.md b/docs/includes/protections.md index 560100e4d..b98a0d662 100644 --- a/docs/includes/protections.md +++ b/docs/includes/protections.md @@ -39,7 +39,7 @@ All protection end times are rounded up to the next candle to avoid sudden, unex #### Stoploss Guard -`StoplossGuard` selects all trades within `lookback_period`, and determines if the amount of trades that resulted in stoploss are above `trade_limit` - in which case trading will stop for `stop_duration`. +`StoplossGuard` selects all trades within `lookback_period` in minutes (or in candles when using `lookback_period_candles`), and determines if the amount of trades that resulted in stoploss are above `trade_limit` - in which case trading will stop for `stop_duration` in minutes (or in candles when using `stop_duration_candles`). This applies across all pairs, unless `only_per_pair` is set to true, which will then only look at one pair at a time. The below example stops trading for all pairs for 4 candles after the last trade if the bot hit stoploss 4 times within the last 24 candles. @@ -81,8 +81,8 @@ The below sample stops trading for 12 candles if max-drawdown is > 20% consideri #### Low Profit Pairs -`LowProfitPairs` uses all trades for a pair within `lookback_period` (in minutes) to determine the overall profit ratio. -If that ratio is below `required_profit`, that pair will be locked for `stop_duration` (in minutes). +`LowProfitPairs` uses all trades for a pair within `lookback_period` in minutes (or in candles when using `lookback_period_candles`) to determine the overall profit ratio. +If that ratio is below `required_profit`, that pair will be locked for `stop_duration` in minutes (or in candles when using `stop_duration_candles`). The below example will stop trading a pair for 60 minutes if the pair does not have a required profit of 2% (and a minimum of 2 trades) within the last 6 candles. @@ -100,7 +100,7 @@ The below example will stop trading a pair for 60 minutes if the pair does not h #### Cooldown Period -`CooldownPeriod` locks a pair for `stop_duration` (in minutes) after selling, avoiding a re-entry for this pair for `stop_duration` minutes. +`CooldownPeriod` locks a pair for `stop_duration` in minutes (or in candles when using `stop_duration_candles`) after selling, avoiding a re-entry for this pair for `stop_duration` minutes. The below example will stop trading a pair for 2 candles after closing a trade, allowing this pair to "cool down".