Skip to content

Commit 3fb5fc4

Browse files
James RamsayJames Ramsay
James Ramsay
authored and
James Ramsay
committed
!(CRAN) files commented out
1 parent 87c52d7 commit 3fb5fc4

14 files changed

+35
-323
lines changed

Diff for: .Rbuildignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ revdep
55
^.*\.Rproj$
66
^\.Rproj\.user$
77
fda_release_to_CRAN.R
8+
^CRAN-SUBMISSION$

Diff for: DESCRIPTION

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Package: fda
22
Version: 6.1.3
3-
Date: 2023-04-24
3+
Date: 2023-04-27
44
Title: Functional Data Analysis
55
Authors@R: c(person("James", "Ramsay",
66
role=c("aut","cre"),
7-
email="james.ramsay@mcgill.ca"),
7+
email="ramsay@psych.mcgill.ca"),
88
person("Giles", "Hooker",
99
role="ctb",
1010
email="gjh27@cornell.edu"),
@@ -29,5 +29,5 @@ Description: These functions were developed to support functional data
2929
License: GPL (>= 2)
3030
URL: http://www.functionaldata.org
3131
LazyData: true
32-
NeedsCompilation: no
32+
NeedsCompilation: yes
3333
VignetteBuilder: knitr

Diff for: NAMESPACE

-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ export(AmpPhaseDecomp,
114114
plotbeta,
115115
plotfit.fd,
116116
plotfit.fdSmooth,
117-
plotreg.fd,
118117
plotscores,
119118
plus.fd,
120119
polyg,

Diff for: R/plotreg.fd.R

-139
This file was deleted.

Diff for: man/as.array3.Rd

+5-4
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,11 @@ as.array3(x)
6767
##
6868
## 4-d array
6969
##
70-
71-
if(!CRAN()) {
72-
as.array3(array(1:24, 1:4))
73-
}
70+
# These lines throw an error because the dimensionality woud be 4
71+
# and as.array3 only allows dimensions 3 or less.
72+
# if(!CRAN()) {
73+
# as.array3(array(1:24, 1:4))
74+
# }
7475
}
7576
\keyword{utilities}
7677

Diff for: man/as.fd.Rd

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ lines(x., eval.fd(x., fn.), col='green', lty='dotted', lwd=3)
113113

114114
if(!CRAN()) {
115115
# Will NOT translate a periodic spline
116-
fp <- splinefun(x, y, method='periodic')
117-
as.fd(fp)
118-
#Error in as.fd.function(fp) :
116+
# fp <- splinefun(x, y, method='periodic')
117+
# as.fd(fp)
118+
# Error in as.fd.function(fp) :
119119
# x (fp) uses periodic B-splines, and as.fd is programmed
120120
# to translate only B-splines with coincident boundary knots.
121121
}

Diff for: man/eval.surp.Rd

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ eval.surp(evalarg, Wfdobj, nderiv = 0)
1919
the set \code{c(0,1,2)}.}
2020
}
2121
\details{A surprisal \code{M}-vector is information measured in \code{M}-bits.
22-
Since a multinomial probability vector must sum to one, it follows that the
23-
surprisal vector \code{S} must satisfy the constraint
22+
Since a multinomial probability vector must sum to one, it follows
23+
that the surprisal vector \code{S} must satisfy the constraint
2424
\code{log_M(sum(M^(-S)) = 0.} That is, surprisal vectors lie within a
2525
curved \code{M-1}-dimensional manifold.
2626

Diff for: man/fd.Rd

+4-3
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,10 @@ all.equal(fd.bspl1.1, fd.bspl1.1a)
106106
\dontshow{ ) }
107107
# TRUE
108108

109-
if(!CRAN()) {
110-
fd.bspl1.1b <- fd(0)
111-
}
109+
# the following three lines shown an error in a non-cran check:
110+
# if(!CRAN()) {
111+
# fd.bspl1.1b <- fd(0)
112+
# }
112113

113114
##
114115
## Cubic spline: 4 basis functions

Diff for: man/fda-package.Rd

-65
This file was deleted.

Diff for: man/norder.Rd

+4-3
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,12 @@ norder(x, ...)
7070
# 21 breaks, 19 interior knots.
7171
stopifnot(norder(create.bspline.basis()) == 4)
7272

73-
if (!CRAN()) {
74-
norder(create.fourier.basis(c(0,12) ))
73+
# these five lines throw an error of for a nocran check
74+
# if (!CRAN()) {
75+
# norder(create.fourier.basis(c(0,12) ))
7576
# Error in norder.bspline(x) :
7677
# object x is of type = fourier; 'norder' is only defined for type = 'bspline'
77-
}
78+
# }
7879

7980
}
8081
\keyword{smooth}

Diff for: man/plotreg.fd.rd

-87
This file was deleted.

0 commit comments

Comments
 (0)