From 6346af8764a3d80a074689c94796a0c1baac936a Mon Sep 17 00:00:00 2001
From: James Hensman <james.hensman@gmail.com>
Date: Thu, 6 Feb 2014 09:28:27 +0000
Subject: [PATCH] assorted fixes

---
 GPy/core/gp.py                             | 1 -
 GPy/core/model.py                          | 6 ++----
 GPy/core/parameterization/array_core.py    | 3 ++-
 GPy/core/parameterization/parameterized.py | 7 ++++++-
 GPy/core/sparse_gp.py                      | 1 -
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/GPy/core/gp.py b/GPy/core/gp.py
index 57e9715a..ab725897 100644
--- a/GPy/core/gp.py
+++ b/GPy/core/gp.py
@@ -58,7 +58,6 @@ class GP(Model):
         self.parameters_changed()
 
     def parameters_changed(self):
-        print self.kern
         self.posterior, self._log_marginal_likelihood, grad_dict = self.inference_method.inference(self.kern, self.X, self.likelihood, self.Y)
         self._dL_dK = grad_dict['dL_dK']
 
diff --git a/GPy/core/model.py b/GPy/core/model.py
index dc108641..a1b2abe4 100644
--- a/GPy/core/model.py
+++ b/GPy/core/model.py
@@ -170,15 +170,13 @@ class Model(Parameterized):
         # first take care of all parameters (from N(0,1))
         #x = self._get_params_transformed()
         x = np.random.randn(self.size_transformed)
-        self._set_params_transformed(x)
+        x = self._untransform_params(x)
         # now draw from prior where possible
-        x = self._get_params()
-        if self.priors is not None:
+        if self.priors is not None and len(self.priors):
             [np.put(x, i, p.rvs(1)) for i, p in enumerate(self.priors) if not p is None]
         self._set_params(x)
         #self._set_params_transformed(self._get_params_transformed()) # makes sure all of the tied parameters get the same init (since there's only one prior object...)
 
-
     def optimize_restarts(self, num_restarts=10, robust=False, verbose=True, parallel=False, num_processes=None, **kwargs):
         """
         Perform random restarts of the model, and set the model to the best
diff --git a/GPy/core/parameterization/array_core.py b/GPy/core/parameterization/array_core.py
index 4e3c515d..12c68bb6 100644
--- a/GPy/core/parameterization/array_core.py
+++ b/GPy/core/parameterization/array_core.py
@@ -27,6 +27,7 @@ class ObservableArray(ListArray, Observable):
     """
     __array_priority__ = 0 # Never give back Param
     def __new__(cls, input_array):
+        cls.__name__ = "ObservableArray\n     "
         obj = super(ObservableArray, cls).__new__(cls, input_array).view(cls)
         obj._observers_ = {}
         return obj
@@ -48,4 +49,4 @@ class ObservableArray(ListArray, Observable):
     def __getslice__(self, start, stop):
         return self.__getitem__(slice(start, stop))
     def __setslice__(self, start, stop, val):
-        return self.__setitem__(slice(start, stop), val)  
\ No newline at end of file
+        return self.__setitem__(slice(start, stop), val)  
diff --git a/GPy/core/parameterization/parameterized.py b/GPy/core/parameterization/parameterized.py
index 7011f33d..8f5c9bf0 100644
--- a/GPy/core/parameterization/parameterized.py
+++ b/GPy/core/parameterization/parameterized.py
@@ -316,7 +316,10 @@ class Parameterized(Constrainable, Pickleable, Observable):
         return n
     def _get_params(self):
         # don't overwrite this anymore!
+        if not self.size:
+            return np.empty(shape=(0,), dtype=np.float64)
         return numpy.hstack([x._get_params() for x in self._parameters_ if x.size>0])
+
     def _set_params(self, params, update=True):
         # don't overwrite this anymore!
         [p._set_params(params[s], update=update) for p,s in itertools.izip(self._parameters_,self._param_slices_)]
@@ -330,10 +333,12 @@ class Parameterized(Constrainable, Pickleable, Observable):
         return p
     def _set_params_transformed(self, p):
         # inverse apply transformations for parameters and set the resulting parameters
+        self._set_params(self._untransform_params(p))
+    def _untransform_params(self, p):
         p = p.copy()
         if self._has_fixes(): tmp = self._get_params(); tmp[self._fixes_] = p; p = tmp; del tmp
         [numpy.put(p, ind, c.f(p[ind])) for c,ind in self.constraints.iteritems() if c != __fixed__]
-        self._set_params(p)
+        return p
     def _name_changed(self, param, old_name):
         if hasattr(self, old_name) and old_name in self._added_names_:
             delattr(self, old_name)
diff --git a/GPy/core/sparse_gp.py b/GPy/core/sparse_gp.py
index 193d9adf..fda201ff 100644
--- a/GPy/core/sparse_gp.py
+++ b/GPy/core/sparse_gp.py
@@ -43,7 +43,6 @@ class SparseGP(GP):
             print "defaulting to ", inference_method, "for latent function inference"
 
         self.Z = Param('inducing inputs', Z)
-
         self.num_inducing = Z.shape[0]
 
         if not (X_variance is None):