MAINT Convert some examples to new sample() api. Adapt tests.

pymc-devs · Nov 17, 2016 · 34e3f45 · 34e3f45
1 parent 85e0f9d
commit 34e3f45
Show file tree

Hide file tree

Showing 10 changed files with 361 additions and 626 deletions.
diff --git a/docs/source/notebooks/BEST.ipynb b/docs/source/notebooks/BEST.ipynb
diff --git a/docs/source/notebooks/GLM-hierarchical.ipynb b/docs/source/notebooks/GLM-hierarchical.ipynb
diff --git a/docs/source/notebooks/LKJ.ipynb b/docs/source/notebooks/LKJ.ipynb
diff --git a/docs/source/notebooks/NUTS_scaling_using_ADVI.ipynb b/docs/source/notebooks/NUTS_scaling_using_ADVI.ipynb
diff --git a/docs/source/notebooks/cox_model.ipynb b/docs/source/notebooks/cox_model.ipynb
diff --git a/docs/source/notebooks/marginalized_gaussian_mixture_model.ipynb b/docs/source/notebooks/marginalized_gaussian_mixture_model.ipynb
@@ -292,8 +292,9 @@
   }
  ],
  "metadata": {
+  "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python [default]",
    "language": "python",
    "name": "python3"
   },
@@ -307,11 +308,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.1"
-  },
-  "widgets": {
-   "state": {},
-   "version": "1.1.2"
+   "version": "3.5.2"
   }
  },
  "nbformat": 4,

diff --git a/docs/source/notebooks/pmf-pymc.ipynb b/docs/source/notebooks/pmf-pymc.ipynb
diff --git a/docs/source/notebooks/posterior_predictive.ipynb b/docs/source/notebooks/posterior_predictive.ipynb
diff --git a/docs/source/notebooks/stochastic_volatility.ipynb b/docs/source/notebooks/stochastic_volatility.ipynb
diff --git a/pymc3/tests/test_sampling.py b/pymc3/tests/test_sampling.py
@@ -64,15 +64,9 @@ def test_sample(self):
     def test_sample_init(self):
         with self.model:
             for init in ('advi', 'advi_map', 'map', 'nuts'):
-                for sampler in ('nuts', 'hmc', 'advi'):
-                    if (sampler == 'advi') and (init != 'advi'):
-                        self.assertRaises(ValueError, pm.sample_init,
-                                          init=init, sampler=sampler,
-                                          n_init=1000)
-                    else:
-                        pm.sample_init(init=init, sampler=sampler,
-                                       n_init=1000, draws=50,
-                                       random_seed=self.random_seed)
+                pm.sample(init=init,
+                          n_init=1000, draws=50,
+                          random_seed=self.random_seed)
 
 
     def test_iter_sample(self):