Minor merges.

This commit is contained in:
Neil Lawrence 2014-02-24 21:20:00 +00:00
commit 8c5fe76bb1
51 changed files with 1342 additions and 2752 deletions

View file

@ -1,12 +1,11 @@
from _src.rbf import RBF
from _src.white import White
from _src.kern import Kern
from _src.rbf import RBF
from _src.linear import Linear
from _src.static import Bias, White
from _src.brownian import Brownian
from _src.stationary import Exponential, Matern32, Matern52, ExpQuad
from _src.sympykern import Sympykern
#from _src.kern import kern_test
from _src.bias import Bias
#import coregionalize
#import exponential
#import eq_ode1
@ -34,3 +33,10 @@ from _src.bias import Bias
#import spline
#import symmetric
#import white
=======
from _src.stationary import Exponential, Matern32, Matern52, ExpQuad, RatQuad, Cosine
from _src.mlp import MLP
from _src.periodic import PeriodicExponential, PeriodicMatern32, PeriodicMatern52
from _src.independent_outputs import IndependentOutputs, Hierarchical
from _src.coregionalize import Coregionalize
>>>>>>> da4686dd3c8db8639b0c3c6e30609d0b3fa59130