analyser_hj3415 2.5.2__py2.py3-none-any.whl → 2.5.4__py2.py3-none-any.whl

analyser_hj3415/analysers/eval.py

@@ -16,10 +16,6 @@ logger.addHandler(ch)
 logger.setLevel(logging.WARNING)
 
 
-# 주식을 통한 기대수익률 - 금리가 3%일 경우 두배인 6% 정도로 잡는다.
-EXPECT_EARN = 0.06
-
-
 def red(code: str) -> dict:
     """
     리턴값
@@ -45,6 +41,8 @@ def red(code: str) -> dict:
     d6, 투자부동산 = c103q.latest_value_pop2('투자부동산')
 
     # 사업가치 계산 - 지배주주지분 당기순이익 / 기대수익률
+    from analyser_hj3415 import cli
+    EXPECT_EARN = cli.AnalyserSettingsManager(cli.SETTINGS_FILE).get_value('EXPECT_EARN')
     사업가치 = round(utils.nan_to_zero(지배주주당기순이익) / EXPECT_EARN, 2)
 
     # 재산가치 계산 - 유동자산 - (유동부채*1.2) + 고정자산중 투자자산
@@ -73,6 +71,7 @@ def red(code: str) -> dict:
         '재산가치': 재산가치,
         '부채평가': 부채평가,
         '발행주식수': 발행주식수,
+        'EXPECT_EARN': EXPECT_EARN,
         'date': tools.set_data(d1, d2, d3, d4, d5, d6),  # ''값을 제거하고 리스트로 바꾼다.
     }
 

analyser_hj3415/analysers/score.py

@@ -93,7 +93,9 @@ def mil(code: str) -> Tuple[int, int, int, int]:
     if math.isnan(mil_dict['주주수익률']):
         score1 = 0
     else:
-        주주수익률평가 = math.ceil(mil_dict['주주수익률'] - (eval.EXPECT_EARN * 100))
+        from analyser_hj3415 import cli
+        EXPECT_EARN = cli.AnalyserSettingsManager(cli.SETTINGS_FILE).get_value('EXPECT_EARN')
+        주주수익률평가 = math.ceil(mil_dict['주주수익률'] - (EXPECT_EARN * 100))
         score1 = 0 if 0 > 주주수익률평가 else 주주수익률평가
 
     # 이익지표 평가

{analyser_hj3415-2.5.2.dist-info → analyser_hj3415-2.5.4.dist-info}/METADATA

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

{analyser_hj3415-2.5.2.dist-info → analyser_hj3415-2.5.4.dist-info}/RECORD

@@ -2,14 +2,13 @@ analyser_hj3415/.DS_Store,sha256=qr9-0FPn5CFKe6kEu8_dWCNhzQ0sN7bwQgffKsaJEEo,614
 analyser_hj3415/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 analyser_hj3415/cli.py,sha256=27l5X0L657FIybpZdNUBl94KfmghyFOHF2OlY7AjO58,4635
 analyser_hj3415/myredis.py,sha256=T5ESGx1QBrO7mTMlSzqIm975Wks-X9WqrPWVWgFRHUE,10758
-analyser_hj3415/settings.json,sha256=RBNvo1WzZ4oRRq0W9-hknpT7T8If536DEMBg9hyq_4o,2
 analyser_hj3415/tools.py,sha256=T7QYJekKvWNlJtiqu_FaiX3FGfDc71NY4vrbEDfBEt0,13705
 analyser_hj3415/trash.py,sha256=zF-W0piqkGr66UP6-iybo9EXh2gO0RP6R1FnIpsGkl8,12262
-analyser_hj3415/analysers/eval.py,sha256=DIuy0jsF5zP2I26rDeGoeguqw3yvgud-3Pr6argDnYc,13310
+analyser_hj3415/analysers/eval.py,sha256=EIgHcRnwc0mXL5Y2TzVgvZ7lPUP5Fo5XX-xSWmYEeis,13357
 analyser_hj3415/analysers/report.py,sha256=yY-AeDHOqDPrm4lpvZv3NPTJK1Z7lKsjoO5ck8AP6u4,9007
-analyser_hj3415/analysers/score.py,sha256=tyc1NA_0K7b2mjTTMdJVH_OlqBAqAMrcPOvWPYFudfg,15853
-analyser_hj3415-2.5.2.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
-analyser_hj3415-2.5.2.dist-info/LICENSE,sha256=QVKTp0dTnB5xG8RLgG17LwSWCKNEzYoVVM6KjoCPKc0,1079
-analyser_hj3415-2.5.2.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-analyser_hj3415-2.5.2.dist-info/METADATA,sha256=HAr1OI0_4vgeNjVNp7lXayvmrBPoW1CoVQ_BOUTIzVo,6417
-analyser_hj3415-2.5.2.dist-info/RECORD,,
+analyser_hj3415/analysers/score.py,sha256=o0NLvyu-4Y3ZRrsXLRL3TlV2eTFrUj78pbB78gRrCCQ,15982
+analyser_hj3415-2.5.4.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
+analyser_hj3415-2.5.4.dist-info/LICENSE,sha256=QVKTp0dTnB5xG8RLgG17LwSWCKNEzYoVVM6KjoCPKc0,1079
+analyser_hj3415-2.5.4.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+analyser_hj3415-2.5.4.dist-info/METADATA,sha256=LPpOEpoEI5H-UDcJFU_qh07XnFrr910rvTxlBTT6yA0,6417
+analyser_hj3415-2.5.4.dist-info/RECORD,,

analyser_hj3415/settings.json

@@ -1 +0,0 @@
-{}