diff --git a/Million Hunter/HunterMainForm.cs b/Million Hunter/HunterMainForm.cs index ea78976..57941f9 100644 --- a/Million Hunter/HunterMainForm.cs +++ b/Million Hunter/HunterMainForm.cs @@ -450,6 +450,7 @@ namespace Million InteratorScripter buyScript, InteratorScripter sellScript, InteratorScripter sellExceptionScript) { var buyList = new List(); + var subBuyList = new List(); var item = market.CoinFullName; var subIndStringiList = DataManager.GetSubIndicatorStringList(totalIndicator); @@ -607,6 +608,7 @@ namespace Million buyData.ConGoodsData = CommonProperty.selectedMarketOfPlaceList.FirstOrDefault(t => t.CoinFullName == item); recentlyData.BuyCount = 1; buyList.Add(buyData); + subBuyList.Add(buyData); overlapBuyManagementList[item] = false; count++; } @@ -623,6 +625,8 @@ namespace Million var flagData = buyScript.DicExcuteScript(recentlyData.CalculateFlag); if (flagData) { + var buyItem = buyList.FirstOrDefault(x => x.ConGoodsData.CoinFullName == item); + buyItem.CandleDataLists_Im.Add(recentlyData); count++; } @@ -648,7 +652,6 @@ namespace Million { var buyItem = buyList.FirstOrDefault(x => x.ConGoodsData.CoinFullName == item); - var sellItem = recentlyData; var valDic = ResultLogicManager.GetIndicateValue(sellItem.CalculateFlag, totalIndicator, sellItem); @@ -660,9 +663,9 @@ namespace Million sellItem.SellTime = recentlyData.DateTime; var buyCandleData = buyItem.CandleDataLists_Im[0]; - var result = DataManager.GetBuyerSearchResult(buyCandleData, recentlyData, buyItem.ConGoodsData); + var result = DataManager.GetBuyerSearchResult(buyCandleData, recentlyData, buyItem.ConGoodsData, buyItem.CandleDataLists_Im); result.BuyCount = count; - + resultData.Add(result); //초기화 작업 diff --git a/Million/Manager/DataManager.cs b/Million/Manager/DataManager.cs index d03eb64..ff5a64a 100644 --- a/Million/Manager/DataManager.cs +++ b/Million/Manager/DataManager.cs @@ -184,7 +184,7 @@ namespace Million.Manager /// /// /// - public static SearchResult GetBuyerSearchResult(CandleData buyCandleData, CandleData sellCandleData, MarketData market) + public static SearchResult GetBuyerSearchResult(CandleData buyCandleData, CandleData sellCandleData, MarketData market, List buyCandleDatas = null) { var result = new SearchResult(); var rate = ((sellCandleData.SellValue - buyCandleData.BuyValue) / buyCandleData.BuyValue) * 100; @@ -195,7 +195,8 @@ namespace Million.Manager result.BuyEarningRate.Add(rate); result.BuyValueList.Add(buyCandleData.BuyValue); result.BuyList.ConGoodsData = market; - result.BuyList.CandleDataLists_Im.Add(buyCandleData); + if (buyCandleDatas != null) result.BuyList.CandleDataLists_Im = buyCandleDatas; + else result.BuyList.CandleDataLists_Im.Add(buyCandleData); result.StartDate = buyCandleData.DateTime; result.SellData = sellCandleData; result.SellValue = sellCandleData.SellValue;