diff --git a/config/config.json b/config/config.json index 06fca2a..7a79e00 100644 --- a/config/config.json +++ b/config/config.json @@ -1,7 +1,7 @@ { "symbols_file": "config/symbols.txt", "symbol_delay": 1.0, - "candle_count": 201, + "candle_count": 202, "buy_check_interval_minutes": 240, "stop_loss_check_interval_minutes": 60, "profit_taking_check_interval_minutes": 240, diff --git a/src/signals.py b/src/signals.py index 4ec9e0d..f0d93ba 100644 --- a/src/signals.py +++ b/src/signals.py @@ -629,7 +629,7 @@ def _process_symbol_core(symbol: str, cfg: "RuntimeConfig", indicators: dict = N # 조건1: MACD 상향 + SMA + ADX (None-safe) cond1_macd = f"MACD: {_safe_format(dp.get('prev_macd'), 6)}->{_safe_format(dp.get('curr_macd'), 6)}, Sig: {_safe_format(dp.get('prev_signal'), 6)}->{_safe_format(dp.get('curr_signal'), 6)}" - cond1_sma = f"SMA: {_safe_format(dp.get('curr_sma_short'), 2)} > {_safe_format(dp.get('curr_sma_long'), 2)}" + cond1_sma = f"SMA5: {_safe_format(dp.get('curr_sma_short'), 2)} > SMA200: {_safe_format(dp.get('curr_sma_long'), 2)}" cond1_adx = f"ADX: {_safe_format(dp.get('curr_adx'), 2)} > {adx_threshold}" result["summary"].append( f"[조건1 {'충족' if c['macd_cross_ok'] and c['sma_condition'] and c['adx_ok'] else '미충족'}] " @@ -637,7 +637,7 @@ def _process_symbol_core(symbol: str, cfg: "RuntimeConfig", indicators: dict = N ) # 조건2: SMA 골든크로스 + MACD + ADX (None-safe) - cond2_sma = f"SMA: {_safe_format(dp.get('prev_sma_short'), 2)}->{_safe_format(dp.get('curr_sma_short'), 2)} cross {_safe_format(dp.get('prev_sma_long'), 2)}->{_safe_format(dp.get('curr_sma_long'), 2)}" + cond2_sma = f"SMA5: {_safe_format(dp.get('prev_sma_short'), 2)}->{_safe_format(dp.get('curr_sma_short'), 2)} cross SMA200: {_safe_format(dp.get('prev_sma_long'), 2)}->{_safe_format(dp.get('curr_sma_long'), 2)}" cond2_macd = f"MACD: {_safe_format(dp.get('curr_macd'), 6)} > Sig: {_safe_format(dp.get('curr_signal'), 6)}" cond2_adx = f"ADX: {_safe_format(dp.get('curr_adx'), 2)} > {adx_threshold}" result["summary"].append( @@ -647,7 +647,7 @@ def _process_symbol_core(symbol: str, cfg: "RuntimeConfig", indicators: dict = N # 조건3: ADX 상향 + SMA + MACD (None-safe) cond3_adx = f"ADX: {_safe_format(dp.get('prev_adx'), 2)}->{_safe_format(dp.get('curr_adx'), 2)} cross {adx_threshold}" - cond3_sma = f"SMA: {_safe_format(dp.get('curr_sma_short'), 2)} > {_safe_format(dp.get('curr_sma_long'), 2)}" + cond3_sma = f"SMA5: {_safe_format(dp.get('curr_sma_short'), 2)} > SMA200: {_safe_format(dp.get('curr_sma_long'), 2)}" cond3_macd = f"MACD: {_safe_format(dp.get('curr_macd'), 6)} > Sig: {_safe_format(dp.get('curr_signal'), 6)}" result["summary"].append( f"[조건3 {'충족' if c['cross_adx'] and c['sma_condition'] and c['macd_above_signal'] else '미충족'}] "