diff --git a/GPy/core/__init__.py b/GPy/core/__init__.py index fb40a9e0..a0ee51da 100644 --- a/GPy/core/__init__.py +++ b/GPy/core/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012, GPy authors (see AUTHORS.txt). +# Copyright (c) 2012-2014, GPy authors (see AUTHORS.txt). # Licensed under the BSD 3-clause license (see LICENSE.txt) from model import * diff --git a/GPy/core/gp.py b/GPy/core/gp.py index 5c69d92b..25066381 100644 --- a/GPy/core/gp.py +++ b/GPy/core/gp.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012, GPy authors (see AUTHORS.txt). +# Copyright (c) 2012-2014, GPy authors (see AUTHORS.txt). # Licensed under the BSD 3-clause license (see LICENSE.txt) import numpy as np diff --git a/GPy/core/mapping.py b/GPy/core/mapping.py index 049f1699..111fec6f 100644 --- a/GPy/core/mapping.py +++ b/GPy/core/mapping.py @@ -1,4 +1,4 @@ -# Copyright (c) 2013, GPy authors (see AUTHORS.txt). +# Copyright (c) 2013,2014, GPy authors (see AUTHORS.txt). # Licensed under the BSD 3-clause license (see LICENSE.txt) import sys diff --git a/GPy/core/model.py b/GPy/core/model.py index ac5a9732..2cdecdf9 100644 --- a/GPy/core/model.py +++ b/GPy/core/model.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012, 2013, GPy authors (see AUTHORS.txt). +# Copyright (c) 2012-2014, GPy authors (see AUTHORS.txt). # Licensed under the BSD 3-clause license (see LICENSE.txt) diff --git a/GPy/core/sparse_gp.py b/GPy/core/sparse_gp.py index 73c80c76..beb69138 100644 --- a/GPy/core/sparse_gp.py +++ b/GPy/core/sparse_gp.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012, GPy authors (see AUTHORS.txt). +# Copyright (c) 2012-2014, GPy authors (see AUTHORS.txt). # Licensed under the BSD 3-clause license (see LICENSE.txt) import numpy as np diff --git a/GPy/core/sparse_gp_mpi.py b/GPy/core/sparse_gp_mpi.py index e8779f51..15d3ad76 100644 --- a/GPy/core/sparse_gp_mpi.py +++ b/GPy/core/sparse_gp_mpi.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012, GPy authors (see AUTHORS.txt). +# Copyright (c) 2012-2014, GPy authors (see AUTHORS.txt). # Licensed under the BSD 3-clause license (see LICENSE.txt) import numpy as np diff --git a/GPy/core/symbolic.py b/GPy/core/symbolic.py index 24623f91..ed3a9d59 100644 --- a/GPy/core/symbolic.py +++ b/GPy/core/symbolic.py @@ -11,8 +11,8 @@ from sympy.utilities.lambdify import lambdastr, _imp_namespace, _get_namespace from sympy.utilities.iterables import numbered_symbols import scipy import GPy -#from scipy.special import gammaln, gamma, erf, erfc, erfcx, polygamma -#@NDL you removed this file! #from GPy.util.symbolic import normcdf, normcdfln, logistic, logisticln, erfcx, erfc, gammaln + + def getFromDict(dataDict, mapList): return reduce(lambda d, k: d[k], mapList, dataDict)