Merge pull request #15 from alpha-miner/master

merge update

alphamind/data/engines/universe.py

@@ -60,7 +60,7 @@ class BaseUniverse(metaclass=abc.ABCMeta):
 class Universe(BaseUniverse):
 
     def __init__(self, u_name: str):
-        self.u_name = u_name
+        self.u_name = u_name.lower()
 
     def condition(self):
         return getattr(UniverseTable, self.u_name) == 1

alphamind/model/composer.py

@@ -15,6 +15,7 @@ from alphamind.model.modelbase import ModelBase
 from alphamind.model.data_preparing import fetch_train_phase
 from alphamind.model.data_preparing import fetch_predict_phase
 from alphamind.data.engines.universe import Universe
+from alphamind.data.engines.universe import load_universe
 from alphamind.data.engines.sqlengine import SqlEngine
 from alphamind.data.winsorize import winsorize_normal
 from alphamind.data.rank import rank
@@ -85,7 +86,7 @@ class DataMeta(object):
     @classmethod
     def load(cls, data_desc: dict):
         freq = data_desc['freq']
-        universe = Universe.load(data_desc['universe'])
+        universe =load_universe(data_desc['universe'])
         batch = data_desc['batch']
         neutralized_risk = data_desc['neutralized_risk']
         risk_model = data_desc['risk_model']

pfopt @ 299865f2

-Subproject commit 40976afd3ea03b921177cef364fa8a6b37bf4dda
+Subproject commit 299865f2a9a80213c844fab849d1eb0a002246ce