chore: remove --dmmp option
This commit is contained in:
@@ -37,7 +37,6 @@ ARGS_COMMON_OPTIMIZE = [
|
|||||||
|
|
||||||
ARGS_BACKTEST = ARGS_COMMON_OPTIMIZE + [
|
ARGS_BACKTEST = ARGS_COMMON_OPTIMIZE + [
|
||||||
"position_stacking",
|
"position_stacking",
|
||||||
"use_max_market_positions",
|
|
||||||
"enable_protections",
|
"enable_protections",
|
||||||
"dry_run_wallet",
|
"dry_run_wallet",
|
||||||
"timeframe_detail",
|
"timeframe_detail",
|
||||||
@@ -53,7 +52,6 @@ ARGS_HYPEROPT = ARGS_COMMON_OPTIMIZE + [
|
|||||||
"hyperopt",
|
"hyperopt",
|
||||||
"hyperopt_path",
|
"hyperopt_path",
|
||||||
"position_stacking",
|
"position_stacking",
|
||||||
"use_max_market_positions",
|
|
||||||
"enable_protections",
|
"enable_protections",
|
||||||
"dry_run_wallet",
|
"dry_run_wallet",
|
||||||
"timeframe_detail",
|
"timeframe_detail",
|
||||||
@@ -242,8 +240,7 @@ ARGS_STRATEGY_UPDATER = ["strategy_list", "strategy_path", "recursive_strategy_s
|
|||||||
ARGS_LOOKAHEAD_ANALYSIS = [
|
ARGS_LOOKAHEAD_ANALYSIS = [
|
||||||
a
|
a
|
||||||
for a in ARGS_BACKTEST
|
for a in ARGS_BACKTEST
|
||||||
if a
|
if a not in ("position_stacking", "backtest_cache", "backtest_breakdown")
|
||||||
not in ("position_stacking", "use_max_market_positions", "backtest_cache", "backtest_breakdown")
|
|
||||||
] + ["minimum_trade_amount", "targeted_trade_amount", "lookahead_analysis_exportfilename"]
|
] + ["minimum_trade_amount", "targeted_trade_amount", "lookahead_analysis_exportfilename"]
|
||||||
|
|
||||||
ARGS_RECURSIVE_ANALYSIS = ["timeframe", "timerange", "dataformat_ohlcv", "pairs", "startup_candle"]
|
ARGS_RECURSIVE_ANALYSIS = ["timeframe", "timerange", "dataformat_ohlcv", "pairs", "startup_candle"]
|
||||||
|
|||||||
@@ -168,14 +168,6 @@ AVAILABLE_CLI_OPTIONS = {
|
|||||||
action="store_true",
|
action="store_true",
|
||||||
default=False,
|
default=False,
|
||||||
),
|
),
|
||||||
"use_max_market_positions": Arg(
|
|
||||||
"--dmmp",
|
|
||||||
"--disable-max-market-positions",
|
|
||||||
help="Disable applying `max_open_trades` during backtest "
|
|
||||||
"(same as setting `max_open_trades` to a very high number).",
|
|
||||||
action="store_false",
|
|
||||||
default=True,
|
|
||||||
),
|
|
||||||
"backtest_show_pair_list": Arg(
|
"backtest_show_pair_list": Arg(
|
||||||
"--show-pair-list",
|
"--show-pair-list",
|
||||||
help="Show backtesting pairlist sorted by profit.",
|
help="Show backtesting pairlist sorted by profit.",
|
||||||
|
|||||||
@@ -241,11 +241,7 @@ class Configuration:
|
|||||||
logstring="Parameter --enable-protections detected, enabling Protections. ...",
|
logstring="Parameter --enable-protections detected, enabling Protections. ...",
|
||||||
)
|
)
|
||||||
|
|
||||||
if "use_max_market_positions" in self.args and not self.args["use_max_market_positions"]:
|
if "max_open_trades" in self.args and self.args["max_open_trades"]:
|
||||||
config.update({"use_max_market_positions": False})
|
|
||||||
logger.info("Parameter --disable-max-market-positions detected ...")
|
|
||||||
logger.info("max_open_trades set to unlimited ...")
|
|
||||||
elif "max_open_trades" in self.args and self.args["max_open_trades"]:
|
|
||||||
config.update({"max_open_trades": self.args["max_open_trades"]})
|
config.update({"max_open_trades": self.args["max_open_trades"]})
|
||||||
logger.info(
|
logger.info(
|
||||||
"Parameter --max-open-trades detected, overriding max_open_trades to: %s ...",
|
"Parameter --max-open-trades detected, overriding max_open_trades to: %s ...",
|
||||||
|
|||||||
@@ -1552,12 +1552,6 @@ class Backtesting:
|
|||||||
backtest_start_time = datetime.now(timezone.utc)
|
backtest_start_time = datetime.now(timezone.utc)
|
||||||
self._set_strategy(strat)
|
self._set_strategy(strat)
|
||||||
|
|
||||||
# Use max_open_trades in backtesting, except --disable-max-market-positions is set
|
|
||||||
if not self.config.get("use_max_market_positions", True):
|
|
||||||
logger.info("Ignoring max_open_trades (--disable-max-market-positions was used) ...")
|
|
||||||
self.strategy.max_open_trades = float("inf")
|
|
||||||
self.config.update({"max_open_trades": self.strategy.max_open_trades})
|
|
||||||
|
|
||||||
# need to reprocess data every time to populate signals
|
# need to reprocess data every time to populate signals
|
||||||
preprocessed = self.strategy.advise_all_indicators(data)
|
preprocessed = self.strategy.advise_all_indicators(data)
|
||||||
|
|
||||||
|
|||||||
@@ -127,12 +127,6 @@ class Hyperopt:
|
|||||||
self.num_epochs_saved = 0
|
self.num_epochs_saved = 0
|
||||||
self.current_best_epoch: Optional[dict[str, Any]] = None
|
self.current_best_epoch: Optional[dict[str, Any]] = None
|
||||||
|
|
||||||
# Use max_open_trades for hyperopt as well, except --disable-max-market-positions is set
|
|
||||||
if not self.config.get("use_max_market_positions", True):
|
|
||||||
logger.debug("Ignoring max_open_trades (--disable-max-market-positions was used) ...")
|
|
||||||
self.backtesting.strategy.max_open_trades = float("inf")
|
|
||||||
config.update({"max_open_trades": self.backtesting.strategy.max_open_trades})
|
|
||||||
|
|
||||||
if HyperoptTools.has_space(self.config, "sell"):
|
if HyperoptTools.has_space(self.config, "sell"):
|
||||||
# Make sure use_exit_signal is enabled
|
# Make sure use_exit_signal is enabled
|
||||||
self.config["use_exit_signal"] = True
|
self.config["use_exit_signal"] = True
|
||||||
|
|||||||
Reference in New Issue
Block a user