fix issue #17

merliseclyde · May 1, 2018 · 674ee9d · 674ee9d
1 parent e402f5c
commit 674ee9d
Show file tree

Hide file tree

Showing 10 changed files with 530 additions and 1,530 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: BAS
 Version: 1.5.0
-Date: 2018-04-25
+Date: 2018-05-01
 Title: Bayesian Variable Selection and Model Averaging using Bayesian Adaptive Sampling
 Authors@R: c(person("Merlise", "Clyde", email="clyde@duke.edu",
 	   		       role=c("aut","cre", "cph"),

diff --git a/NEWS.md b/NEWS.md
@@ -12,6 +12,8 @@
 * fixed problem if there is only one model for `image` function;  
 github [issue #11](https://github.com/merliseclyde/BAS/issues/11)
 
+* fixed error in `bas.lm` with non-equal weights where R2 was incorrect.
+ [issue #17](https://github.com/merliseclyde/BAS/issues/17)
 ## Deprecated 
 
 * deprecate the `predict` argument in `predict.bas`, `predict.basglm` and internal functions as it is not utilized

diff --git a/R/bas.R b/R/bas.R
@@ -374,6 +374,7 @@
 #' \dontrun{demo(BAS.USCrime) }
 #'
 #' @rdname bas.lm
+#' @keywords regression
 #' @family BAS methods
 #' @concept BMA
 #' @concept variable selection

diff --git a/inst/doc/BAS-vignette.R b/inst/doc/BAS-vignette.R