Flags to return all values added to function calls in log_derivative …

…function.
khaors · Jul 9, 2019 · 88a8264 · 88a8264
1 parent 6adfd42
commit 88a8264
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ env:
  - R_MAX_NUM_DLLS=999
  - _R_CHECK_FORCE_SUGGESTS_=true
  - _R_CHECK_CRAN_INCOMING_=true
-
+ 
 r_binary_packages:
  - stringi 
  - stringr 

diff --git a/NAMESPACE b/NAMESPACE
@@ -5,7 +5,7 @@ S3method(confint,pumping_test)
 S3method(plot,pumping_test)
 S3method(print,aquifer)
 S3method(print,pumping_test)
-S3method(summary,aquifer)
+S3method(summary,aquifer) 
 S3method(summary,pumping_test)
 export("add.well<-")
 export("additional.parameters<-")

diff --git a/R/utilities.R b/R/utilities.R
@@ -75,22 +75,22 @@ log_derivative <- function(t, s, d = 2, method = 'central', return.pos = T,
  log_d <- log_derivative_spline(t, s, n = d, log)
  }
  else if(method == 'spane'){
- log_d <- log_derivative_spane(t, s, n = d, log)
+ log_d <- log_derivative_spane(t, s, n = d, return.pos, log)
  }
  else if(method == 'smoothspline'){
- log_d <- log_derivative_smoothspline(t, s, log)
+ log_d <- log_derivative_smoothspline(t, s, return.pos, log)
  }
  else if(method == 'kernelreg'){
- log_d <- log_derivative_kernelreg(t, s, bw = d, log)
+ log_d <- log_derivative_kernelreg(t, s, bw = d, return.pos, log)
  }
  else if(method == 'lokern'){
- log_d <- log_derivative_lokern(t, s, log)
+ log_d <- log_derivative_lokern(t, s, return.pos, log)
  }
  else if(method == 'locpol'){
- log_d <- log_derivative_lokern(t, s, log)
+ log_d <- log_derivative_locpol(t, s, return.pos, log)
  }
  else if(method == "lpridge"){
- log_d <- log_derivative_lpridge(t, s, log)
+ log_d <- log_derivative_lpridge(t, s, return.pos, log)
  }
  # else if(method == "wavelet"){
  # log_d <- log_derivative_wavelet(t, s)