From 5c3fe649d9f579a31fcc75f94e7a38706453456c Mon Sep 17 00:00:00 2001
From: dsyoon <dosangyoon@gmail.com>
Date: Mon, 12 Sep 2022 15:34:05 +0900
Subject: [PATCH] init

---
 stock/analysis/MACD.py | 25 +++++--------------------
 stock/analysis/RSI.py  |  2 ++
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/stock/analysis/MACD.py b/stock/analysis/MACD.py
index 33137f7..ab5390f 100644
--- a/stock/analysis/MACD.py
+++ b/stock/analysis/MACD.py
@@ -53,29 +53,14 @@ class MACD:
     """
 
     def analyze(self, stock):
-        results = []
+
         df = pd.DataFrame()
         df = df.from_dict(stock['PRICE'])
         df = self.apply(df)
 
         for i in range(len(df.macd)):
-            result = {'DATE':stock['PRICE'][i]['DATE'],
-                      'macd': df.macd.values[i],
-                      'macds': df.macds.values[i],
-                      'macdo': df.macdo.values[i],
-                      'macd_buy': 0}
+            stock['PRICE'][i]['macd'] = df.macd.values[i]
+            stock['PRICE'][i]['macds'] = df.macds.values[i]
+            stock['PRICE'][i]['macdo'] = df.macdo.values[i]
 
-            # MACD가 3일 전부터 상승이라면 매수
-            if df.macd.values[i - 1] < df.macd.values[i]:
-                # 어제는 MACD-Sign이 MACD 위에 있지만, 오늘은 MACD가 MACD-Sign 위로 올라오면 매수
-                if df.macd.values[i-1] < df.macds.values[i-1] and df.macd.values[i] > df.macds.values[i]:
-                    result['macd_buy'] = 1
-
-            # MACD가 3일 전부터 하락이라면 매도
-            if df.macd.values[i - 1] > df.macd.values[i]:
-                # 어제는 MACD가 MACD-Sign 위에 있지만, 오늘은 MACD-Sign이 MACD 위로 올라오면 매도
-                if df.macd.values[i - 1] > df.macds.values[i - 1] and df.macd.values[i] < df.macds.values[i]:
-                    result['macd_buy'] = -1
-
-            results.append(result)
-        return results
\ No newline at end of file
+        return
\ No newline at end of file
diff --git a/stock/analysis/RSI.py b/stock/analysis/RSI.py
index ab76004..db2e21d 100644
--- a/stock/analysis/RSI.py
+++ b/stock/analysis/RSI.py
@@ -53,3 +53,5 @@ class RSI:
         for i in range(len(df.rsi)):
             stock['PRICE'][i]['rsi'] = df.rsi.values[i]
             stock['PRICE'][i]['rsis'] = df.rsis.values[i]
+
+        return