AdjSD fix

- Equation was using z= cXY+dx+ey+f instead of z = dX+eY+f
ailich · Oct 5, 2021 · 6b24ac2 · 6b24ac2
1 parent 8855223
commit 6b24ac2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: MultiscaleDEM
 Title: Calculates multi-scale geomorphometric terrain attributes from regularly gridded DEM/bathymetry rasters
-Version: 0.0.1
+Version: 0.0.2
 Authors@R: 
      c(
     person(given = "Alexander",

diff --git a/R/AdjSD.R b/R/AdjSD.R
@@ -33,7 +33,7 @@ AdjSD<- function(r, w=c(3,3), na.rm=FALSE, pad=FALSE, include_scale=FALSE){
   y<- as.vector(y_mat)
 
   #Explanatory Variable matrix X for linear fit
-  X<- X<- cbind(1, x*y, x, y)
+  X<- cbind(1, x, y)
 
   if(pad==TRUE){
     if(na.rm==FALSE){

diff --git a/README_files/figure-gfm/unnamed-chunk-14-1.png b/README_files/figure-gfm/unnamed-chunk-14-1.png
diff --git a/src/cpp_code.cpp b/src/cpp_code.cpp
@@ -160,8 +160,8 @@ NumericVector C_multiscale1(NumericMatrix r, IntegerVector w, NumericMatrix X, b
   NumericVector out = NumericVector(n_elem); //SD Residuals
   out.fill(NA_REAL);
 
-  //NEED AT LEAST 4 POINTS TO CALCULATE BECAUSE NEED AS MANY POINTS AS PARAMETERS
-  int thresh = 4;
+  //NEED AT LEAST 3 POINTS TO CALCULATE BECAUSE NEED AS MANY POINTS AS PARAMETERS
+  int thresh = 3;
   for(int i = min_row; i< max_row; ++i) {
     for(int j = min_col; j < max_col; ++j){
       IntegerVector idx = IntegerVector(2);