[pred_var] added predictive variable as property now

This commit is contained in:
Max Zwiessele 2015-09-10 15:50:49 +01:00
parent 9ddbaa9a7c
commit 19906edf7d
4 changed files with 6 additions and 5 deletions

View file

@ -117,8 +117,10 @@ class GP(Model):
# K_{xx} - K_{xp}W_{pp}^{-1}K_{px} # K_{xx} - K_{xp}W_{pp}^{-1}K_{px}
# W_{pp} := \texttt{Woodbury inv} # W_{pp} := \texttt{Woodbury inv}
# p := _predictive_variable # p := _predictive_variable
self._predictive_variable = self.X
@property
def _predictive_variable(self):
return self.X
def set_XY(self, X=None, Y=None): def set_XY(self, X=None, Y=None):
""" """
@ -154,7 +156,6 @@ class GP(Model):
self.link_parameter(self.X) self.link_parameter(self.X)
else: else:
self.X = ObsAr(X) self.X = ObsAr(X)
self._predictive_variable = self.X
self.update_model(True) self.update_model(True)
def set_X(self,X): def set_X(self,X):

View file

@ -59,8 +59,10 @@ class SparseGP(GP):
logger.info("Adding Z as parameter") logger.info("Adding Z as parameter")
self.link_parameter(self.Z, index=0) self.link_parameter(self.Z, index=0)
self.posterior = None self.posterior = None
self._predictive_variable = self.Z
@property
def _predictive_variable(self):
return self.Z
def has_uncertain_inputs(self): def has_uncertain_inputs(self):
return isinstance(self.X, VariationalPosterior) return isinstance(self.X, VariationalPosterior)

View file

@ -39,7 +39,6 @@ class GPLVM(GP):
self.X = Param('latent_mean', X) self.X = Param('latent_mean', X)
self.link_parameter(self.X, index=0) self.link_parameter(self.X, index=0)
self._predictive_variable = self.X
def parameters_changed(self): def parameters_changed(self):
super(GPLVM, self).parameters_changed() super(GPLVM, self).parameters_changed()

View file

@ -76,7 +76,6 @@ class SparseGPMiniBatch(SparseGP):
logger.info("Adding Z as parameter") logger.info("Adding Z as parameter")
self.link_parameter(self.Z, index=0) self.link_parameter(self.Z, index=0)
self.posterior = None self.posterior = None
self._predictive_variable = self.Z
def has_uncertain_inputs(self): def has_uncertain_inputs(self):
return isinstance(self.X, VariationalPosterior) return isinstance(self.X, VariationalPosterior)