PERF: minor update to rvcoef calc and ba_svd

stnava · stnava · commit e56c2e2a99b0 · 2024-10-11T11:58:13.000-04:00
diff --git a/R/multiscaleSVDxpts.R b/R/multiscaleSVDxpts.R
@@ -22,11 +22,15 @@
 ba_svd <- function(x, nu = min(nrow(x), ncol(x)), nv = min(nrow(x), ncol(x)), dividebymax=FALSE ) {
   tryCatch(
     expr = {
-      svd(x/max(x), nu = nu, nv = nv)
+      if ( dividebymax) {
+        svd(x/max(x), nu = nu, nv = nv)
+      } else svd(x, nu = nu, nv = nv)
     },
     error = function(e) {
       message("svd failed, using rsvd instead")
-      rsvd(x/max(x), nu = nu, nv = nv)
+      if ( dividebymax) {
+        rsvd(x/max(x), nu = nu, nv = nv)
+      } else rsvd(x, nu = nu, nv = nv)
     }
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,15 @@`
`22`	`22`	`ba_svd <- function(x, nu = min(nrow(x), ncol(x)), nv = min(nrow(x), ncol(x)), dividebymax=FALSE ) {`
`23`	`23`	`tryCatch(`
`24`	`24`	`expr = {`
`25`		`- svd(x/max(x), nu = nu, nv = nv)`
	`25`	`+ if ( dividebymax) {`
	`26`	`+ svd(x/max(x), nu = nu, nv = nv)`
	`27`	`+ } else svd(x, nu = nu, nv = nv)`
`26`	`28`	`},`
`27`	`29`	`error = function(e) {`
`28`	`30`	`message("svd failed, using rsvd instead")`
`29`		`- rsvd(x/max(x), nu = nu, nv = nv)`
	`31`	`+ if ( dividebymax) {`
	`32`	`+ rsvd(x/max(x), nu = nu, nv = nv)`
	`33`	`+ } else rsvd(x, nu = nu, nv = nv)`
`30`	`34`	`}`
`31`	`35`	`)`
`32`	`36`	`}`