Commit e47a8bce authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Upstream version 1.3-25

parent 63cbeb18
Package: mgcv Package: mgcv
Version: 1.3-24 Version: 1.3-25
Author: Simon Wood <simon.wood@r-project.org> Author: Simon Wood <simon.wood@r-project.org>
Maintainer: Simon Wood <simon.wood@r-project.org> Maintainer: Simon Wood <simon.wood@r-project.org>
Title: GAMs with GCV smoothness estimation and GAMMs by REML/PQL Title: GAMs with GCV smoothness estimation and GAMMs by REML/PQL
...@@ -12,4 +12,4 @@ Imports: graphics, stats ...@@ -12,4 +12,4 @@ Imports: graphics, stats
Suggests: nlme (>= 3.1-64), MASS (>= 7.2-2) Suggests: nlme (>= 3.1-64), MASS (>= 7.2-2)
LazyLoad: yes LazyLoad: yes
License: GPL version 2 or later License: GPL version 2 or later
Packaged: Sun May 6 21:50:31 2007; simon Packaged: Thu Jun 21 15:25:06 2007; simon
...@@ -36,16 +36,15 @@ x<-matrix(res[[1]][1:n],res[[2]],res[[3]]) ...@@ -36,16 +36,15 @@ x<-matrix(res[[1]][1:n],res[[2]],res[[3]])
x x
} }
null.space.dimension<-function(d,m) null.space.dimension<-function(d,m)
# vectorized function for calculating null space dimension for penalties of order m # vectorized function for calculating null space dimension for penalties of order m
# for dimension d data M=(m+d+1)!/(d!(m-d)!). Any m not satisfying 2m>d is reset so # for dimension d data M=(m+d-1)!/(d!(m-1)!). Any m not satisfying 2m>d is reset so
# that 2m>d+1 (assuring "visual" smoothness) # that 2m>d+1 (assuring "visual" smoothness)
{ if (sum(d<0)) stop("d can not be negative in call to null.space.dimension().") { if (sum(d<0)) stop("d can not be negative in call to null.space.dimension().")
ind<-2*m<d+1 ind<-2*m<d+1
if (sum(ind)) # then default m required for some elements if (sum(ind)) # then default m required for some elements
{ m[ind]<-1;ind<-2*m<d+2 { m[ind]<-1;ind<-2*m<d+2
while (sum(ind)) { m[ind]<-m[ind]+1;ind<-2+m<d+2;} while (sum(ind)) { m[ind]<-m[ind]+1;ind<-2*m<d+2;}
} }
M<-m*0+1;ind<-M==1;i<-0 M<-m*0+1;ind<-M==1;i<-0
while(sum(ind)) while(sum(ind))
...@@ -61,9 +60,6 @@ null.space.dimension<-function(d,m) ...@@ -61,9 +60,6 @@ null.space.dimension<-function(d,m)
pcls <- function(M) pcls <- function(M)
# Function to perform penalized constrained least squares. # Function to perform penalized constrained least squares.
# Problem to be solved is: # Problem to be solved is:
......
1.3-25
* A bug in `null.space.dimension' caused prediction to fail for `s' terms
of 4 or more variables, unless the `m' argument was supplied explicitly
(and was large enough for the number of variables). Fixed.
1.3-24 1.3-24
* summary.gam modified so that it behaves correctly if fitting routines * summary.gam modified so that it behaves correctly if fitting routines
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment