[r-cran-gam] 08/20: Imported Upstream version 1.09.1

Andreas Tille tille at debian.org
Fri Dec 16 14:32:11 UTC 2016


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-gam.

commit fe653656a931a67bf3bcdcca10cab075d35836b0
Author: Andreas Tille <tille at debian.org>
Date:   Fri Dec 16 13:32:21 2016 +0100

    Imported Upstream version 1.09.1
---
 DESCRIPTION       | 8 ++++----
 MD5               | 8 ++++----
 R/anova.gam.R     | 5 +++--
 R/anova.gamlist.R | 3 ++-
 R/summary.gam.R   | 1 +
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 5ab7eb5..5a23881 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -2,17 +2,17 @@ Package: gam
 Type: Package
 Title: Generalized Additive Models
 Date: 2013-08-11
-Version: 1.09
+Version: 1.09.1
 Author: Trevor Hastie
 Description: Functions for fitting and working with generalized
 		additive models, as described in chapter 7 of "Statistical Models in
 		S" (Chambers and Hastie (eds), 1991), and "Generalized Additive
 		Models" (Hastie and Tibshirani, 1990).
 Maintainer: Trevor Hastie <hastie at stanford.edu>
-Depends: stats, splines
+Depends: stats, splines, R (>= 3.1)
 Suggests: akima, foreach
 License: GPL-2
-Packaged: 2013-08-12 17:21:53 UTC; hastie
+Packaged: 2013-09-12 10:44:42 UTC; ripley
 NeedsCompilation: yes
 Repository: CRAN
-Date/Publication: 2013-08-13 08:00:00
+Date/Publication: 2014-04-10 10:54:04
diff --git a/MD5 b/MD5
index 31a54d1..2c2170d 100644
--- a/MD5
+++ b/MD5
@@ -1,10 +1,10 @@
 c95bed4e0f0a9c7ce468d8b0c3b86c99 *ChangeLog
-3b3051d46d5cf4f05e25710d208e68a6 *DESCRIPTION
+fcc9f03b2aab1a5c90ae3d4439c059b6 *DESCRIPTION
 af77f82fb0aa5e383808c5f36aa47066 *INDEX
 79c3de2f467638359b6523bce15d127e *NAMESPACE
 3f56ee7eddd13ec792f7c2150b1e1eca *R/all.wam.R
-8cc1439da83368b103fe32e3f659d7c2 *R/anova.gam.R
-650f5fcfc4615d93f8743f2a93e0204b *R/anova.gamlist.R
+81e9b54a2bfe88cb19390c5edc0458dd *R/anova.gam.R
+1c6ad753c650b8a285a3f2acff721480 *R/anova.gamlist.R
 c67ddb150e807c4a0ef77acf132c1021 *R/as.anova.R
 996bcecc62a9687cb77863e45830a000 *R/as.data.frame.lo.smooth.R
 69d4bccf3afc7a1a9fd2b5d8b2f60fec *R/assign.list.R
@@ -51,7 +51,7 @@ c318b1f9d34fda3e660a9af01b86c830 *R/random.R
 596d38e0f6ec11d3921b0ee8bd3590a4 *R/s.wam.R
 79eaf99c6a30f60cdb8d32ad76f24970 *R/step.gam.R
 9c1302d138d07b10f17c27765bd87955 *R/subset.smooth.R
-8f2f390526bda6e2c9049d602f348a7e *R/summary.gam.R
+ed4bf1ea99f4e8e888a4d075c85df6f0 *R/summary.gam.R
 5cc7658080bc925bb5fc11172d78fb41 *R/ylim.scale.R
 ba66638e3de17b868b4d98dffe95009d *data/gam.data.RData
 83529cbff37939aff8d96d32d6458f12 *data/gam.newdata.RData
diff --git a/R/anova.gam.R b/R/anova.gam.R
index d0a0282..8f736b9 100644
--- a/R/anova.gam.R
+++ b/R/anova.gam.R
@@ -4,7 +4,8 @@
   test=match.arg(test)
   margs <- function(...)
     nargs()
-  if(margs(...))
+  if(margs(...)) {
+    anova.glmlist <- getS3method("anova", "glmlist")
     anova.glmlist(list(object, ...), test = test)
-  else summary.gam(object)$anova
+  } else summary.gam(object)$anova
 }
diff --git a/R/anova.gamlist.R b/R/anova.gamlist.R
index e1306ae..44283c1 100644
--- a/R/anova.gamlist.R
+++ b/R/anova.gamlist.R
@@ -1,5 +1,6 @@
 "anova.gamlist" <-
 function(object, ..., test = c("none", "Chisq", "F", "Cp")){
   test=match.arg(test)
-  anova.glmlist(object, test = test)
+  anova(structure(c(list(object), ...), class="glmlist"), test = test)
+  ## anova.glmlist(object, test = test)
 }
diff --git a/R/summary.gam.R b/R/summary.gam.R
index fb2e2ca..e97cf55 100644
--- a/R/summary.gam.R
+++ b/R/summary.gam.R
@@ -1,6 +1,7 @@
 "summary.gam" <-
    function (object, dispersion = NULL, ...) 
 {
+  anova.lm <- getS3method("anova", "lm")
   paod=anova.lm(object,...)
   attr(paod,"heading")="Anova for Parametric Effects"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-gam.git



More information about the debian-science-commits mailing list