Commit 5517da1a authored by Dr.李's avatar Dr.李

update

parent 382d8a97
include MANIFEST.in
include .coveragerc
\ No newline at end of file
include .coveragerc
recursive-include libs/include *.*
recursive-include libs/lib/linux *.*
\ No newline at end of file
......@@ -139,14 +139,17 @@ class SqlEngine(object):
query = select([FactorMaster.factor, FactorMaster.source]).where(FactorMaster.factor.in_(factors))
results = self.engine.execute(query).fetchall()
all_factors = {r[0].strip(): r[1].strip() for r in results}
return ','.join(all_factors[k] + '.' + k for k in all_factors)
if all_factors:
return ','.join(all_factors[k] + '.' + k for k in all_factors) + ','
else:
return ''
factor_str = mapping_factors(factors)
total_risk_factors = list(set(risk_styles + industry_styles).difference(factors))
if total_risk_factors:
risk_str = ',' + ','.join('risk_exposure.' + f for f in total_risk_factors)
risk_str = ','.join('risk_exposure.' + f for f in total_risk_factors)
else:
risk_str = ''
......
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