analyser_hj3415 2.8.0__py2.py3-none-any.whl → 2.8.1__py2.py3-none-any.whl

analyser_hj3415/tsa.py

@@ -105,12 +105,13 @@ class MyProphet:
 
     def get_yhat(self) -> dict:
         """
-        예측하는 첫째날의 예측 데이터를 반환한다.
+        최근 날짜의 예측데이터를 반환한다.
         :return: {'ds':..., 'yhat':.., 'yhat_lower':.., 'yhat_upper':..,}
         """
         df = self.df_forecast
-        analyser_logger.debug(df)
-        yhat_dict = df.iloc[0][['ds', 'yhat_lower', 'yhat_upper', 'yhat']].to_dict()
+        last_real_date = self.df_real.iloc[-1]['ds']
+        analyser_logger.info(last_real_date)
+        yhat_dict = df[df['ds']==last_real_date].iloc[0][['ds', 'yhat_lower', 'yhat_upper', 'yhat']].to_dict()
         analyser_logger.info(yhat_dict)
         return yhat_dict
 
@@ -186,14 +187,16 @@ class MyProphet:
             p = MyProphet('005930')
             for i, code in enumerate(myredis.Corps.list_all_codes()):
                 p.code = code
-                recent_price = p._preprocessing_for_prophet().iloc[-1]['y']
+                last_real_data = p._preprocessing_for_prophet().iloc[-1]
+                recent_price = last_real_data['y']
+                recent_date = datetime.strftime(last_real_data['ds'], '%Y-%m-%d')
                 yhat_dict = p.get_yhat()
                 analyser_logger.info(f'recent_price: {recent_price}, yhat_dict: {yhat_dict}')
                 yhat_lower = int(yhat_dict['yhat_lower'])
                 if recent_price < yhat_lower:
                     deviation = int(eval.Tools.cal_deviation(recent_price, yhat_lower))
                     data[code] = deviation
-                    print(f"{i}.{p.code}/{p.name} 최근가격:{recent_price} 기대하한값:{yhat_lower} 편차:{deviation}")
+                    print(f"{i}.{p.code}/{p.name} date: {recent_date} 가격:{recent_price} 기대하한값:{yhat_lower} 편차:{deviation}")
             return data
 
         data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_ranking, timer=expire_time)

{analyser_hj3415-2.8.0.dist-info → analyser_hj3415-2.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: analyser_hj3415
-Version: 2.8.0
+Version: 2.8.1
 Summary: Stock analyser and database processing programs
 Author-email: Hyungjin Kim <hj3415@gmail.com>
 Description-Content-Type: text/markdown

{analyser_hj3415-2.8.0.dist-info → analyser_hj3415-2.8.1.dist-info}/RECORD

@@ -2,15 +2,15 @@ analyser_hj3415/.DS_Store,sha256=qr9-0FPn5CFKe6kEu8_dWCNhzQ0sN7bwQgffKsaJEEo,614
 analyser_hj3415/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 analyser_hj3415/cli.py,sha256=7ys-b9H_tJAbLLi_XpjmEvDiyNHddpg9F1FNAACfWnE,11005
 analyser_hj3415/eval.py,sha256=4F0GIknCogAhv_iTq8auLrmwW20u8kH0HY0fP4SaVa4,39099
-analyser_hj3415/tsa.py,sha256=4fg92xzEnp9kChvEzXbnAv6jGLuDK4zMaZjBoobp6I0,7649
+analyser_hj3415/tsa.py,sha256=Dxjyt9dFNlcEu0w5u5YA57sKFLXdzCnBUAMAAQqlT20,7873
 analyser_hj3415/workroom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 analyser_hj3415/workroom/lstm.py,sha256=gF7i1NqPOhNysvkSQcC_mkOmvLk96jPxoqajZ-FFD8I,4078
 analyser_hj3415/workroom/mysklearn.py,sha256=wJXKz5MqqTzADdG2mqRMMzc_G9RzwYjj5_j4gyOopxQ,2030
 analyser_hj3415/workroom/mysklearn2.py,sha256=1lIy6EWEQHkOzDS-av8U0zQH6DuCLKWMI73dnJx5KRs,1495
 analyser_hj3415/workroom/score.py,sha256=P6nHBJYmyhigGtT4qna4BmNtvt4B93b7SKyzdstJK24,17376
 analyser_hj3415/workroom/trash.py,sha256=zF-W0piqkGr66UP6-iybo9EXh2gO0RP6R1FnIpsGkl8,12262
-analyser_hj3415-2.8.0.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
-analyser_hj3415-2.8.0.dist-info/LICENSE,sha256=QVKTp0dTnB5xG8RLgG17LwSWCKNEzYoVVM6KjoCPKc0,1079
-analyser_hj3415-2.8.0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-analyser_hj3415-2.8.0.dist-info/METADATA,sha256=4Zf9g7uum4fIQqqY1IF0_HRzQwT-JAJvAPdfRY0eW9Q,6607
-analyser_hj3415-2.8.0.dist-info/RECORD,,
+analyser_hj3415-2.8.1.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
+analyser_hj3415-2.8.1.dist-info/LICENSE,sha256=QVKTp0dTnB5xG8RLgG17LwSWCKNEzYoVVM6KjoCPKc0,1079
+analyser_hj3415-2.8.1.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+analyser_hj3415-2.8.1.dist-info/METADATA,sha256=ydT7SqeWwrkwYFmqOfkjsIbo24YPpNFlw4oaqNPot04,6607
+analyser_hj3415-2.8.1.dist-info/RECORD,,