million/Million
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

코드 수정

Browse Source
This commit is contained in:
kyh
2022-07-14 11:37:00 +09:00
parent ea19b20e03
commit 328e70b27b
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Million Hunter/MainForm.cs
View File

@@ -269,7 +269,8 @@ namespace Million_Hunter
totalIndicator.AddRange(buyIndicatorList);
totalIndicator.AddRange(sellIndicatorList);
var tableList = CommonProperty.selectedMarketOfPlaceList;
var tableList = CommonProperty.selectedMarketOfPlaceList;
var totalResultList = new List<SearchResult>();
var startDate = _saveResultData.StartDateTime;

18
Million/Manager/IndicatorSetupManager.cs
View File

@@ -63,15 +63,21 @@ namespace Million.Manager
/// <param name="endDate"></param>
/// <param name="market"></param>
/// <returns></returns>
public static Dictionary<MCandleTimeType, List<CandleData>> GetCalculateCandleData(List<IndicatorCoditionSetup> totalIndicators, DateTime startDate,
DateTime endDate, MarketData market)
public static Dictionary<MCandleTimeType, List<CandleData>> GetCalculateCandleData(List<IndicatorCoditionSetup> totalIndicators, DateTime startDate,
DateTime endDate, MarketData market = null)
{
var distinctIndicator = IndicatorSetupManager.Distinct(totalIndicators);
if (market == null)
{
var tableList = selectedMarketOfPlaceList;
market = tableList.FirstOrDefault(t => t.CodeFullName == "KRW-BTC");
}
var distinctIndicator = Distinct(totalIndicators);
// 총 데이터
var dic = DataManager.GetStandardData(totalIndicators, startDate, endDate, market, distinctIndicator, true);
dic[CommonProperty.MCandleTimeType.M1] = dic[CommonProperty.MCandleTimeType.M1].Where(t => startDate <= t.DateTime && t.DateTime < endDate).ToList();
dic[MCandleTimeType.M1] = dic[MCandleTimeType.M1].Where(t => startDate <= t.DateTime && t.DateTime < endDate).ToList();
// Sub Indicator string list 반환
var subIndStringiList = DataManager.GetSubIndicatorStringList(totalIndicators);
@@ -80,7 +86,7 @@ namespace Million.Manager
// 선처리
CalculateManager.GetCalculateIndicator(totalIndicators, subIndStringiList, null, startDate,
endDate, dic[CommonProperty.MCandleTimeType.M1], subIndicator, dic);
endDate, dic[MCandleTimeType.M1], subIndicator, dic);
var totalIndi = totalIndicators.Select(t => t.IndexString).ToList();
@@ -90,7 +96,7 @@ namespace Million.Manager
// 후처리
CalculateManager.GetCalculateIndicator(totalIndicators, totalIndi, null, startDate,
endDate, dic[CommonProperty.MCandleTimeType.M1], subIndicator, dic);
endDate, dic[MCandleTimeType.M1], subIndicator, dic);
return dic;