rearrange parameters for RandSample

Author: jlnav

libensemble/gen_funcs/persistent_gen_wrapper.py

@@ -1,6 +1,7 @@
 import inspect
-from libensemble.tools.persistent_support import PersistentSupport
+
 from libensemble.message_numbers import EVAL_GEN_TAG, FINISHED_PERSISTENT_GEN_TAG, PERSIS_STOP, STOP_TAG
+from libensemble.tools.persistent_support import PersistentSupport
 
 
 def persistent_gen_f(H, persis_info, gen_specs, libE_info):
@@ -12,7 +13,7 @@ def persistent_gen_f(H, persis_info, gen_specs, libE_info):
 
     generator = U["generator"]
     if inspect.isclass(generator):
-        gen = generator(H, persis_info, gen_specs, libE_info)
+        gen = generator(gen_specs, H, persis_info, libE_info)
     else:
         gen = generator
 

libensemble/gen_funcs/persistent_sampling.py

@@ -31,7 +31,7 @@ def _get_user_params(user_specs):
 
 
 class RandSample(Generator):
-    def __init__(self, _, persis_info, gen_specs, libE_info=None):
+    def __init__(self, gen_specs, _, persis_info, libE_info=None):
         # self.H = H
         self.persis_info = persis_info
         self.gen_specs = gen_specs
@@ -61,9 +61,6 @@ def _get_user_params(self, user_specs):
         assert isinstance(self.lb, np.ndarray), "lb must be a numpy array"
         assert isinstance(self.ub, np.ndarray), "ub must be a numpy array"
 
-    def final_tell(self, results):
-        pass
-
 
 @persistent_input_fields(["f", "x", "sim_id"])
 @output_data([("x", float, (2,))])