adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imrpove code by reusing available properties

Browse Source
This commit is contained in:
Matthias 2022-01-23 18:59:09 +01:00
parent cc3852daf3
commit 7429f535c1
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/configuration.md
View File

@ -173,7 +173,7 @@ Mandatory parameters are marked as **Required**, which means that they are requi
| `dataformat_ohlcv` | Data format to use to store historical candle (OHLCV) data. <br> *Defaults to `json`*. <br> **Datatype:** String
| `dataformat_trades` | Data format to use to store historical trades data. <br> *Defaults to `jsongz`*. <br> **Datatype:** String
| `position_adjustment_enable` | Enables the strategy to use position adjustments (additional buys or sells). [More information here](strategy-callbacks.md#adjust-trade-position). <br> [Strategy Override](#parameters-in-the-strategy). <br>*Defaults to `false`.*<br> **Datatype:** Boolean
| `max_buy_position_adjustment` | Maximum additional buy(s) for each open trades on top of the first buy. Set it to `-1` for unlimited additional buys. [More information here](strategy-callbacks.md#adjust-trade-position). <br> [Strategy Override](#parameters-in-the-strategy). <br>*Defaults to `-1`.*<br> **Datatype:** Positive Integer or -1
| `max_buy_position_adjustment` | Maximum additional buy(s) for each open trade on top of the first buy. Set it to `-1` for unlimited additional buys. [More information here](strategy-callbacks.md#adjust-trade-position). <br> [Strategy Override](#parameters-in-the-strategy). <br>*Defaults to `-1`.*<br> **Datatype:** Positive Integer or -1
### Parameters in the strategy

1
docs/strategy-callbacks.md
View File

@ -654,6 +654,7 @@ class DigDeeperStrategy(IStrategy):
if last_candle['close'] < previous_candle['close']:
return None
count_of_buys = trade.nr_of_successful_buys
# Allow up to 3 additional increasingly larger buys (4 in total)
# Initial buy is 1x
# If that falls to -5% profit, we buy 1.25x more, average profit should increase to roughly -2.2%

3
freqtrade/freqtradebot.py
View File

@ -474,8 +474,7 @@ class FreqtradeBot(LoggingMixin):
Once that completes, the existing trade is modified to match new data.
"""
if self.strategy.max_buy_position_adjustment > -1:
filled_buys = trade.select_filled_orders('buy')
count_of_buys = len(filled_buys)
count_of_buys = trade.nr_of_successful_buys
if count_of_buys > self.strategy.max_buy_position_adjustment:
logger.debug(f"Max adjustment buy for {trade.pair} has been reached.")
return

3
freqtrade/optimize/backtesting.py
View File

@ -383,8 +383,7 @@ class Backtesting:
if self.strategy.position_adjustment_enable:
check_adjust_buy = True
if self.strategy.max_buy_position_adjustment > -1:
filled_buys = trade.select_filled_orders('buy')
count_of_buys = len(filled_buys)
count_of_buys = trade.nr_of_successful_buys
check_adjust_buy = (count_of_buys <= self.strategy.max_buy_position_adjustment)
if check_adjust_buy:
trade = self._get_adjust_trade_entry_for_candle(trade, sell_row)

2
freqtrade/resolvers/strategy_resolver.py
View File

@ -98,7 +98,7 @@ class StrategyResolver(IResolver):
("disable_dataframe_checks", False),
("ignore_buying_expired_candle_after", 0),
("position_adjustment_enable", False),
("max_buy_position_adjustment", -1)
("max_buy_position_adjustment", -1),
]
for attribute, default in attributes:
StrategyResolver._override_attribute_helper(strategy, config,

4
freqtrade/rpc/rpc.py
View File

@ -252,8 +252,8 @@ class RPC:
]
if self._config.get('position_adjustment_enable', False):
max_buy = self._config['max_buy_position_adjustment'] + 1
filled_buys = trade.select_filled_orders('buy')
detail_trade.append(f"{len(filled_buys)}/{max_buy}")
filled_buys = trade.nr_of_successful_buys
detail_trade.append(f"{filled_buys}/{max_buy}")
trades_list.append(detail_trade)
profitcol = "Profit"
if self._fiat_converter: