Commit 189f5447 authored by 李煜's avatar 李煜

rm bk file

parent c886f704
...@@ -117,7 +117,7 @@ class FactorScaleValue(FactorBase): ...@@ -117,7 +117,7 @@ class FactorScaleValue(FactorBase):
return valuation_sets, ttm_factor_sets, income_sets, balance_set return valuation_sets, ttm_factor_sets, income_sets, balance_set
def prepaer_calculate(self, trade_date): def prepare_calculate(self, trade_date):
valuation_sets, ttm_factor_sets, income_sets, balance_set = self.get_basic_data(trade_date) valuation_sets, ttm_factor_sets, income_sets, balance_set = self.get_basic_data(trade_date)
# valuation_sets = pd.merge(valuation_sets, income_sets, on='symbol') # valuation_sets = pd.merge(valuation_sets, income_sets, on='symbol')
valuation_sets = pd.merge(valuation_sets, ttm_factor_sets, on='symbol') valuation_sets = pd.merge(valuation_sets, ttm_factor_sets, on='symbol')
...@@ -136,7 +136,7 @@ class FactorScaleValue(FactorBase): ...@@ -136,7 +136,7 @@ class FactorScaleValue(FactorBase):
trade_date_sets = self._trade_date.trade_date_sets_ago(start_date, end_date, count) trade_date_sets = self._trade_date.trade_date_sets_ago(start_date, end_date, count)
for trade_date in trade_date_sets: for trade_date in trade_date_sets:
print('因子计算日期: %s' % trade_date) print('因子计算日期: %s' % trade_date)
self.prepaer_calculate(trade_date) self.prepare_calculate(trade_date)
print('----->') print('----->')
......
This diff is collapsed.
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