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

되돌리기

Browse Source
This commit is contained in:
kyh
2024-05-21 09:57:48 +09:00
parent 892aad131a
commit 13ec7ba124
2 changed files with 17 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Million Buyer/MainForm.cs
View File

@@ -483,28 +483,26 @@ namespace Million_Buyer
if (tickDataList == null) tickDataList = new List<Ticker>();
//if (tickDataList.Select(t => t.TrendType).Where(t=>t == "RISE").ToList().Count > tickDataList.Count * 0.7)
//{
// topVolTempCnt = (int)(topVolTempCnt * 15 / 10);
//}
if (tickDataList.Select(t => t.TrendType).Where(t=>t == "RISE").ToList().Count > tickDataList.Count * 0.7)
{
topVolTempCnt = (int)(topVolTempCnt * 15 / 10);
}
if (tickDataList.Count > topVolTempCnt)
{
var AccumulateTradePrice24 = tickDataList.OrderByDescending(t => t.AccumulateTradePrice24).Select(t => t.CoinFullName).ToList();
AccumulateTradePrice24.RemoveRange(topVolTempCnt, AccumulateTradePrice24.Count - topVolTempCnt);
//var AccumulateTradeVolume = tickDataList.OrderByDescending(t => t.AccumulateTradeVolume).Select(t=>t.CoinFullName).ToList();
//var AccumulateTradePrice = tickDataList.OrderByDescending(t => t.AccumulateTradePrice).Select(t => t.CoinFullName).ToList();
var AccumulateTradeVolume = tickDataList.OrderByDescending(t => t.AccumulateTradeVolume).Select(t=>t.CoinFullName).ToList();
var AccumulateTradePrice = tickDataList.OrderByDescending(t => t.AccumulateTradePrice).Select(t => t.CoinFullName).ToList();
//AccumulateTradeVolume.RemoveRange(topVolTempCnt, AccumulateTradeVolume.Count - topVolTempCnt);
//AccumulateTradePrice.RemoveRange(topVolTempCnt, AccumulateTradePrice.Count - topVolTempCnt);
AccumulateTradeVolume.RemoveRange(topVolTempCnt, AccumulateTradeVolume.Count - topVolTempCnt);
AccumulateTradePrice.RemoveRange(topVolTempCnt, AccumulateTradePrice.Count - topVolTempCnt);
//foreach(var item in AccumulateTradePrice)
//{
// foreach(var item2 in AccumulateTradeVolume)
// {
// if (item == item2) filterNameList.Add(item);
// }
//}
foreach(var item in AccumulateTradePrice)
{
foreach(var item2 in AccumulateTradeVolume)
{
if (item == item2) filterNameList.Add(item);
}
}
//var AccumulateTradeVolume24 = tickDataList.OrderByDescending(t => t.AccumulateTradeVolume24).Select(t => t.CoinFullName).ToList();
//var AccumulateTradePrice24 = tickDataList.OrderByDescending(t => t.AccumulateTradePrice24).Select(t => t.CoinFullName).ToList();
@@ -520,7 +518,7 @@ namespace Million_Buyer
// filterNameList.Add(AccumulateTradeVolume24[i]);
// }
//}
nameList = AccumulateTradePrice24.Distinct().ToList();
filterNameList = filterNameList.Distinct().ToList();
//if (filterNameList.Count == 0)
//{
// filterNameList = AccumulateTradePrice;

46
Million Hunter/HunterMainForm.cs
View File

@@ -649,7 +649,7 @@ namespace Million
foreach (var key in standardData.Keys)
{
if (key == MCandleTimeType.M1) continue;
var compareData = standardData[key].LastOrDefault();
var compareData = standardData[key].LastOrDefault();
var newFlag = false;
var candleData = DataManager.GetRecentlyCandleData(minData, compareData, key, ref newFlag);
if (newFlag)
@@ -745,50 +745,6 @@ namespace Million
}
}
var crossFlag = false;
//CrossOverStatus는 이전봉이 무조건 반대로 있어야 하므로 Filter 기능 추가
var buyIndi = totalIndicator.Where(t => t.ByBuySellType == BuySellType.Buy).ToList();
foreach (var indi in buyIndi)
{
if (indi.SubIndicatorSetupType == SubIndicatorSetupType.크로스)
{
if (indi.CrossType == CrossType.CrossOverStatus)
{
var keyData = CalculateManager.GetKeyData(indi);
var subKeyData = CalculateManager.GetKeyData(totalIndicator.FirstOrDefault(t => t.IndexString == indi.CrossSubRegExpression));
var candleType = indi.MCandleTimeType;
var itemCandleList = standardData[candleType];
if (itemCandleList != null && itemCandleList.Count > 2)
{
var compare = itemCandleList[itemCandleList.Count - 2];
if (compare.IndicatorDic.ContainsKey(keyData) && compare.IndicatorDic.ContainsKey(subKeyData))
{
if (compare.IndicatorDic[keyData].value > compare.IndicatorDic[subKeyData].value)
{
crossFlag = true;
}
}
else
{
crossFlag = true;
}
}
else
{
crossFlag = true;
}
}
}
}
if (crossFlag)
{
overlapBuyManagementList[item] = false;
continue;
}
#endregion