From 20eff02061d405f7abf348670e67948a0f451c86 Mon Sep 17 00:00:00 2001 From: Max Zwiessele Date: Tue, 13 Jan 2015 13:46:49 +0000 Subject: [PATCH] [objective grads] undid the change, as this would lead to dramatic problems in reloading old models using the pickle module --- GPy/core/model.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GPy/core/model.py b/GPy/core/model.py index 017864b0..107ecf85 100644 --- a/GPy/core/model.py +++ b/GPy/core/model.py @@ -154,7 +154,7 @@ class Model(Parameterized): """ return -(self._log_likelihood_gradients() + self._log_prior_gradients()) - def _objective_grads(self, x): + def _grads(self, x): """ Gets the gradients from the likelihood and the priors. @@ -200,7 +200,7 @@ class Model(Parameterized): return np.inf return obj - def _objective_and_grads(self, x): + def _objective_grads(self, x): try: self.optimizer_array = x obj_f, self.obj_grads = self.objective_function(), self._transform_gradients(self.objective_function_gradients())