Unify sampler initialisation

Also there was bug fix in the boundary isinstance check, and change how blob is propagated to samplers

Author: segasai

py/dynesty/dynamicsampler.py

@@ -683,22 +683,23 @@ def __init__(self,
                  ndim,
                  sampling,
                  bounding,
-                 ncdim=None,
                  nlive0=None,
-                 kwargs=None,
-                 queue_size=None,
+                 ncdim=None,
+                 rstate=None,
                  pool=None,
                  use_pool=None,
-                 rstate=None,
+                 queue_size=None,
                  bound_update_interval_ratio=None,
-                 first_bound_update=None):
+                 first_bound_update=None,
+                 kwargs=None,
+                 blob=None):
 
         # distributions
         self.loglikelihood = loglikelihood
         self.prior_transform = prior_transform
         self.ndim = ndim
         self.ncdim = ncdim
-        self.blob = kwargs.get('blob') or False
+        self.blob = blob or False
         # bounding/sampling
         self.bounding = bounding
         self.sampling = sampling
@@ -813,19 +814,18 @@ def restore(fname, pool=None):
         return restore_sampler(fname, pool=pool)
 
     def __get_update_interval(self, update_interval, nlive):
-        if not isinstance(update_interval, int):
-            if isinstance(update_interval, float):
-                cur_update_interval_ratio = update_interval
-            elif update_interval is None:
-                cur_update_interval_ratio = self.bound_update_interval_ratio
-            else:
-                raise RuntimeError(
-                    str.format('Weird update_interval value {}',
-                               update_interval))
-            update_interval = int(
-                max(
-                    min(np.round(cur_update_interval_ratio * nlive),
-                        sys.maxsize), 1))
+        if update_interval is None:
+            cur_update_interval_ratio = self.bound_update_interval_ratio
+        elif isinstance(update_interval, int):
+            cur_update_interval_ratio = update_interval / nlive
+        elif isinstance(update_interval, float):
+            cur_update_interval_ratio = update_interval
+        else:
+            raise RuntimeError(
+                str.format('Weird update_interval value {}', update_interval))
+        update_interval = int(
+            max(min(np.round(cur_update_interval_ratio * nlive), sys.maxsize),
+                1))
         return update_interval
 
     def reset(self):