add prediction.gls() (#3)

leeper · Sep 1, 2016 · 86b8a88 · 86b8a88
1 parent f72c16e
commit 86b8a88
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -4,8  4,8 @@ Title: Marginal Effects for Model Objects
 Description: An R port of Stata's 'margins' command, which can be used to
     calculate marginal (or partial) effects from model objects.
 License: MIT   file LICENSE
-Version: 0.2.10
-Date: 2016-08-31
 Version: 0.2.11
 Date: 2016-09-01
 Authors@R: c(person("Thomas J.", "Leeper",
                     role = c("aut", "cre"),
                     email = "[email protected]"))

diff --git a/NAMESPACE b/NAMESPACE
@@ -18,6  18,7 @@ S3method(plot,margins)
 S3method(plot,marginslist)
 S3method(prediction,coxph)
 S3method(prediction,glm)
 S3method(prediction,gls)
 S3method(prediction,ivreg)
 S3method(prediction,lm)
 S3method(prediction,loess)

diff --git a/NEWS.md b/NEWS.md
@@ -1,5  1,9 @@
 # CHANGES TO margins 0.3.0 #
 
 ## margins 0.2.11
 
 * Added a `prediction()` method for "gls" objects (from `MASS::gls()`). (#3)
 
 ## margins 0.2.10
 
 * Replaced `numDeriv::jacobian()` with an internal alternative. (#41)

diff --git a/R/prediction.R b/R/prediction.R
@@ -11,6  11,7 @@
 #' \itemize{
 #'   \item \dQuote{lm}, see \code{\link[stats]{lm}}
 #'   \item \dQuote{glm}, see \code{\link[stats]{glm}}, \code{\link[MASS]{glm.nb}}
 #'   \item \dQuote{gls}, see \code{\link[MASS]{gls}}
 #'   \item \dQuote{polr}, see \code{\link[MASS]{polr}}
 #'   \item \dQuote{loess}, see \code{\link[stats]{loess}}
 #'   \item \dQuote{ivreg}, see \code{\link[AER]{ivreg}}

diff --git a/R/prediction_methods.R b/R/prediction_methods.R
@@ -191,6  191,25 @@ prediction.coxph <- function(model, data, type = c("risk", "expected", "lp"), ..
               type = type)
 }
 
 #' @rdname prediction
 #' @export
 prediction.gls <- function(model, data, ...) {
 
     # extract predicted value at input value (value can only be 1 number)
     pred <- data.frame(fit = predict(model, newdata = data, type = "class", ...))
     pred[["se.fit"]] <- NA_real_
     class(pred[["fit"]]) <- c("fit", class(pred[["fit"]]))
     class(pred[["se.fit"]]) <- c("se.fit", "numeric")
 
     # obs-x-2 data.frame of predictions
     structure(list(fitted = pred[["fit"]], 
                    se.fitted = pred[["se.fit"]]),
               class = c("prediction", "data.frame"), 
               row.names = seq_len(length(pred[["fit"]])),
               model.class = class(model),
               type = NULL)
 }
 
 #' @rdname prediction
 #' @export
 prediction.polr <- function(model, data, ...) {

diff --git a/man/prediction.Rd b/man/prediction.Rd