diff --git a/Million Hunter/MainForm.cs b/Million Hunter/MainForm.cs index 79899cd..14568b5 100644 --- a/Million Hunter/MainForm.cs +++ b/Million Hunter/MainForm.cs @@ -323,6 +323,7 @@ namespace Million_Hunter // buy, sell 계산 foreach (var indicator in totalIndicator) { + // 손절은 조합식 이후 데이터 처리에서 사용 resultCandleDataList.AddRange(CalculateManager.SwitchFun(indicator, dic[indicator.MCandleTimeType], dic[CommonProperty.MCandleTimeType.M1])); } diff --git a/Million/Data/CandleData.cs b/Million/Data/CandleData.cs index 6982324..160f6e4 100644 --- a/Million/Data/CandleData.cs +++ b/Million/Data/CandleData.cs @@ -27,6 +27,8 @@ namespace Million.Data public Dictionary CalculateFlag { get; set; } = new Dictionary(); + + public CandleType CandleType { get; set; } = CandleType.None; /// diff --git a/Million/Million Core.csproj b/Million/Million Core.csproj index eade504..adc9f86 100644 --- a/Million/Million Core.csproj +++ b/Million/Million Core.csproj @@ -146,6 +146,7 @@ + @@ -223,6 +224,5 @@ - \ No newline at end of file diff --git a/Million/Million Core.csproj.user b/Million/Million Core.csproj.user new file mode 100644 index 0000000..9b86104 --- /dev/null +++ b/Million/Million Core.csproj.user @@ -0,0 +1,6 @@ + + + + ShowAllFiles + + \ No newline at end of file