Merge remote-tracking branch 'upstream/master'

nanograv · Mar 31, 2016 · eb86802 · eb86802
2 parents 5831c50 + 170157f
commit eb86802
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/PTMCMCSampler/PTMCMCSampler.py b/PTMCMCSampler/PTMCMCSampler.py
@@ -60,8 +60,7 @@ class PTSampler(object):
 
     def __init__(self, ndim, logl, logp, cov, groups=None, loglargs=[], loglkwargs={},
                  logpargs=[], logpkwargs={}, logl_grad=None, logp_grad=None,
-                 comm=MPI.COMM_WORLD,
-                 outDir='./chains', verbose=True, resume=False):
+                 comm=MPI.COMM_WORLD, outDir='./chains', verbose=True, resume=False):
 
         # MPI initialization
         self.comm = comm
@@ -191,13 +190,16 @@ def initialize(self, Niter, ladder=None, Tmin=1, Tmax=None, Tskip=100,
             self.addProposalToCycle(nutsjump, NUTSweight)
 
         # add SCAM
-        self.addProposalToCycle(
-            self.covarianceJumpProposalSCAM,
-            self.SCAMweight)
+        self.addProposalToCycle(self.covarianceJumpProposalSCAM, 
+                                self.SCAMweight)
 
         # add AM
         self.addProposalToCycle(self.covarianceJumpProposalAM, self.AMweight)
 
+        # check length of jump cycle 
+        if len(self.propCycle) == 0:
+            raise ValueError('No jump proposals specified!')
+
         # randomize cycle
         self.randomizeProposalCycle()