moreo
/
QuaPy
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

switchign

This commit is contained in:
Alejandro Moreo Fernandez 2024-09-27 16:25:05 +02:00
parent 3686e820fe
commit cdf0200430
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
KDEy/kdey_devel.py
View File

@ -326,7 +326,7 @@ class KDEyMLauto2(KDEyML):
if self.target == 'likelihood': if self.target == 'likelihood':
loss_fn = neg_loglikelihood_prev loss_fn = neg_loglikelihood_prev
else: else:
loss_fn = lambda prev_hat: qp.error.from_name(self.target)(prev, prev_hat) loss_fn = lambda prev_hat: qp.error.from_name(self.target)(prevtrue, prev_hat)
pred_prev, neglikelihood = optim_minimize(loss_fn, init_prev, return_loss=True) pred_prev, neglikelihood = optim_minimize(loss_fn, init_prev, return_loss=True)
loss_accum += neglikelihood loss_accum += neglikelihood

4
KDEy/quantification_evaluation.py
View File

@ -43,7 +43,7 @@ METHODS = [
('KDEy-AE', KDEyMLauto2(newLR(), bandwidth='auto', target='mae', search='grid'), wrap_hyper(logreg_grid)), ('KDEy-AE', KDEyMLauto2(newLR(), bandwidth='auto', target='mae', search='grid'), wrap_hyper(logreg_grid)),
('KDEy-AE+', KDEyMLauto2(newLR(), bandwidth='auto', target='mae', search='optim'), wrap_hyper(logreg_grid)), ('KDEy-AE+', KDEyMLauto2(newLR(), bandwidth='auto', target='mae', search='optim'), wrap_hyper(logreg_grid)),
('KDEy-RAE', KDEyMLauto2(newLR(), bandwidth='auto', target='mrae', search='grid'), wrap_hyper(logreg_grid)), ('KDEy-RAE', KDEyMLauto2(newLR(), bandwidth='auto', target='mrae', search='grid'), wrap_hyper(logreg_grid)),
('KDEy-RAE', KDEyMLauto2(newLR(), bandwidth='auto', target='mrae', search='optim'), wrap_hyper(logreg_grid)), ('KDEy-RAE+', KDEyMLauto2(newLR(), bandwidth='auto', target='mrae', search='optim'), wrap_hyper(logreg_grid)),
] ]
@ -167,4 +167,4 @@ if __name__ == '__main__':
for method_name, quantifier, param_grid in METHODS + TRANSDUCTIVE_METHODS: for method_name, quantifier, param_grid in METHODS + TRANSDUCTIVE_METHODS:
run_experiment(method_name, quantifier, param_grid) run_experiment(method_name, quantifier, param_grid)
show_results(global_result_path) show_results(global_result_path)