merge branch master into beta

j-faria · Jun 11, 2020 · c27b190 · c27b190
1 parent e45e844
commit c27b190
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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]