update predict for srvf option

jdtuck · Dec 30, 2024 · bbe39cc · bbe39cc
1 parent 6f8276e
commit bbe39cc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/R/jointfPCA.R b/R/jointfPCA.R
@@ -336,6 +336,7 @@ jointFPCAh <- function(warp_data,
         Psi_h = Psi_h,
         sz = sz,
         eigs = out.Zo$d,
+        srvf = srvf,
         U = U,
         Uh = Uh,
         Uz = Uz

diff --git a/R/predict.jfpcah.R b/R/predict.jfpcah.R
@@ -16,6 +16,7 @@ predict.jfpcah <- function(object, newdata = NULL, ...) {
   if (is.null(newdata)) {
     newdata = object$warp_data$f0
   }
+
   q1 = f_to_srvf(newdata, object$warp_data$time)
   M = length(object$warp_data$time)
   N = ncol(newdata)
@@ -34,8 +35,16 @@ predict.jfpcah <- function(object, newdata = NULL, ...) {
     qn[, ii] = f_to_srvf(fn[, ii], object$warp_data$time)
   }
 
-  m_new <- sign(fn[object$id, ]) * sqrt(abs(fn[object$id, ]))  # scaled version
-  qn1 <- rbind(qn, m_new)
+  if (object$srvf){
+
+    m_new <- sign(fn[object$id, ]) * sqrt(abs(fn[object$id, ]))  # scaled version
+    qn1 <- rbind(qn, m_new)
+
+  } else {
+
+    qn1 <- fn
+
+  }
 
   C <- object$C
 
@@ -48,5 +57,6 @@ predict.jfpcah <- function(object, newdata = NULL, ...) {
 
   a = Xi %*% object$Uz
 
+
   return(a)
 }