Commit 255210f4 authored by Dr.李's avatar Dr.李

fixed travis error

parent 096c4827
......@@ -38,6 +38,7 @@ install:
- conda install pandas
- conda install scikit-learn
- conda install cython
- conda install -c conda-forge arrow
- pip install cvxopt
- pip install cvxpy
- pip install simpleutils
......
......@@ -7,6 +7,7 @@ Created on 2017-5-10
import pickle
import numpy as np
import arrow
from distutils.version import LooseVersion
from sklearn import __version__ as sklearn_version
from sklearn.linear_model import LinearRegression as LinearRegressionImpl
......@@ -51,9 +52,11 @@ class LinearRegression(ModelBase):
def __init__(self, features: list=None, fit_intercept: bool=False):
super().__init__(features)
self.impl = LinearRegressionImpl(fit_intercept=fit_intercept)
self.trained_time = None
def fit(self, x: np.ndarray, y: np.ndarray):
self.impl.fit(x, y)
self.trained_time = arrow.now().format()
def predict(self, x: np.ndarray) -> np.ndarray:
return self.impl.predict(x)
......@@ -63,6 +66,7 @@ class LinearRegression(ModelBase):
model_desc['internal_model'] = self.impl.__class__.__module__ + "." + self.impl.__class__.__name__,
model_desc['desc'] = pickle.dumps(self.impl)
model_desc['sklearn_version'] = sklearn_version
model_desc['trained_time'] = self.trained_time
return model_desc
def score(self) -> float:
......@@ -72,6 +76,7 @@ class LinearRegression(ModelBase):
def load(cls, model_desc: dict):
obj_layout = cls()
obj_layout.features = model_desc['features']
obj_layout.trained_time = model_desc['trained_time']
if LooseVersion(sklearn_version) < LooseVersion(model_desc['sklearn_version']):
alpha_logger.warning('Current sklearn version {0} is lower than the model version {1}. '
......@@ -85,7 +90,7 @@ class LinearRegression(ModelBase):
if __name__ == '__main__':
import pprint
ls = ConstLinearModel(np.array(['a', 'b']), np.array([0.5, 0.5]))
ls = ConstLinearModel(['a', 'b'], np.array([0.5, 0.5]))
x = np.array([[0.2, 0.2],
[0.1, 0.1],
......
# -*- coding: utf-8 -*-
"""
Created on 2017-9-5
@author: cheng.li
"""
from alphamind.model.modelbase import ModelBase
def load_model(model_desc: dict) -> ModelBase:
pass
......@@ -6,7 +6,6 @@ Created on 2017-9-4
"""
import abc
import arrow
import numpy as np
from alphamind.utilities import alpha_logger
......@@ -33,7 +32,6 @@ class ModelBase(metaclass=abc.ABCMeta):
model_desc = dict(model_name=self.__class__.__module__ + "." + self.__class__.__name__,
language='python',
timestamp=arrow.now().format(),
features=list(self.features))
return model_desc
......
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