Update smooth.monotone.R

gileshooker · web-flow · commit 1198a02a9e2d · 2021-09-10T12:36:47.000-07:00
diff --git a/R/smooth.monotone.R b/R/smooth.monotone.R
@@ -128,13 +128,13 @@ nbasis   <- basisobj$nbasis  #  number of basis functions
 #  set up initial coefficient array
 
 coef0    <- Wfdobj$coefs
-if(length(dim(coef0)) == 2 & nvar != 1){
+if( length(dim(coef0)) == 2 & nvar != 1 ){
 	coef0 = array(0,c(nbasis,ncurve,nvar))
 }
-if( dim(coef0) == 2 & ncol(coef0) != ncurve){
+if( length(dim(coef0)) == 2 & ncol(coef0) != ncurve ){
 	coef0 = matrix(0,nbasis,ncurve)	
 }
-if( dim(coef0) == 3 & (all.equal(dim(coef0)[2:3],c(ncurve,nvar))!=TRUE) ){
+if( length(dim(coef0)) == 3 & (all.equal(dim(coef0)[2:3],c(ncurve,nvar))!=TRUE) ){
 	coef0 = array(0,c(nbasis,ncurve,nvar))	
 }
 # Note that we could be more carefull about this and try to adapt coefficients

Original file line number	Diff line number	Diff line change
`@@ -128,13 +128,13 @@ nbasis <- basisobj$nbasis # number of basis functions`
`128`	`128`	`# set up initial coefficient array`
`129`	`129`
`130`	`130`	`coef0 <- Wfdobj$coefs`
`131`		`-if(length(dim(coef0)) == 2 & nvar != 1){`
	`131`	`+if( length(dim(coef0)) == 2 & nvar != 1 ){`
`132`	`132`	`coef0 = array(0,c(nbasis,ncurve,nvar))`
`133`	`133`	`}`
`134`		`-if( dim(coef0) == 2 & ncol(coef0) != ncurve){`
	`134`	`+if( length(dim(coef0)) == 2 & ncol(coef0) != ncurve ){`
`135`	`135`	`coef0 = matrix(0,nbasis,ncurve)`
`136`	`136`	`}`
`137`		`-if( dim(coef0) == 3 & (all.equal(dim(coef0)[2:3],c(ncurve,nvar))!=TRUE) ){`
	`137`	`+if( length(dim(coef0)) == 3 & (all.equal(dim(coef0)[2:3],c(ncurve,nvar))!=TRUE) ){`
`138`	`138`	`coef0 = array(0,c(nbasis,ncurve,nvar))`
`139`	`139`	`}`
`140`	`140`	`# Note that we could be more carefull about this and try to adapt coefficients`