Skip to content
Snippets Groups Projects
Commit 45ecbb4b authored by Rhys Green's avatar Rhys Green
Browse files

adding changes to other files so that they call ptmcmc

parent d7ffd885
No related branches found
No related tags found
1 merge request!322Adding PTMCMC sampler
...@@ -280,7 +280,6 @@ def create_default_prior(name, default_priors_file=None): ...@@ -280,7 +280,6 @@ def create_default_prior(name, default_priors_file=None):
prior = None prior = None
return prior return prior
class Prior(object): class Prior(object):
_default_latex_labels = dict() _default_latex_labels = dict()
......
...@@ -12,13 +12,14 @@ from .dynesty import Dynesty ...@@ -12,13 +12,14 @@ from .dynesty import Dynesty
from .emcee import Emcee from .emcee import Emcee
from .nestle import Nestle from .nestle import Nestle
from .ptemcee import Ptemcee from .ptemcee import Ptemcee
from .ptmcmc import PTMCMCSampler
from .pymc3 import Pymc3 from .pymc3 import Pymc3
from .pymultinest import Pymultinest from .pymultinest import Pymultinest
from .ptmcmc import PTMCMCSampler
implemented_samplers = { implemented_samplers = {
'cpnest': Cpnest, 'dynesty': Dynesty, 'emcee': Emcee, 'nestle': Nestle, 'cpnest': Cpnest, 'dynesty': Dynesty, 'emcee': Emcee, 'nestle': Nestle,
'ptemcee': Ptemcee, 'pymc3': Pymc3, 'pymultinest': Pymultinest , 'ptmcmcsampler' : PTMCMCSampler} 'ptemcee': Ptemcee,'ptmcmcsampler' : PTMCMCSampler,
'pymc3': Pymc3, 'pymultinest': Pymultinest }
if command_line_args.sampler_help: if command_line_args.sampler_help:
sampler = command_line_args.sampler_help sampler = command_line_args.sampler_help
......
...@@ -142,14 +142,14 @@ class Sampler(object): ...@@ -142,14 +142,14 @@ class Sampler(object):
pass pass
def _verify_external_sampler(self): def _verify_external_sampler(self):
external_sampler_name = self.__class__.__name__ external_sampler_name = self.__class__.__name__.lower()
print(external_sampler_name)
try: try:
self.external_sampler = __import__(external_sampler_name) self.external_sampler = __import__(external_sampler_name)
except (ImportError, SystemExit, ModuleNotFoundError): except (ImportError, SystemExit):
raise SamplerNotInstalledError( raise SamplerNotInstalledError(
"Sampler {} is not installed on this system".format(external_sampler_name)) "Sampler {} is not installed on this system".format(external_sampler_name))
def _verify_kwargs_against_default_kwargs(self): def _verify_kwargs_against_default_kwargs(self):
""" """
Check if the kwargs are contained in the list of available arguments Check if the kwargs are contained in the list of available arguments
......
...@@ -109,7 +109,6 @@ class Emcee(MCMCSampler): ...@@ -109,7 +109,6 @@ class Emcee(MCMCSampler):
tqdm = get_progress_bar() tqdm = get_progress_bar()
sampler = emcee.EnsembleSampler(dim=self.ndim, lnpostfn=self.lnpostfn, **self.sampler_init_kwargs) sampler = emcee.EnsembleSampler(dim=self.ndim, lnpostfn=self.lnpostfn, **self.sampler_init_kwargs)
self._set_pos0() self._set_pos0()
print(self.nsteps)
for _ in tqdm(sampler.sample(p0=self.pos0, **self.sampler_function_kwargs), for _ in tqdm(sampler.sample(p0=self.pos0, **self.sampler_function_kwargs),
total=self.nsteps): total=self.nsteps):
pass pass
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment