Merge branch 'master' of https://github.com/rmcelreath/rethinking

rmcelreath · Feb 1, 2020 · f834978 · f834978
2 parents 4ac9dbf + 1def057
commit f834978
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -8,4 +8,4 @@ Maintainer: Richard McElreath <[email protected]>
 Imports: coda, MASS, mvtnorm, loo
 Depends: rstan (>= 2.10.0), parallel, methods, stats, graphics
 Description: Utilities for fitting and comparing models
-License: GPL (>= 3)
+License: GPL (>= 3)
diff --git a/README.md b/README.md
@@ -256,4 +256,3 @@ Note the use of the ``constraints`` list to pass custom parameter constraints to
 Both ``map`` and ``map2stan`` provide DIC and WAIC. Well, in most cases they do. In truth, both tools are flexible enough that you can specify models for which neither DIC nor WAIC can be correctly calculated. But for ordinary GLMs and GLMMs, it works. See the R help ``?WAIC``. A convenience function ``compare`` summarizes information criteria comparisons, including standard errors for WAIC. 
 
 ``ensemble`` computes ``link`` and ``sim`` output for an ensemble of models, each weighted by its Akaike weight, as computed from WAIC.
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -256,4 +256,3 @@ Note the use of the ``constraints`` list to pass custom parameter constraints to
		Both ``map`` and ``map2stan`` provide DIC and WAIC. Well, in most cases they do. In truth, both tools are flexible enough that you can specify models for which neither DIC nor WAIC can be correctly calculated. But for ordinary GLMs and GLMMs, it works. See the R help ``?WAIC``. A convenience function ``compare`` summarizes information criteria comparisons, including standard errors for WAIC.

		``ensemble`` computes ``link`` and ``sim`` output for an ensemble of models, each weighted by its Akaike weight, as computed from WAIC.