Spane method for derivative calculation included in the flow dimensio…

…n calculation.
khaors · Nov 13, 2019 · ab7372b · ab7372b
1 parent 88a8264
commit ab7372b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/R/flow_dimension_utilities.R b/R/flow_dimension_utilities.R
@@ -73,12 +73,12 @@ flow_dimension <- function(t, s, d = 2, method = "central"){
  # flow_dim <- log_derivative_spline(t, y, n = d)
  # flow_dim$n <- 2-2*flow_dim$y
  # }
- # else if(method == 'spane'){
- # log_d <- log_derivative_spane(t, s, n = d)
- #  y <- log(log_d$y)
- # flow_dim <- log_derivative_spane(t, y, n = d)
- #  flow_dim$n <- 2-2*flow_dim$y
- # }
+ else if(method == 'spane'){
+  log_d <- log_derivative_spane(t, s, n = d, return.pos = F)
+ y <- log(log_d$y)
+  flow_dim <- log_derivative_horner(t, y, return.pos = F)
+ flow_dim$n <- 2-2*flow_dim$y
+ }
  else if(method == 'smoothspline'){
  res1a <- log_derivative_smoothspline(t, s, return.pos = F, 
  log = F)