Merge branch 'change-default-settings' into 'master'

Revert changes to the default settings

See merge request lscsoft/bilby!571

bilby/core/sampler/dynesty.py

@@ -55,7 +55,7 @@ class Dynesty(NestedSampler):
         Method used to sample uniformly within the likelihood constraints,
         conditioned on the provided bounds
     walks: int
-        Number of walks taken if using `sample='rwalk'`, defaults to `ndim * 30`
+        Number of walks taken if using `sample='rwalk'`, defaults to `ndim * 10`
     dlogz: float, (0.1)
         Stopping criteria
     verbose: Bool
@@ -156,7 +156,7 @@ class Dynesty(NestedSampler):
 
     def _verify_kwargs_against_default_kwargs(self):
         if not self.kwargs['walks']:
-            self.kwargs['walks'] = self.ndim * 30
+            self.kwargs['walks'] = self.ndim * 10
         if not self.kwargs['update_interval']:
             self.kwargs['update_interval'] = int(0.6 * self.kwargs['nlive'])
         if not self.kwargs['print_func']:

test/sampler_test.py

@@ -153,7 +153,7 @@ class TestDynesty(unittest.TestCase):
                         enlarge=None, bootstrap=None, vol_dec=0.5, vol_check=2.0,
                         facc=0.5, slices=5, dlogz=0.1, maxiter=None, maxcall=None,
                         logl_max=np.inf, add_live=True, print_progress=True, save_bounds=False,
-                        walks=60, update_interval=600, print_func='func')
+                        walks=20, update_interval=600, print_func='func')
         self.sampler.kwargs['print_func'] = 'func'  # set this manually as this is not testable otherwise
         self.assertListEqual([0, 1], self.sampler.kwargs['periodic'])  # Check this separately
         self.sampler.kwargs['periodic'] = None  # The dict comparison can't handle lists
@@ -171,7 +171,7 @@ class TestDynesty(unittest.TestCase):
                         enlarge=None, bootstrap=None, vol_dec=0.5, vol_check=2.0,
                         facc=0.5, slices=5, dlogz=0.1, maxiter=None, maxcall=None,
                         logl_max=np.inf, add_live=True, print_progress=True, save_bounds=False,
-                        walks=60, update_interval=600, print_func='func')
+                        walks=20, update_interval=600, print_func='func')
 
         for equiv in bilby.core.sampler.base_sampler.NestedSampler.npoints_equiv_kwargs:
             new_kwargs = self.sampler.kwargs.copy()