Commit 3847e6ea authored by Mario Teixeira Parente's avatar Mario Teixeira Parente
Browse files

approaches/ariane: change order of parameters

parent 4f82cc88
...@@ -20,6 +20,10 @@ class ARIANEApproach(TASAutonomousApproach): ...@@ -20,6 +20,10 @@ class ARIANEApproach(TASAutonomousApproach):
self.thread_server = Thread(target=self._run_ariane_server, daemon=True) self.thread_server = Thread(target=self._run_ariane_server, daemon=True)
self.thread_server_started = False self.thread_server_started = False
self.level_backgr_diffs_rel_max = 0.5
self.level_backgr_diffs_abs_min = 10
self.level_backgr_decile_max = 6
self.thresh_intens_fact = 0.5
self.num_kernel_optim_restarts = 100 self.num_kernel_optim_restarts = 100
self.kernel_bounds_variance = [1e-3, 1e2] self.kernel_bounds_variance = [1e-3, 1e2]
self.kernel_bounds_length_scales = [1e-3, 1e2] self.kernel_bounds_length_scales = [1e-3, 1e2]
...@@ -29,10 +33,6 @@ class ARIANEApproach(TASAutonomousApproach): ...@@ -29,10 +33,6 @@ class ARIANEApproach(TASAutonomousApproach):
self.kernel_optims_stop_eps = 0.025 self.kernel_optims_stop_eps = 0.025
self.length_scales_min_fact = 1e-3 self.length_scales_min_fact = 1e-3
self.length_scales_max_fact = 1. self.length_scales_max_fact = 1.
self.level_backgr_decile_max = 6
self.level_backgr_diffs_rel_max = 0.5
self.level_backgr_diffs_abs_min = 10
self.thresh_intens_fact = 0.5
self.num_rows_cols_grid_init = 11 self.num_rows_cols_grid_init = 11
self.radius_cons_area = 0.025 self.radius_cons_area = 0.025
...@@ -68,7 +68,11 @@ class ARIANEApproach(TASAutonomousApproach): ...@@ -68,7 +68,11 @@ class ARIANEApproach(TASAutonomousApproach):
self.client.finalize() self.client.finalize()
def _run_ariane_server(self): def _run_ariane_server(self):
run_ariane_server(num_kernel_optim_restarts=self.num_kernel_optim_restarts, run_ariane_server(level_backgr_diffs_rel_max=self.level_backgr_diffs_rel_max,
level_backgr_diffs_abs_min=self.level_backgr_diffs_abs_min,
level_backgr_decile_max=self.level_backgr_decile_max,
thresh_intens_fact=self.thresh_intens_fact,
num_kernel_optim_restarts=self.num_kernel_optim_restarts,
kernel_bounds_variance=self.kernel_bounds_variance, kernel_bounds_variance=self.kernel_bounds_variance,
kernel_bounds_length_scales=self.kernel_bounds_length_scales, kernel_bounds_length_scales=self.kernel_bounds_length_scales,
num_kernel_optims_min=self.num_kernel_optims_min, num_kernel_optims_min=self.num_kernel_optims_min,
...@@ -77,9 +81,5 @@ class ARIANEApproach(TASAutonomousApproach): ...@@ -77,9 +81,5 @@ class ARIANEApproach(TASAutonomousApproach):
kernel_optims_stop_eps=self.kernel_optims_stop_eps, kernel_optims_stop_eps=self.kernel_optims_stop_eps,
length_scales_min_fact=self.length_scales_min_fact, length_scales_min_fact=self.length_scales_min_fact,
length_scales_max_fact=self.length_scales_max_fact, length_scales_max_fact=self.length_scales_max_fact,
level_backgr_decile_max=self.level_backgr_decile_max,
level_backgr_diffs_rel_max=self.level_backgr_diffs_rel_max,
level_backgr_diffs_abs_min=self.level_backgr_diffs_abs_min,
thresh_intens_fact=self.thresh_intens_fact,
random_seed=self.id, random_seed=self.id,
port=self.port) port=self.port)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment