Did Jim make changes that I failed to pull?

Merge branch 'master' of github.com:JamesRamsay5/fda

ranch 'master' of github.com:JamesRamsay5/fda

Author: sbgraves237

.Rhistory

@@ -1,10 +1,3 @@
-betabasis2  <- create.fourier.basis(c(0, 365), nbetabasis)
-betafd2     <- fd(matrix(0,nbetabasis,1), betabasis2)
-lambda        <- 10^12.5
-harmaccelLfd365 <- vec2Lfd(c(0,(2*pi/365)^2,0), c(0, 365))
-betafdPar2    <- fdPar(betafd2, harmaccelLfd365, lambda)
-betalist[[2]] <- betafdPar2
-F.res2 = Fperm.fd(annualprec, xfdlist, betalist, nperm=10)
 Knots  <- growth$age
 norder <- 6
 nbasis <- length(Knots) + norder - 2
@@ -510,3 +503,10 @@ q()
 q()
 q()
 setwd("fda_work/fda")
+library(Data2LD)
+class(temp)
+temp
+q()
+q()
+getwd()
+q()

R/fRegress.R

@@ -5,7 +5,7 @@ fRegress <- function(y, ...) {
 #  ---------------------------------------------------------------
 
 #fRegress
-fRegressCommentFn <- 
+fRegress <- 
   function(y, xfdlist, betalist, wt=NULL,
            y2cMap=NULL, SigmaE=NULL, returnMatrix=FALSE){
 
@@ -67,7 +67,7 @@ fRegressCommentFn <-
   #  as predict(fRegressList).  In this call fRegressList can be any object of the
   #  "fRegress".
 
-#  Last modified 7 August 2020 by Jim Ramsay
+#  Last modified 11 August 2020 by Jim Ramsay
 
 arglist <- fRegressArgCheck(y, xfdlist, betalist, wt)
 

R/fRegress.numeric.R

@@ -36,25 +36,25 @@ fRegress.numeric <- function(y, xfdlist, betalist, wt=NULL,
   #               supplied, confidence limits are computed, otherwise not.
   #  SIGMAE   ... Estimate of the covariances among the residuals.  This
   #               can only be estimated after a preliminary analysis
-  #               with FREGRESS.
+  #               with .
   #  RETURNMATRIX ... If False, a matrix in sparse storage model can be returned
   #               from a call to function BsplineS.  See this function for
   #               enabling this option.
   #
-  #  Returns FREGRESSLIST  ... A list containing seven members with names:
-  #    yfdPar      ... first  argument of FREGRESS
-  #    xfdlist     ... second argument of FREGRESS
-  #    betalist    ... third  argument of FREGRESS
+  #  Returns LIST  ... A list containing seven members with names:
+  #    yfdPar      ... first  argument of 
+  #    xfdlist     ... second argument of 
+  #    betalist    ... third  argument of 
   #    betaestlist ... estimated regression functions
   #    yhatfdobj   ... functional data object containing fitted functions
   #    Cmatinv     ... inverse of the coefficient matrix, needed for
-  #                    function FREGRESS.STDERR that computes standard errors
+  #                    function .STDERR that computes standard errors
   #    wt          ... weights for observations
   #    df          ... degrees of freedom for fit
-  #  This list object is converted to a class with the name "fRegress"
-  #  function predict.fRegress is an example of a method that can be called simply
-  #  as predict(fRegressList).  In this call fRegressList can be any object of the
-  #  "fRegress".
+  #  This list object is converted to a class with the name ""
+  #  function predict. is an example of a method that can be called simply
+  #  as predict(List).  In this call List can be any object of the
+  #  "".
 
   # Last modified 3 July 2020 by Jim Ramsay
 
@@ -411,7 +411,7 @@ fRegress.numeric <- function(y, xfdlist, betalist, wt=NULL,
     #                       Set up output list object
     #  -------------------------------------------------------------------
 
-    fRegressList <-
+    List <-
       list(yfdPar         = yfdPar,
            xfdlist        = xfdlist,
            betalist       = betalist,
@@ -617,7 +617,7 @@ fRegress.numeric <- function(y, xfdlist, betalist, wt=NULL,
     #                  Set up output list object
     #  -----------------------------------------------------------------------
 
-    fRegressList <-
+    List <-
       list(yfdPar      = yfdPar,
            xfdlist     = xfdlist,
            betalist    = betalist,
@@ -630,7 +630,7 @@ fRegress.numeric <- function(y, xfdlist, betalist, wt=NULL,
            gcv         = GCV)
   }
 
-  class(fRegressList) <- "fRegress"
+  class(List) <- "fRegress"
 
   return(fRegressList)