diff --git a/Million Hunter/HunterMainForm.cs b/Million Hunter/HunterMainForm.cs index b116843..63cd620 100644 --- a/Million Hunter/HunterMainForm.cs +++ b/Million Hunter/HunterMainForm.cs @@ -20,6 +20,7 @@ using System.Drawing; using static Million.CommonProperty; using Million.Data.SaveData; using Million_Hunter.HunterSubForm; +using System.Threading; namespace Million { @@ -34,9 +35,7 @@ namespace Million // 현재 수정/삭제 대기중인 클래스의 초기화 private IndicatorCoditionSetup _curIndicatorSetup = null; - private int _indexOfList = 0; - - + private int _indexOfList = 0; public MainForm() { @@ -486,6 +485,9 @@ namespace Million var mDataList = DbServiceFunctions.GetCandleData(market, standardStartDate, standardEndDate); var breakFlag = true; + + var count = 0; + while (true) { if (mDataList.CandleDataLists_Im.Count == 0) break; @@ -606,6 +608,7 @@ namespace Million recentlyData.BuyCount = 1; buyList.Add(buyData); overlapBuyManagementList[item] = false; + count++; } } else @@ -616,6 +619,13 @@ namespace Million //Hunter의 경우 1분안에 사고 팔고가 다 끝날수도 있음 그러므로 처리해야함 if (buyList.Any(t => t.ConGoodsData.CoinFullName == item)) { + //buy count 수 + var flagData = buyScript.DicExcuteScript(recentlyData.CalculateFlag); + if (flagData) + { + count++; + } + var flag = false; var scriptStr = sellScript.regularExpressionString; @@ -651,7 +661,7 @@ namespace Million var buyCandleData = buyItem.CandleDataLists_Im[0]; var result = DataManager.GetBuyerSearchResult(buyCandleData, recentlyData, buyItem.ConGoodsData); - + result.BuyCount = count; resultData.Add(result); @@ -663,6 +673,7 @@ namespace Million //처리한 buyList는 삭제 buyList.Remove(buyItem); + count = 0; } } mDataList.CandleDataLists_Im.RemoveAt(0); @@ -987,14 +998,15 @@ namespace Million if(multiSavedResultDatas.Count > 0) { LogManager.WriteLog("헌터 리스트 계산 시작", "Hunter List 계산"); - CommonProperty.InsertLogFlag = true; + CommonProperty.InsertLogFlag = true; + foreach (var item in multiSavedResultDatas) - { + { CalculateDatas(item.SavedResultData, item.UpperMainIndicatorFlag, item.IncludeClearIndicator, item.DownBeforeValueFlag, item.HunterMode); LogManager.WriteLog("헌터 리스트 계산 완료. Name : " + item.SavedResultData.Name, "Hunter List 계산"); // 3. 자동으로 저장하기 - if (DBConnection.QueryInsertExcuter_SavedResultData(_saveResultData)) + if (DBConnection.QueryInsertExcuter_SavedResultData(item.SavedResultData)) { LogManager.WriteLog("데이터 저장 성공. Name : " + item.SavedResultData.Name, "Hunter List 계산"); }