cleanup reset functions in both samplers

also i don't explicitely reset in sample_initial in dynamic_sampler
that recipe for bugs

Author: segasai

py/dynesty/dynamicsampler.py

@@ -716,7 +716,7 @@ def __init__(self,
                                                     bound_bootstrap)
 
         # TODO FIX
-        # self.cite = self.kwargs.get('cite')
+        self.cite = cite
 
         # random state
         self.rstate = rstate
@@ -835,17 +835,25 @@ def reset(self):
         """Re-initialize the sampler."""
 
         # sampling
-        self.it = 1
-        self.batch = 0
-        self.ncall = 0
-        self.bound_list = []
-        self.eff = 1.
-        self.base = False
-
-        self.saved_run = RunRecord(dynamic=True)
-        self.base_run = RunRecord(dynamic=True)
-        self.new_run = None
-        self.new_logl_min, self.new_logl_max = -np.inf, np.inf
+        DynamicSampler.__init__(
+            self,
+            self.loglikelihood,
+            self.prior_transform,
+            self.ndim,
+            self.sampling,
+            self.bounding,
+            nlive0=self.nlive0,
+            ncdim=self.ncdim,
+            rstate=self.rstate,
+            pool=self.pool,
+            use_pool=self.use_pool,
+            queue_size=self.queue_size,
+            bound_update_interval_ratio=self.bound_update_interval_ratio,
+            first_bound_update=self.first_bound_update,
+            bound_bootstrap=self.bound_bootstrap,
+            bound_enlarge=self.bound_enlarge,
+            blob=self.blob,
+            cite=self.cite)
 
     @property
     def results(self):
@@ -1042,9 +1050,6 @@ def sample_initial(self,
             warnings.warn("Beware: `nlive_init <= 2 * ndim`!")
 
         if not resume:
-            # Reset saved results to avoid any possible conflicts.
-            self.reset()
-
             (self.live_u, self.live_v, self.live_logl,
              blobs), logvol_init, init_ncalls = _initialize_live_points(
                  live_points,

py/dynesty/sampler.py

@@ -270,7 +270,8 @@ class Sampler:
 
     live_points : list of 3 or 4 `~numpy.ndarray`
         Each with shape (nlive, ndim) for the first three arrays.
-        If `blob=True`, a fourth array of blobs (arbitrary shape) may be included.
+        If `blob=True`, a fourth array of blobs (arbitrary shape) may be
+        included.
 
     sampling : {`'unif'`, `'rwalk'`, `'slice'`, `'rslice'`}
         Sampling Method used to sample uniformly within the likelihood
@@ -390,6 +391,7 @@ def __init__(self,
 
         # bounding updates
         self.bound_update_interval = bound_update_interval
+        self.first_bound_update = first_bound_update
         self.first_bound_update_ncall = first_bound_update.get(
             'min_ncall', 2 * self.nlive)
         self.first_bound_update_eff = first_bound_update.get('min_eff', 10.)
@@ -512,41 +514,36 @@ def __getstate__(self):
     def reset(self):
         """Re-initialize the sampler."""
 
-        (self.live_u, self.live_v, self.live_logl,
-         self.live_blobs), logvol_init, init_ncalls = _initialize_live_points(
-             None,
-             self.prior_transform,
-             self.loglikelihood,
-             self.mapper,
-             nlive=self.nlive,
-             ndim=self.ndim,
-             rstate=self.rstate,
-             blob=self.blob,
-             use_pool_ptform=self.use_pool_ptform)
-        self.logvol_init = logvol_init
-        self.live_bound = np.zeros(self.nlive, dtype=int)
-        self.live_it = np.zeros(self.nlive, dtype=int)
-
-        # parallelism
-        self.queue = []
-        self.nqueue = 0
-
-        # sampling
-        self.it = 1
-        self.ncall = init_ncalls
-        self.bound = UnitCube(self.ncdim)
-        self.bound_list = [self.bound]
-        self.internal_sampler = UnitCubeSampler(ndim=self.ndim)
-        self.nbound = 1
-        self.unit_cube_sampling = True
-        self.added_live = False
-
-        self.plateau_mode = False
-        self.plateau_counter = None
-        self.plateau_logdvol = None
-
-        # results
-        self.saved_run = RunRecord()
+        # (self.live_u, self.live_v, self.live_logl, self.live_blobs)
+        live_points, logvol_init, init_ncalls = _initialize_live_points(
+            None,
+            self.prior_transform,
+            self.loglikelihood,
+            self.mapper,
+            nlive=self.nlive,
+            ndim=self.ndim,
+            rstate=self.rstate,
+            blob=self.blob,
+            use_pool_ptform=self.use_pool_ptform)
+
+        self.__init__(self.loglikelihood,
+                      self.prior_transform,
+                      self.ndim,
+                      live_points,
+                      self.sampling,
+                      self.bounding,
+                      ncdim=self.ncdim,
+                      rstate=self.rstate,
+                      pool=self.pool,
+                      use_pool=self.use_pool,
+                      queue_size=self.queue_size,
+                      bound_update_interval=self.bound_update_interval,
+                      first_bound_update=self.first_bound_update,
+                      bound_bootstrap=self.bound_bootstrap,
+                      bound_enlarge=self.bound_enlarge,
+                      blob=self.blob,
+                      cite=self.cite,
+                      logvol_init=logvol_init)
 
     @property
     def results(self):
@@ -1259,7 +1256,6 @@ def run_nested(self,
             saved in the end of the run irrespective of checkpoint_every.
         """
 
-
         # Define our stopping criteria.
         if dlogz is None:
             if add_live: