Resolve "Follow-up from "Adding dnest4 Sampler""

Requires !888 (merged) Closes #533 (closed)

bilby/core/sampler/dnest4.py

@@ -185,18 +185,13 @@ class DNest4(NestedSampler):
     def _set_backend(self):
         import dnest4
         if self._backend == 'csv':
-            # for CSVBackend, which is output data to disk
-            backend = dnest4.backends.CSVBackend("{}/dnest4{}/".format(self.outdir, self.label), sep=" ")
-            # change to original
+            return dnest4.backends.CSVBackend("{}/dnest4{}/".format(self.outdir, self.label), sep=" ")
         else:
-            # for the MemoryBackend, which is output data to memory
-            backend = dnest4.backends.MemoryBackend()
-        return backend
+            return dnest4.backends.MemoryBackend()
 
     def _set_dnest4_kwargs(self):
         dnest4_keys = ["num_steps", "new_level_interval", "lam", "beta", "seed"]
         self.dnest4_kwargs = {key: self.kwargs[key] for key in dnest4_keys}
-        return self.dnest4_kwargs
 
     def run_sampler(self):
         import dnest4
@@ -230,11 +225,7 @@ class DNest4(NestedSampler):
         if self._backend == 'memory':
             self._last_live_sample_info = pd.DataFrame(self.sampler.backend.sample_info[-1])
             self.result.log_likelihood_evaluations = self._last_live_sample_info['log_likelihood']
-
             self.result.samples = np.array(self.sampler.backend.posterior_samples)
-            print("here")
-            print(self.sampler.backend.posterior_samples)
-            print(self.result.samples)
         else:
             sample_info_path = './' + self.kwargs["outputfiles_basename"] + '/sample_info.txt'
 
@@ -259,36 +250,7 @@ class DNest4(NestedSampler):
 
     def _verify_kwargs_against_default_kwargs(self):
         self.outputfiles_basename = self.kwargs.pop("outputfiles_basename", None)
-
-        # if self.kwargs['backend_callback'] is None:
-        #     self.kwargs['backend_callback'] = self._backend_callback
-
-        NestedSampler._verify_kwargs_against_default_kwargs(self)
-
-    # def _backend_callback(self, *args, **kwargs):
-    #     if self.use_temporary_directory:
-    #         self._copy_temporary_directory_contents_to_proper_path()
-    #     self._calculate_and_save_sampling_time()
-
-    def _setup_run_directory(self):
-        """
-        If using a temporary directory, the output directory is moved to the
-        temporary directory.
-        """
-        if self.use_temporary_directory:
-            temporary_outputfiles_basename = tempfile.TemporaryDirectory().name
-            self.temporary_outputfiles_basename = temporary_outputfiles_basename
-
-            if os.path.exists(self.outputfiles_basename):
-                distutils.dir_util.copy_tree(self.outputfiles_basename, self.temporary_outputfiles_basename)
-            check_directory_exists_and_if_not_mkdir(temporary_outputfiles_basename)
-
-            self.kwargs["outputfiles_basename"] = self.temporary_outputfiles_basename
-            logger.info("Using temporary file {}".format(temporary_outputfiles_basename))
-        else:
-            check_directory_exists_and_if_not_mkdir(self.outputfiles_basename)
-            self.kwargs["outputfiles_basename"] = self.outpuxtfiles_basename
-            logger.info("Using output file {}".format(self.outputfiles_basename))
+        super(DNest4, self)._verify_kwargs_against_default_kwargs()
 
     def _check_and_load_sampling_time_file(self):
         self.time_file_path = self.kwargs["outputfiles_basename"] + '/sampling_time.dat'