diff --git a/Million Hunter/HunterMainForm.cs b/Million Hunter/HunterMainForm.cs index 1f61b61..0e6ec84 100644 --- a/Million Hunter/HunterMainForm.cs +++ b/Million Hunter/HunterMainForm.cs @@ -371,10 +371,8 @@ namespace Million sellExceptionScript.regularExpressionString = savedResult.SellExceptionRegularExpression; var dic = new Dictionary>(); - Parallel.For(0, tableList.Count, i => - { - // for (var i = 0; i < tableList.Count; i++) - //{ + Parallel.For(0, tableList.Count, i => { + //for (var i = 0; i < tableList.Count; i++) { var market = tableList[i]; if (!market.CoinFullName.Contains("BTT")) { @@ -491,7 +489,7 @@ namespace Million var maxCandleType = totalCandleTypeList.Max(); var smallCandleType = totalCandleTypeList.Min(); - var list = totalCandleTypeList.Where(t => t < MCandleTimeType.H1).ToList(); + var list = totalCandleTypeList; var minMaxCandleType = MCandleTimeType.M1; if (!(list == null || list.Count == 0)) @@ -505,19 +503,20 @@ namespace Million var resultData = new List(); - var startMiniuteDate = startDate.AddMinutes((int)minMaxCandleType * -80); + var startMiniuteDate = startDate.AddMinutes((int)minMaxCandleType * -500); var mCandleTypeList = new List { CommonProperty.MCandleTimeType.M1 }; + var standardData = DataManager.GetStandardData(totalIndicator, startMiniuteDate, startDate, market, distinctIndicator, true, mCandleTypeList); totalCandleTypeList.AddRange(mCandleTypeList); var indicatorCandleTypeList = totalCandleTypeList; if (maxCandleType >= MCandleTimeType.H1) { - var startHourDate = startDate.AddHours((int)maxCandleType / 60 * -80); + var startHourDate = startDate.AddHours((int)maxCandleType * -500); var hCandleTypeList = new List { CommonProperty.MCandleTimeType.H1