From 3b681659dd56b970d4e463546457958a00caa501 Mon Sep 17 00:00:00 2001 From: kyh <1329522@naver.com> Date: Tue, 21 May 2024 14:24:04 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=EB=8B=88=EB=B0=9C=EA=B0=80=EC=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Million Buyer/MainForm.cs | 62 ++-------------------- Million/Manager/CalculateManager.cs | 5 +- Million/WebMangement/Upbit/UpbitProcess.cs | 3 +- 3 files changed, 10 insertions(+), 60 deletions(-) diff --git a/Million Buyer/MainForm.cs b/Million Buyer/MainForm.cs index 6d1dd61..87d3f75 100644 --- a/Million Buyer/MainForm.cs +++ b/Million Buyer/MainForm.cs @@ -483,67 +483,19 @@ namespace Million_Buyer if (tickDataList == null) tickDataList = new List(); - 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에 있는지 확인 diff --git a/Million/Manager/CalculateManager.cs b/Million/Manager/CalculateManager.cs index a51efe4..556ef44 100644 --- a/Million/Manager/CalculateManager.cs +++ b/Million/Manager/CalculateManager.cs @@ -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 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; diff --git a/Million/WebMangement/Upbit/UpbitProcess.cs b/Million/WebMangement/Upbit/UpbitProcess.cs index b499a24..6b61515 100644 --- a/Million/WebMangement/Upbit/UpbitProcess.cs +++ b/Million/WebMangement/Upbit/UpbitProcess.cs @@ -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){