This commit is contained in:
Macbook
2026-06-12 23:52:08 +09:00
parent 4a6be82c15
commit 2c0570c95e
10 changed files with 733 additions and 47 deletions
@@ -1050,8 +1050,7 @@ public class StrategyDslToTa4jAdapter {
if (cond == null || cond.isNull()) return "";
int candleRange = cond.path("candleRange").asInt(1);
String mode = cond.path("candleRangeMode").asText("");
if (mode.isBlank()) mode = candleRange <= 1 ? "CURRENT" : "EXISTS_IN";
if ("CURRENT".equals(mode)) return "";
if (mode.isBlank()) return "";
int n = Math.max(2, candleRange);
return switch (mode) {
case "EXISTS_IN" -> "최근 " + n + "봉 내 ";
@@ -1060,11 +1059,11 @@ public class StrategyDslToTa4jAdapter {
};
}
/** candleRangeMode 미설정 시 candleRange>1 → EXISTS_IN (구버전 호환) */
/** candleRangeMode 가 명시된 경우에만 윈도우 평가 (candleRange 숫자만으로는 적용하지 않음) */
private String resolveCandleRangeMode(JsonNode cond, int candleRange) {
String mode = cond.path("candleRangeMode").asText("");
if (!mode.isBlank()) return mode;
return candleRange <= 1 ? "CURRENT" : "EXISTS_IN";
if (mode.isBlank()) return "CURRENT";
return mode;
}
/** 최근 N봉(현재 봉 포함) 윈도우에 inner 규칙 적용 */