improve inducing demo settings

GiovanniPasserello · May 28, 2021 · d729a2a · d729a2a
1 parent ef9cff5
commit d729a2a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/shgp/inducing/demos/demo_inducing_selection_hgpr.py b/shgp/inducing/demos/demo_inducing_selection_hgpr.py
@@ -27,7 +27,7 @@
  # Uniform subsampling with gradient-based optimisation
  likelihood1 = HeteroscedasticPolynomial(degree=2)
  kernel1 = gpflow.kernels.SquaredExponential()
- inducing_vars1, induing_idx1 = uniform_subsample(X, num_inducing)
+ inducing_vars1 = uniform_subsample(X, num_inducing)
  model1 = HGPR((X, Y), kernel=kernel1, inducing_variable=inducing_vars1, likelihood=likelihood1)
  gpflow.optimizers.Scipy().minimize(model1.training_loss, variables=model1.trainable_variables)
  mu1, var1 = model1.predict_f(xx)

diff --git a/shgp/inducing/demos/demo_inducing_selection_pgpr_1D.py b/shgp/inducing/demos/demo_inducing_selection_pgpr_1D.py
@@ -5,7 +5,7 @@
 
 from shgp.data.dataset import PlatformDataset
 from shgp.data.metadata_reinit import ReinitMetaDataset
-from shgp.inducing.initialisation_methods import h_reinitialise_PGPR, uniform_subsample
+from shgp.inducing.initialisation_methods import h_reinitialise_PGPR, k_means
 from shgp.utilities.general import invlink
 from shgp.utilities.train_pgpr import train_pgpr
 
@@ -20,20 +20,20 @@ def inducing_demo():
  model1, elbo1 = train_pgpr(
  X, Y,
  inner_iters, opt_iters, ci_iters,
- kernel_type=gpflow.kernels.Matern52,
+ kernel_type=gpflow.kernels.SquaredExponential,
  M=num_inducing,
- init_method=uniform_subsample,
+ init_method=k_means,
  optimise_Z=True
  )
 
  # Heteroscedastic greedy variance selection
  model2, _ = train_pgpr(
  X, Y,
  inner_iters, opt_iters, ci_iters,
- kernel_type=gpflow.kernels.Matern52,
+ kernel_type=gpflow.kernels.SquaredExponential,
  M=num_inducing,
  init_method=h_reinitialise_PGPR,
- reinit_metadata=ReinitMetaDataset(10, 1e-1)
+ reinit_metadata=ReinitMetaDataset()
  )
  elbo2 = model2.elbo()
 

diff --git a/shgp/inducing/demos/demo_inducing_selection_pgpr_2D.py b/shgp/inducing/demos/demo_inducing_selection_pgpr_2D.py
@@ -38,7 +38,7 @@ def inducing_demo():
  inner_iters, opt_iters, ci_iters,
  M=num_inducing,
  init_method=h_reinitialise_PGPR,
- reinit_metadata=ReinitMetaDataset(10, 1e-6)
+ reinit_metadata=ReinitMetaDataset()
  )
  elbo2 = model2.elbo()