fix comparison of class to string

Author: James Ramsay

R/as.POSIXct1970.R

@@ -2,7 +2,7 @@ as.POSIXct1970 <- function(x, tz="GMT", ...){
 #
   if(!is.numeric(x)){
     Px <- try(as.POSIXct(x, tz=tz, ...))
-    if(class(Px)[1]=='try-error'){
+    if(inherits(Px,'try-error')){
       nx <- length(x)
       Px <- rep(as.POSIXct1970(0), nx)
     }

R/checkLogicalInteger.R

@@ -28,7 +28,7 @@ checkLogical <- function(x, length., warnOnly=FALSE) {
 ##
 ## 3.  check class(x)
 ##  
-  if(class(x) != 'logical')
+  if(!inherits(x, 'logical'))
     good <- (good & onExit('class(', xName, ') = ', class(x),
                    ";  should be 'logical'")) 
 ##

R/cor.fd.R

@@ -17,7 +17,6 @@ cor.fd <- function(evalarg1, fdobj1, evalarg2=evalarg1, fdobj2=fdobj1)
 ##
 ## 2.  Evaluate var1 at evalarg1 
 ##
-  print(class(var1))
   evalVar1 <- eval.bifd(evalarg1, evalarg1, var1)
 ##
 ## 3.  If missing(fdobj2) convert evalVar1 to correlations 

R/create.bspline.basis.R

@@ -114,21 +114,6 @@ create.bspline.basis <- function (rangeval=NULL, nbasis=NULL,
 
   type        <- "bspline"
 
-#  if (nargs()==0) {
-#    rangeval    <- c(0,1)
-#    nbasis      <- 2
-#    params      <- NULL
-#    dropind     <- NULL
-#    quadvals    <- NULL
-#    values      <- NULL
-#    basisvalues <- NULL
-#    basisobj  <- list(type=type, rangeval=rangeval, nbasis=nbasis,
-#                  params=params, dropind=dropind,   quadvals=quadvals,
-#                  values=values, basisvalues=basisvalues, names=names)
-#    oldClass(basisobj) <- "basisfd"
-#    return(basisobj)
-#  }
-
 #  ------------------------------------------------------------------------
 #                     Set up non-default basis
 #  ------------------------------------------------------------------------
@@ -194,10 +179,6 @@ create.bspline.basis <- function (rangeval=NULL, nbasis=NULL,
              rangeval)
       rangeval = c(0,rangeval)
   }
-#  if (!rangechk(rangeval)) stop("Argument 'rangeval' is not correct.")
-#  if(!is.vector(rangeval))
-#    stop('rangeval is not a vector;  class(rangeval) = ',
-#         class(rangeval))
 # rangeval too long ???
   if(length(rangeval)>2){
     if(!is.null(breaks))

R/create.fourier.basis.R

@@ -78,20 +78,6 @@ create.fourier.basis <- function (rangeval=c(0,1), nbasis=3,
 #  Default basis for missing arguments
 
   type        <- "fourier"
-#if (nargs()==0) {
-#    rangeval    <- c(0,1)
-#    nbasis      <- 3
-#    params      <- 1
-#    dropind     <- vector("numeric",0)
-#    quadvals    <- matrix("numeric",0,0)
-#    values      <- vector("list",0)
-#    basisvalues <- vector("list",0)
-#    basisobj  <- list(type=type,     rangeval=rangeval, nbasis=nbasis,
-#                      params=params, dropind=dropind,   quadvals=quadvals,
-#                      values=values, basisvalues=basisvalues)
-#    oldClass(basisobj) <- "basisfd"
-#    return(basisobj)
-#}
 ##
 ## 1.  check RANGEVAL
 ##

R/create.monomial.basis.R

@@ -4,7 +4,7 @@ create.monomial.basis <- function(rangeval=c(0,1), nbasis=NULL,
                 axes=NULL)
 {
 #  CREATE_MONOMIAL_BASIS  Creates a monomial basis:, x^i_1, x^i_2, ...
-#  The exponents in this version must be nonnegative integers
+#  The exponents in this version must be non-negative integers
 #  Argument:
 #  RANGEVAL ...an array of length 2 containing the lower and upper
 #              boundaries for the rangeval of argument values.  If a
@@ -73,7 +73,7 @@ create.monomial.basis <- function(rangeval=c(0,1), nbasis=NULL,
 # Return:
 # BASISOBJ  ...a functional data basis object of type "monom"
 #
-# last modified July 7, 2012 by Spencer Graves.
+# last modified July 25, 2022
 #   for rangeval of class Date and POSIXct
 #  Default basis for missing arguments
 
@@ -84,9 +84,6 @@ create.monomial.basis <- function(rangeval=c(0,1), nbasis=NULL,
   op <- options(warn=-1)
   Rangeval <- as.numeric(rangeval)
   options(op)
-#  if(!is.numeric(rangeval)){
-#    stop('rangaval must be numeric;  class(rangeval) = ',
-#         class(rangeval) )
   if(length(rangeval)<1)
     stop('rangeval must be a numeric vector of length 2;  ',
          'length(rangeval) = 0.')

R/fdPar.R

@@ -1,10 +1,3 @@
-#  setClass for "fdPar"
-
-# setClass("fdPar", representation(fd       = "fd",
-#                                  Lfd      = "Lfd",
-#                                  lambda   = "numeric",
-#                                  estimate = "logical",
-#                                  penmat   = "matrix",))
 
 #  Generator function of class fdPar