Commit c886f704 authored by 李煜's avatar 李煜

modify all_factor_cal

parent 8de03115
......@@ -531,7 +531,7 @@ def cash_flow_calculate(trade_date):
def constrain_calculate(trade_date):
# cash flow
# constrain
balance_sets, ttm_factors_sets = get_basic_constrain(trade_date)
if len(balance_sets) <= 0 or len(ttm_factors_sets) <= 0:
print("%s has no data" % trade_date)
......@@ -548,7 +548,7 @@ def constrain_calculate(trade_date):
def growth_calculate(trade_date):
# cash flow
# growth
ttm_factor_sets, balance_sets = get_basic_growth_data(trade_date)
growth_sets = pd.merge(ttm_factor_sets, balance_sets, on='symbol')
if len(growth_sets) <= 0:
......@@ -564,7 +564,7 @@ def growth_calculate(trade_date):
def earning_calculate(trade_date):
# cash flow
# earring
tp_earning, ttm_earning_5y, ttm_earning = get_basic_earning(trade_date)
if len(tp_earning) <= 0 or len(ttm_earning_5y) <= 0 or len(ttm_earning) <= 0:
print("%s has no data" % trade_date)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment