From 5b609d34cd0d6a3a0d84770ba18b0e5cc2770ac2 Mon Sep 17 00:00:00 2001
From: kyh <1329522@naver.com>
Date: Mon, 28 Nov 2022 15:38:40 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Rate=20=EB=B9=84=EC=9C=A8=20=EC=A0=95?=
=?UTF-8?q?=EC=83=81=EB=8F=99=EC=9E=91=20=ED=99=95=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Million/Manager/CalculateManager.cs | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/Million/Manager/CalculateManager.cs b/Million/Manager/CalculateManager.cs
index 3330cbd..feb93a8 100644
--- a/Million/Manager/CalculateManager.cs
+++ b/Million/Manager/CalculateManager.cs
@@ -385,9 +385,7 @@ namespace Million.Manager
var rateVal = buyData.BuyValue + (buyData.BuyValue * rate / 100);
foreach (var item in parentCandleDataList)
{
- var itemValue = GetValue(item, setUp);
- if (setUp.CandlePriceType == CommonProperty.CandlePriceType.종가)
- itemValue = item.LowValue;
+ var itemValue = GetValue(item, setUp);
if(rateVal > itemValue)
{
@@ -396,9 +394,7 @@ namespace Million.Manager
foreach (var child in childrenCandleDataList)
{
itemValue = GetValue(child, setUp);
- if (setUp.CandlePriceType == CommonProperty.CandlePriceType.종가)
- itemValue = child.LowValue;
-
+
if (rateVal > itemValue)
child.CalculateFlag[setUp.IndexString] = true;
}
From a4afb09cd6e36a1d476fc6d2d78c63e9414a41d5 Mon Sep 17 00:00:00 2001
From: kyh <1329522@naver.com>
Date: Mon, 28 Nov 2022 16:38:12 +0900
Subject: [PATCH 2/2] =?UTF-8?q?hunter=20=EC=98=88=EC=99=B8=EC=B2=98?=
=?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Million Buyer/MainForm.cs | 2 +-
Million Hunter/HunterMainForm.cs | 3 +++
Million/Manager/InitManager.cs | 16 +++++++++-------
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Million Buyer/MainForm.cs b/Million Buyer/MainForm.cs
index 3833696..d2da82a 100644
--- a/Million Buyer/MainForm.cs
+++ b/Million Buyer/MainForm.cs
@@ -410,7 +410,7 @@ namespace Million_Buyer
this.BeginInvoke(new Action(delegate ()
{
- InitManager.BuyerInit(cb_IncludeClearIndicator.Checked, overlapBuyManagementList, totalIndicatorList);
+ InitManager.SettingInit(cb_IncludeClearIndicator.Checked, overlapBuyManagementList, totalIndicatorList);
foreach (var item in buyList)
{
var recentlyData = item.CandleDataLists_Im[0];
diff --git a/Million Hunter/HunterMainForm.cs b/Million Hunter/HunterMainForm.cs
index f855aed..95222c2 100644
--- a/Million Hunter/HunterMainForm.cs
+++ b/Million Hunter/HunterMainForm.cs
@@ -280,6 +280,9 @@ namespace Million
var startDate = _saveResultData.StartDateTime;
var endDate = _saveResultData.EndDateTime;
+ InitManager.SettingInit(true, null, totalIndicator);
+
+
//TODO 이전 조건보다 현재 조건이 더 높아야 한다는 조건 걸기
var upperMainIndicatorFlag = cb_UpperMainIndi.Checked;
diff --git a/Million/Manager/InitManager.cs b/Million/Manager/InitManager.cs
index 330ed34..e81b5dc 100644
--- a/Million/Manager/InitManager.cs
+++ b/Million/Manager/InitManager.cs
@@ -78,17 +78,19 @@ namespace Million.Manager
///
///
///
- public static void BuyerInit(bool checkData, Dictionary overlapBuyManagementList, List totalIndicatorList)
+ public static void SettingInit(bool checkData, Dictionary overlapBuyManagementList, List totalIndicatorList)
{
var coinFullNameList = CommonProperty.selectedMarketOfPlaceList.Select(t => t.CoinFullName).ToList();
-
- foreach (var item in coinFullNameList)
+ if (overlapBuyManagementList != null)
{
- if (checkData)
- overlapBuyManagementList[item] = false;
- else
- overlapBuyManagementList[item] = true;
+ foreach (var item in coinFullNameList)
+ {
+ if (checkData)
+ overlapBuyManagementList[item] = false;
+ else
+ overlapBuyManagementList[item] = true;
+ }
}
foreach (var item in totalIndicatorList)