Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
A
alpha-mind
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dr.李
alpha-mind
Commits
255210f4
Commit
255210f4
authored
Sep 05, 2017
by
Dr.李
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed travis error
parent
096c4827
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
3 deletions
+19
-3
.travis.yml
.travis.yml
+1
-0
linearmodel.py
alphamind/model/linearmodel.py
+6
-1
loader.py
alphamind/model/loader.py
+12
-0
modelbase.py
alphamind/model/modelbase.py
+0
-2
No files found.
.travis.yml
View file @
255210f4
...
...
@@ -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
...
...
alphamind/model/linearmodel.py
View file @
255210f4
...
...
@@ -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
],
...
...
alphamind/model/loader.py
0 → 100644
View file @
255210f4
# -*- 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
alphamind/model/modelbase.py
View file @
255210f4
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment