From a992d3723075285a3a8403f49ec381e410c48137 Mon Sep 17 00:00:00 2001 From: dscott Date: Wed, 6 Jan 2016 02:36:43 +0000 Subject: [PATCH] Added support for spdep, splm and sphet summary tables git-svn-id: svn://scm.r-forge.r-project.org/svnroot/xtable@80 edb9625f-4e0d-4859-8d74-9fd3b1da38cb --- pkg/NAMESPACE | 5 +++-- pkg/R/xtable.R | 28 ++++++++++++++++++++++++--- pkg/R/xtableList.R | 4 ++-- pkg/man/xtable-internal.Rd | 2 +- pkg/man/xtable.Rd | 3 ++- pkg/vignettes/listOfTablesGallery.Rnw | 10 ++++++---- 6 files changed, 39 insertions(+), 13 deletions(-) diff --git a/pkg/NAMESPACE b/pkg/NAMESPACE index 7b559b0..3ba56cb 100644 --- a/pkg/NAMESPACE +++ b/pkg/NAMESPACE @@ -5,7 +5,7 @@ importFrom("utils", "packageDescription") export("caption<-", "caption", "label", "label<-", "align<-", "align", "digits<-", "digits", "display<-", "display", "xtable", - "xtableMatharray","xtableList", "xtablelsmeans", + "xtableMatharray","xtableList", "xtableLSMeans", "print.xtable", "print.xtableMatharray", "print.xtableList", "toLatex.xtable", "autoformat", "xalign", "xdigits", "xdisplay") @@ -53,4 +53,5 @@ S3method("xtable", "splm") S3method("xtable", "summary.splm") S3method("xtable", "sphet") S3method("xtable", "summary.sphet") - +S3method("xtable", "spautolm") +S3method("xtable", "summary.spautolm") diff --git a/pkg/R/xtable.R b/pkg/R/xtable.R index 65473da..647276d 100644 --- a/pkg/R/xtable.R +++ b/pkg/R/xtable.R @@ -305,7 +305,9 @@ xtable.zoo <- function(x, ...) { return(xtable(as.ts(x), ...)) } - +### Date: Fri, 29 May 2015 11:41:04 +0200 +### From: Martin G. +### Subject: [xtable] Code for spdep, splm and sphet objects outputs ### package spdep ### sarlm objects xtable.sarlm <- function(x, caption = NULL, label = NULL, align = NULL, @@ -332,12 +334,32 @@ xtable.summary.sarlm <- function(x, caption = NULL, label = NULL, align = NULL, return(x) } +### spautolm objects: added by David Scott, 6/1/2016, after suggestion by +### Guido Schulz +### Date: Wed, 29 Apr 2015 10:45:16 +0200 +### Guido Schulz +xtable.spautolm <- function(x, caption = NULL, label = NULL, align = NULL, + digits = NULL, display = NULL, auto = FALSE, ...) { + return(xtable.summary.sarlm(summary(x), caption = caption, label = label, + align = align, digits = digits, + display = display, auto = auto)) +} + +xtable.summary.spautolm <- function(x, caption = NULL, label = NULL, + align = NULL, digits = NULL, + display = NULL, auto = FALSE, ...) { + return(xtable.summary.sarlm(summary(x), caption = caption, label = label, + align = align, digits = digits, + display = display, auto = auto)) +} + + ### gmsar objects xtable.gmsar <- function(x, caption = NULL, label = NULL, align = NULL, digits = NULL, display = NULL, auto = FALSE, ...) { return(xtable.summary.sarlm(summary(x), caption = caption, label = label, align = align, digits = digits, - display = display, auto = auto)) + display = display, auto = auto, ...)) } xtable.summary.gmsar <- function(x, caption = NULL, label = NULL, align = NULL, @@ -353,7 +375,7 @@ xtable.stsls <- function(x, caption = NULL, label = NULL, align = NULL, digits = NULL, display = NULL, auto = FALSE, ...) { return(xtable.summary.sarlm(summary(x), caption = caption, label = label, align = align, digits = digits, - display = display, auto = auto)) + display = display, auto = auto, ...)) } xtable.summary.stsls <- function(x, caption = NULL, label = NULL, align = NULL, diff --git a/pkg/R/xtableList.R b/pkg/R/xtableList.R index 4ed695c..35736f0 100644 --- a/pkg/R/xtableList.R +++ b/pkg/R/xtableList.R @@ -27,7 +27,7 @@ xtableList <- function(x, caption = NULL, label = NULL, align = NULL, attr(xList, "message") <- attr(x, "message") attr(xList, "caption") <- caption attr(xList, "label") <- label - class(xList) <- c("xtableList", "data.frame") + class(xList) <- c("xtableList") return(xList) } @@ -180,7 +180,7 @@ print.xtableList <- function(x, ### Uses xtableList -xtablelsmeans <- function(x, caption = NULL, label = NULL, +xtableLSMeans <- function(x, caption = NULL, label = NULL, align = NULL, digits = NULL, display = NULL, auto = FALSE, ...){ diff --git a/pkg/man/xtable-internal.Rd b/pkg/man/xtable-internal.Rd index 67f479f..1e0bd4d 100644 --- a/pkg/man/xtable-internal.Rd +++ b/pkg/man/xtable-internal.Rd @@ -2,7 +2,7 @@ \alias{xtableMatharray} \alias{xtableList} \alias{print.xtableList} -\alias{xtablelsmeans} +\alias{xtableLSMeans} \title{Internal xtable Functions} \description{ diff --git a/pkg/man/xtable.Rd b/pkg/man/xtable.Rd index 50f6a77..9b41fb9 100644 --- a/pkg/man/xtable.Rd +++ b/pkg/man/xtable.Rd @@ -28,7 +28,8 @@ \alias{xtable.summary.splm} \alias{xtable.sphet} \alias{xtable.summary.sphet} - +\alias{xtable.spautolm} +\alias{xtable.summary.spautolm} \title{Create Export Tables} diff --git a/pkg/vignettes/listOfTablesGallery.Rnw b/pkg/vignettes/listOfTablesGallery.Rnw index be627e6..e32d283 100644 --- a/pkg/vignettes/listOfTablesGallery.Rnw +++ b/pkg/vignettes/listOfTablesGallery.Rnw @@ -22,8 +22,8 @@ \setcounter{tocdepth}{2} \begin{document} -\title{The \code{xtableList} Gallery} -\author{David J. Scott} +\title{\bfseries\Large The \code{xtableList} Gallery} +\author{\bfseries David J. Scott} \maketitle \tableofcontents @@ -189,7 +189,9 @@ print.xtableList(xList, colnames.format = "multiple", \label{sec:lsmeans} Summaries from the \code{lsmeans} function from the \pkg{lsmeans} -package can easily be produced. +package can easily be produced using the function +\code{xtableLSMeans}. This function produces a list of \pkg{xtable} +objects. <>= @@ -197,7 +199,7 @@ library(lsmeans) warp.lm <- lm(breaks ~ wool*tension, data = warpbreaks) warp.lsm <- lsmeans(warp.lm, ~ tension | wool) warp.sum <- summary(warp.lsm, adjust = "mvt") -warp.xtblList <- xtablelsmeans(warp.sum, digits = c(0,0,2,2,0,2,2)) +warp.xtblList <- xtableLSMeans(warp.sum, digits = c(0,0,2,2,0,2,2)) str(warp.xtblList) @ %def -- 2.39.5