three modified files restored

Author: JamesRamsay5

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: fda
-Version: 5.1.2
-Date: 2020-04-13
+Version: 5.1.3
+Date: 2020-04-16
 Title: Functional Data Analysis
 Author: J. O. Ramsay <ramsay@psych.mcgill.ca> [aut,cre], 
  Spencer Graves <spencer.graves@effectivedefense.org> [ctb], 

NAMESPACE

@@ -1,5 +1,6 @@
 export(AmpPhaseDecomp,
        as.array3,
+       as.fd,
        as.POSIXct1970,
        axisIntervals, 
        axesIntervals,
@@ -53,6 +54,7 @@ export(AmpPhaseDecomp,
        exponpen,
        fd, fbplot,
        fd2list,
+       fdaMatlabPath,
        fdlabels,
        fdPar,
        fourier,

man/register.fd.Rd

@@ -169,8 +169,8 @@ smBv <- deriv.fd(hgtmfd.all, 1)
 ## 2.  Register the first 2 Berkeley boys using the default basis
 ##     for the warping function
 ##
-# register.fd takes time, so use only 2 curves as an illustration
-# to minimize compute time in these examples
+# register.fd takes time, so we use only 2 curves as an illustration
+# to minimize computing time in these examples
 nBoys <- 2
 #  Define the target function as the mean of the first nBoys records
 smBv0 = mean.fd(smBv[1:nBoys])
@@ -189,6 +189,7 @@ plotreg.fd(smB.reg.0)
 #  Notice that all the warping functions all have simple shapes
 #  due to the use of the simplest possible basis
 
+if (!CRAN()) {
 ##
 ## 3.  Define a more flexible basis for the warping functions
 ##
@@ -203,7 +204,6 @@ smB.reg.1 <- register.fd(smBv0, smBv[1:nBoys], WfdParobj)
 plotreg.fd(smB.reg.1)
 #  Notice that now the warping functions can have more complex shapes
 
-\dontrun{
 ##
 ## 4.  Change the target to the mean of the registered functions ...
 ##     this should provide a better target for registration