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

3틱 삭제 (BTT는 제외하도록 되어 있음)

Browse Source
This commit is contained in:
kyh
2024-02-22 09:54:02 +09:00
parent 75f4152c02
commit 38a907ed15
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Million Buyer/MainForm.cs
View File

@@ -479,9 +479,12 @@ namespace Million_Buyer
{
var tickDataList = UpbitApi.GetTickerList(realTimeMsg.coinFullNameList);
int topVolTempCnt = TopVolCnt;
if(tickDataList.Select(t => t.TrendType).Where(t=>t == "RISE").ToList().Count > tickDataList.Count * 0.7)
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 * 2);
topVolTempCnt = (int)(topVolTempCnt * 15 / 10);
}
if (tickDataList.Count > topVolTempCnt)
@@ -500,20 +503,20 @@ namespace Million_Buyer
}
}
var AccumulateTradeVolume24 = tickDataList.OrderByDescending(t => t.AccumulateTradeVolume24).Select(t => t.CoinFullName).ToList();
var AccumulateTradePrice24 = tickDataList.OrderByDescending(t => t.AccumulateTradePrice24).Select(t => t.CoinFullName).ToList();
//var AccumulateTradeVolume24 = tickDataList.OrderByDescending(t => t.AccumulateTradeVolume24).Select(t => t.CoinFullName).ToList();
//var AccumulateTradePrice24 = tickDataList.OrderByDescending(t => t.AccumulateTradePrice24).Select(t => t.CoinFullName).ToList();
for (var i = 0; i < 5; i++)
{
if (!filterNameList.Any(t => t == AccumulateTradePrice24[i]))
{
filterNameList.Add(AccumulateTradePrice24[i]);
}
if (!filterNameList.Any(t => t == AccumulateTradeVolume24[i]))
{
filterNameList.Add(AccumulateTradeVolume24[i]);
}
}
//for (var i = 0; i < 5; i++)
//{
// if (!filterNameList.Any(t => t == AccumulateTradePrice24[i]))
// {
// filterNameList.Add(AccumulateTradePrice24[i]);
// }
// if (!filterNameList.Any(t => t == AccumulateTradeVolume24[i]))
// {
// filterNameList.Add(AccumulateTradeVolume24[i]);
// }
//}
filterNameList = filterNameList.Distinct().ToList();
//if (filterNameList.Count == 0)
//{
@@ -825,9 +828,8 @@ namespace Million_Buyer
result.SellCount = sellOrder.ExecutedVolume;
if(sellVal == 0)
{
sellItem.SellValue = sellOrder.OrderPrice;
sellVal = sellOrder.OrderPrice;
{
sellVal = sellItem.SellValue;
}
buyCycleCount--;

10
Million/Manager/CalculateManager.cs
View File

@@ -850,11 +850,11 @@ namespace Million.Manager
//TODO Tick 차이 관련 조건 식 추가 예정
//최초로 매수, 매도 진행 시 사전 조건과의 Tick거리를 예외할 수 있어야 함
//OverlapValue는 사야할 데이터, beforeIndiValue는 사전 데이터
if (!GetTickDifferenceCount(overlapData, subVal, 3, coinFullName))
{
subManagement[coinFullName] = false;
continue;
}
//if (!GetTickDifferenceCount(overlapData, subVal, 3, coinFullName))
//{
// subManagement[coinFullName] = false;
// continue;
//}
//최초 시점이 아닐 경우
if ((subManagement != null && subManagement[coinFullName]) || !firstFlag)