From c27b190605490d090c189e0db13855ebc8484037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Faria?= Date: Thu, 11 Jun 2020 13:00:14 +0100 Subject: [PATCH] merge branch master into beta --- pykima/display.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pykima/display.py b/pykima/display.py index 0c4a30c6..67a7d1db 100644 --- a/pykima/display.py +++ b/pykima/display.py @@ -283,17 +283,12 @@ def __init__(self, options, data_file=None, save_plots=False, print('GP model:', self.GPmodel) if self.GPmodel: -<<<<<<< HEAD if self.GPkernel == 0: n_hyperparameters = 4 elif self.GPkernel == 1: n_hyperparameters = 3 start_hyperpars = start_parameters + n_trend + n_offsets + n_inst_offsets + 1 -======= - n_hyperparameters = 4 - start_hyperpars = start_parameters + n_trend + n_offsets + n_inst_offsets + n_act_ind + 1 ->>>>>>> master self.etas = self.posterior_sample[:, start_hyperpars: start_hyperpars + n_hyperparameters]