Skip to content

Commit 8ffd6a6

Browse files
committed
small cosmetic changes to code, date update toDESCRIPTION, and spelling error fixed in predict.fRegress.Rd
1 parent 8d08dfd commit 8ffd6a6

File tree

7 files changed

+1465
-1446
lines changed

7 files changed

+1465
-1446
lines changed

DESCRIPTION

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: fda
22
Version: 5.1.4
3-
Date: 2020-04-19
3+
Date: 2020-06-26
44
Title: Functional Data Analysis
55
Author: J. O. Ramsay <ramsay@psych.mcgill.ca> [aut,cre],
66
Spencer Graves <spencer.graves@effectivedefense.org> [ctb],
@@ -21,4 +21,3 @@ License: GPL (>= 2)
2121
URL: http://www.functionaldata.org
2222
LazyData: true
2323
NeedsCompilation: no
24-
Packaged: 2020-03-13 15:55:07 UTC; jimramsay

R/density.fd.R

+3-4
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ expectden.phi <- function(basisobj, cvec, Cval=1, nderiv=0,
440440
h <- matrix(1,JMAXP,1)
441441
h[2] <- 0.25
442442
# matrix SMAT contains the history of discrete approximations to the integral
443-
smat <- matrix(0,JMAXP,nbasis)
444443
sumj <- matrix(0,1,nbasis)
445444
# the first iteration uses just the }points
446445
x <- rng
@@ -485,9 +484,9 @@ expectden.phi <- function(basisobj, cvec, Cval=1, nderiv=0,
485484
if (j >= 5) {
486485
ind <- (j-4):j
487486
temp <- smat[ind,]
488-
result <- polintarray(h[ind],temp,0)
489-
ss <- result[[1]]
490-
dss <- result[[2]]
487+
result <- polintarray(h[ind],temp,0)
488+
ss <- result[[1]]
489+
dss <- result[[2]]
491490
if (!any(abs(dss) > EPS*max(abs(ss)))) {
492491
# successful convergence
493492
return(ss)

0 commit comments

Comments
 (0)