Merge branch 'rand_init' of github.com:pymc-devs/pymc3 into rand_init

pymc-devs · Feb 2, 2017 · a814ca3 · a814ca3
2 parents 05f9194 + 2c614e8
commit a814ca3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/pymc3/examples/gelman_bioassay.py b/pymc3/examples/gelman_bioassay.py
@@ -1,9 +1,5 @@
 import pymc3 as pm
-<<<<<<< HEAD
-from numpy import ones, array
-=======
 from numpy import ones, array, random
->>>>>>> Fixed import syntax in gelman_bioassay
 
 # Samples for each dose level
 n = 5 * ones(4, dtype=int)
@@ -22,7 +18,6 @@
     # Data likelihood
     deaths = pm.Binomial('deaths', n=n, p=theta, observed=[0, 1, 3, 5])
 
-
 def run(n=1000):
     if n == "short":
         n = 50

diff --git a/pymc3/sampling.py b/pymc3/sampling.py
@@ -480,11 +480,7 @@ def trans_sample(v):
         def random_sample():
             var_dict = {v.name:v.distribution.random() for v in model.vars 
                                         if not v.name.endswith('_')}
-<<<<<<< HEAD
             trans_var_dict = {v.name: trans_sample(v) for v in model.vars 
-=======
-            trans_var_dict = {v.name: trans_sample(v) for v in model.vars  
->>>>>>> Added random init to init_nuts
                                         if v.name.endswith('_')}
             var_dict.update(trans_var_dict)
             return var_dict