adjust ARIANE imports

tas/approaches/_ariane.py

@@ -4,8 +4,8 @@ from lib.general.benchmarking import CostMeasure
 from lib.tas.benchmarking import AngleMapInducedMetric, TASAutonomousApproach, \
     TASTestCase
 
-from ariane.app.tas.server_gpr import run as run_server
-from ariane.app.tas.client_stub import ClientStubTAS
+from ariane.app.tas import TASClientStub
+from ariane.app.tas.servers import run_gpr_server as run_ariane_server
 
 from threading import Thread
 from time import sleep
@@ -48,7 +48,7 @@ class ARIANEApproach(TASAutonomousApproach):
 
         scenario_name = f"{test_case.name}_{self.id}"
 
-        self.client = ClientStubTAS(intensity_function=test_case.intensity_function,
+        self.client = TASClientStub(intensity_function=test_case.intensity_function,
                                     scenario_name=scenario_name, axes=test_case.axes,
                                     offset=test_case.offset, limits=test_case.limits,
                                     metric=lambda x1, x2: metric((x1,), (x2,)),
@@ -70,20 +70,20 @@ class ARIANEApproach(TASAutonomousApproach):
         self.client.finalize()
 
     def _run_ariane_server(self):
-        run_server(num_kernel_optim_restarts=self.num_kernel_optim_restarts,
-                   kernel_bounds_variance=self.kernel_bounds_variance,
-                   kernel_bounds_length_scales=self.kernel_bounds_length_scales,
-                   num_kernel_optims_min=self.num_kernel_optims_min,
-                   num_kernel_optims_max=self.num_kernel_optims_max,
-                   kernel_optims_stop_num_last=self.kernel_optims_stop_num_last,
-                   kernel_optims_stop_eps=self.kernel_optims_stop_eps,
-                   length_scales_min_fact=self.length_scales_min_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_diffs_rel_diffs_abs_max=self.thresh_intens_diffs_rel_diffs_abs_max,
-                   thresh_intens_fact_min=self.thresh_intens_fact_min,
-                   thresh_intens_fact_max=self.thresh_intens_fact_max,
-                   random_state=self.random_state,
-                   port=self.port)
+        run_ariane_server(num_kernel_optim_restarts=self.num_kernel_optim_restarts,
+                          kernel_bounds_variance=self.kernel_bounds_variance,
+                          kernel_bounds_length_scales=self.kernel_bounds_length_scales,
+                          num_kernel_optims_min=self.num_kernel_optims_min,
+                          num_kernel_optims_max=self.num_kernel_optims_max,
+                          kernel_optims_stop_num_last=self.kernel_optims_stop_num_last,
+                          kernel_optims_stop_eps=self.kernel_optims_stop_eps,
+                          length_scales_min_fact=self.length_scales_min_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_diffs_rel_diffs_abs_max=self.thresh_intens_diffs_rel_diffs_abs_max,
+                          thresh_intens_fact_min=self.thresh_intens_fact_min,
+                          thresh_intens_fact_max=self.thresh_intens_fact_max,
+                          random_state=self.random_state,
+                          port=self.port)