Skip to content

Commit

Permalink
!(CRAN) files commented out
Browse files Browse the repository at this point in the history
  • Loading branch information
James Ramsay authored and James Ramsay committed Apr 27, 2023
1 parent 87c52d7 commit 3fb5fc4
Show file tree
Hide file tree
Showing 14 changed files with 35 additions and 323 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Expand Up @@ -5,3 +5,4 @@ revdep
^.*\.Rproj$
^\.Rproj\.user$
fda_release_to_CRAN.R
^CRAN-SUBMISSION$
6 changes: 3 additions & 3 deletions DESCRIPTION
@@ -1,10 +1,10 @@
Package: fda
Version: 6.1.3
Date: 2023-04-24
Date: 2023-04-27
Title: Functional Data Analysis
Authors@R: c(person("James", "Ramsay",
role=c("aut","cre"),
email="james.ramsay@mcgill.ca"),
email="ramsay@psych.mcgill.ca"),
person("Giles", "Hooker",
role="ctb",
email="gjh27@cornell.edu"),
Expand All @@ -29,5 +29,5 @@ Description: These functions were developed to support functional data
License: GPL (>= 2)
URL: http://www.functionaldata.org
LazyData: true
NeedsCompilation: no
NeedsCompilation: yes
VignetteBuilder: knitr
1 change: 0 additions & 1 deletion NAMESPACE
Expand Up @@ -114,7 +114,6 @@ export(AmpPhaseDecomp,
plotbeta,
plotfit.fd,
plotfit.fdSmooth,
plotreg.fd,
plotscores,
plus.fd,
polyg,
Expand Down
139 changes: 0 additions & 139 deletions R/plotreg.fd.R

This file was deleted.

9 changes: 5 additions & 4 deletions man/as.array3.Rd
Expand Up @@ -67,10 +67,11 @@ as.array3(x)
##
## 4-d array
##

if(!CRAN()) {
as.array3(array(1:24, 1:4))
}
# These lines throw an error because the dimensionality woud be 4
# and as.array3 only allows dimensions 3 or less.
# if(!CRAN()) {
# as.array3(array(1:24, 1:4))
# }
}
\keyword{utilities}

6 changes: 3 additions & 3 deletions man/as.fd.Rd
Expand Up @@ -113,9 +113,9 @@ lines(x., eval.fd(x., fn.), col='green', lty='dotted', lwd=3)

if(!CRAN()) {
# Will NOT translate a periodic spline
fp <- splinefun(x, y, method='periodic')
as.fd(fp)
#Error in as.fd.function(fp) :
# fp <- splinefun(x, y, method='periodic')
# as.fd(fp)
# Error in as.fd.function(fp) :
# x (fp) uses periodic B-splines, and as.fd is programmed
# to translate only B-splines with coincident boundary knots.
}
Expand Down
4 changes: 2 additions & 2 deletions man/eval.surp.Rd
Expand Up @@ -19,8 +19,8 @@ eval.surp(evalarg, Wfdobj, nderiv = 0)
the set \code{c(0,1,2)}.}
}
\details{A surprisal \code{M}-vector is information measured in \code{M}-bits.
Since a multinomial probability vector must sum to one, it follows that the
surprisal vector \code{S} must satisfy the constraint
Since a multinomial probability vector must sum to one, it follows
that the surprisal vector \code{S} must satisfy the constraint
\code{log_M(sum(M^(-S)) = 0.} That is, surprisal vectors lie within a
curved \code{M-1}-dimensional manifold.

Expand Down
7 changes: 4 additions & 3 deletions man/fd.Rd
Expand Up @@ -106,9 +106,10 @@ all.equal(fd.bspl1.1, fd.bspl1.1a)
\dontshow{ ) }
# TRUE

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

##
## Cubic spline: 4 basis functions
Expand Down
65 changes: 0 additions & 65 deletions man/fda-package.Rd

This file was deleted.

7 changes: 4 additions & 3 deletions man/norder.Rd
Expand Up @@ -70,11 +70,12 @@ norder(x, ...)
# 21 breaks, 19 interior knots.
stopifnot(norder(create.bspline.basis()) == 4)

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

}
\keyword{smooth}
87 changes: 0 additions & 87 deletions man/plotreg.fd.rd

This file was deleted.

0 comments on commit 3fb5fc4

Please sign in to comment.