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 14:24:04 +09:00
parent 11f52637a5
commit 3b681659dd
3 changed files with 10 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Million Buyer/MainForm.cs
View File

@@ -483,67 +483,19 @@ 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.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 AccumulateTradePrice24 = tickDataList.OrderByDescending(t => t.AccumulateTradePrice24).Select(t => t.CoinFullName).ToList();
AccumulateTradePrice24.RemoveRange(TopVolCnt, AccumulateTradePrice24.Count - TopVolCnt);
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);
}
}
//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]);
// }
//}
filterNameList = filterNameList.Distinct().ToList();
//if (filterNameList.Count == 0)
//{
// filterNameList = AccumulateTradePrice;
//}
//// 10개가 안될 경우 24시간 거래대금 Top 10개넣기
//else if (filterNameList.Count < 10)
//{
// var AccumulateTradePrice24 = tickDataList.OrderByDescending(t => t.AccumulateTradePrice24).Select(t => t.CoinFullName).ToList();
// for (var i = 0; i < 10; i++)
// {
// if (!filterNameList.Any(t => t == AccumulateTradePrice24[i]))
// {
// filterNameList.Add(AccumulateTradePrice24[i]);
// }
// }
//}
}
filterNameList = AccumulateTradePrice24;
}
}
if (buyList.Count == 0) allSell = false;
foreach (var item in nameList)
{
#region Indicator 계산 -> Code full name 으로 for문 돌면서 계산 처리
sw.Restart();
@@ -597,10 +549,6 @@ namespace Million_Buyer
var beforeData = dic[smallCandleType].FirstOrDefault(t => t.DateTime == recentlyDate);
if (recentlyData == null)
continue;
if(item == "KRW-ETH")
{
}
/*
* 로직 설명
* 1. Buy List에 있는지 확인

5
Million/Manager/CalculateManager.cs
View File

@@ -672,7 +672,7 @@ namespace Million.Manager
dic[coinFullName] = true;
continue;
}
else if (dic[coinFullName] && subIndiOverlapVal < overlapValue)
else if (setUp.CrossType == CrossType.CrossOverStatus ? dic[coinFullName] : true && subIndiOverlapVal < overlapValue)
{
List<CandleData> childs = null;
@@ -1240,7 +1240,8 @@ namespace Million.Manager
foreach (var item in childs)
{
item.IndicatorDic[key] = parent.IndicatorDic[key];
if (item.CalculateFlag[setUp.IndexString]) continue;
item.CalculateFlag[setUp.IndexString] = true;
}
parent.CalculateFlag[setUp.IndexString] = true;

3
Million/WebMangement/Upbit/UpbitProcess.cs
View File

@@ -61,7 +61,8 @@ namespace Million.WebMangement.Upbit
time = DateTime.Now;
}
var contents = response.Content.ReadAsStringAsync().Result;
var contents = response.Content.ReadAsStringAsync().Result;
return contents;
}
catch(Exception ex){