Skip to content

Commit 1b2f8a7

Browse files
committed
Correct print results
1 parent e926ed7 commit 1b2f8a7

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

pyLIMA/fits/DREAM_fit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ def fit(self, initial_population=[], computational_pool=None):
292292

293293
indexes = [(loop_population[i], parents1[i], parents2[i], parents3[i]) for i
294294
in range(len(loop_population))]
295-
295+
#breakpoint()
296296
if computational_pool is not None:
297297
# breakpoint()
298298

pyLIMA/fits/ML_fit.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,9 @@ def define_priors_parameters(self):
260260

261261
self.priors_parameters = fit_parameters
262262

263+
264+
265+
263266
def define_priors(self):
264267

265268
self.priors = parameters_priors.default_parameters_priors(
@@ -1343,8 +1346,15 @@ def fit_outputs(self, bokeh_plot=None, bokeh_plot_name=None,
13431346
def print_fit_results(self):
13441347

13451348
import pprint
1349+
import collections
1350+
1351+
params = collections.OrderedDict(zip(self.priors_parameters.keys(),self.fit_results['best_model']))
13461352

1347-
params = self.model.compute_pyLIMA_parameters(self.fit_results['best_model'])
13481353
params[self.loss_function] = self.fit_results[self.loss_function]
1354+
1355+
#if self.rescale_photometry:
1356+
# names = self.fit_parameters.keys()[
1357+
## self.rescale_photometry_parameters_index]
1358+
## params[self.rescale_photometry_parameters_index] = 0
13491359
print('best model:')
1350-
pprint.pprint(params)
1360+
pprint.pprint(params,sort_dicts=False )

0 commit comments

Comments
 (0)