From 9459c9879581a0322f377da05b298b7b45076dfe Mon Sep 17 00:00:00 2001
From: dsyoon <dosangyoon@gmail.com>
Date: Mon, 16 Oct 2023 12:26:52 +0900
Subject: [PATCH] init

---
 HTS_etf_122630.py     | 6 +++---
 HTS_etf_233740.py     | 6 +++---
 Simulation.py         | 2 ++
 hts/BuySellChecker.py | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/HTS_etf_122630.py b/HTS_etf_122630.py
index e30cdae..f6a3aff 100644
--- a/HTS_etf_122630.py
+++ b/HTS_etf_122630.py
@@ -65,19 +65,19 @@ class HTS_etf(HTS):
                     if code == "A" + stock_code:
                         if bs_sell_price is not None:
                             if jangoDic[code]['매도가능'] > 0:
-                                if jangoDic[code]['평가손익'] < -1.5 or 2 < jangoDic[code]['평가손익']:
+                                if jangoDic[code]['평가손익'] < -1.5 or 1 < jangoDic[code]['평가손익']:
                                     # 1.5% 손해 혹은 2% 이상 시 수익 매도
                                     self.requestOrder(OrderType.sell, code[1:], jangoDic[code]['매도가능'], bs_sell_price)
                                     check = True
                         else:
                             if jangoDic[code]['매도가능'] > 0:
-                                if jangoDic[code]['평가손익'] < -1.5 or 2 < jangoDic[code]['평가손익']:
+                                if jangoDic[code]['평가손익'] < -1.5 or 1 < jangoDic[code]['평가손익']:
                                     # 1.5% 손해 혹은 2% 이상 시 수익 매도
                                     self.requestOrder(OrderType.sell, code[1:], jangoDic[code]['매도가능'], jangoDic[code]['현재가'])
                                     check = True
                 else:
                     if jangoDic[code]['매도가능'] > 0:
-                        if jangoDic[code]['평가손익'] < -1.5 or 2 < jangoDic[code]['평가손익']:
+                        if jangoDic[code]['평가손익'] < -1.5 or 1 < jangoDic[code]['평가손익']:
                             # 1.5% 손해 혹은 2% 이상 시 수익 매도
                             self.requestOrder(OrderType.sell, code[1:], jangoDic[code]['매도가능'], jangoDic[code]['현재가'])
                             check = True
diff --git a/HTS_etf_233740.py b/HTS_etf_233740.py
index b97adeb..557b558 100644
--- a/HTS_etf_233740.py
+++ b/HTS_etf_233740.py
@@ -65,19 +65,19 @@ class HTS_etf(HTS):
                     if code == "A" + stock_code:
                         if bs_sell_price is not None:
                             if jangoDic[code]['매도가능'] > 0:
-                                if jangoDic[code]['평가손익'] < -1.5 or 2 < jangoDic[code]['평가손익']:
+                                if jangoDic[code]['평가손익'] < -1.5 or 1 < jangoDic[code]['평가손익']:
                                     # 1.5% 손해 혹은 2% 이상 시 수익 매도
                                     self.requestOrder(OrderType.sell, code[1:], jangoDic[code]['매도가능'], bs_sell_price)
                                     check = True
                         else:
                             if jangoDic[code]['매도가능'] > 0:
-                                if jangoDic[code]['평가손익'] < -1.5 or 2 < jangoDic[code]['평가손익']:
+                                if jangoDic[code]['평가손익'] < -1.5 or 1 < jangoDic[code]['평가손익']:
                                     # 1.5% 손해 혹은 2% 이상 시 수익 매도
                                     self.requestOrder(OrderType.sell, code[1:], jangoDic[code]['매도가능'], jangoDic[code]['현재가'])
                                     check = True
                 else:
                     if jangoDic[code]['매도가능'] > 0:
-                        if jangoDic[code]['평가손익'] < -1.5 or 2 < jangoDic[code]['평가손익']:
+                        if jangoDic[code]['평가손익'] < -1.5 or 1 < jangoDic[code]['평가손익']:
                             # 1.5% 손해 혹은 2% 이상 시 수익 매도
                             self.requestOrder(OrderType.sell, code[1:], jangoDic[code]['매도가능'], jangoDic[code]['현재가'])
                             check = True
diff --git a/Simulation.py b/Simulation.py
index c93a6c7..7d2d707 100644
--- a/Simulation.py
+++ b/Simulation.py
@@ -253,7 +253,9 @@ if __name__ == "__main__":
         #"122630": ['20230930'],
         #"122630": ['20210901','20210902','20210903','20210906','20231012','20231013']
         #"122630": ['20210901', '20210902', '20210903', '20210906', '20210907', '20210908', '20210909', '20210910', '20210913', '20210914', '20210915', '20210916', '20210917', '20210923', '20210924', '20210927', '20210928', '20210929', '20210930', '20211001', '20211005','20231012','20231013'],
+        "252670": ['20231012', '20231013'],
         "251340": ['20231012', '20231013'],
+        "122630": ['20231012', '20231013'],
         "233740": ['20231012', '20231013'],
     }
     #simulation.simulate(stock_codes)
diff --git a/hts/BuySellChecker.py b/hts/BuySellChecker.py
index 918a519..d989fcf 100644
--- a/hts/BuySellChecker.py
+++ b/hts/BuySellChecker.py
@@ -415,7 +415,8 @@ class BuySellChecker:
             last_index = size - 1
 
             buy, buy_weight = self.getBuyPriceAndWeight(stock_code, last_index, data)
-            sell, sell_weight = self.getSellPriceAndWeight(stock_code, last_index, data)
+            #sell, sell_weight = self.getSellPriceAndWeight(stock_code, last_index, data)
+            sell, sell_weight = -1, -1
             if data.index[last_index].strftime('%H:%M:%S') > datetime.strptime(datetime.today().strftime("%Y-%m-%d 15:10:00"), "%Y-%m-%d %H:%M:%S").strftime('%H:%M:%S'):
                 buy, buy_weight = -1, -1