From 2faeec0dfeb44633ebad232d59e32e60966bf61b Mon Sep 17 00:00:00 2001 From: carstennh Date: Fri, 28 May 2021 12:37:54 +0200 Subject: [PATCH 1/2] optimize processing time in the sampling routine of model_opt.r --- demo/HabitatSampler.r | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/HabitatSampler.r b/demo/HabitatSampler.r index f912d24..1d8c968 100644 --- a/demo/HabitatSampler.r +++ b/demo/HabitatSampler.r @@ -73,7 +73,7 @@ shp<-readOGR(paste(dataPath,"Example_Reference_Points.shp", sep="")) proj4string(shp)<- "+proj=utm +zone=33 +datum=WGS84 +units=m +no_defs +ellps=WGS84 +towgs84=0,0,0" shp<-spTransform(shp,CRS( "+proj=utm +zone=32 +datum=WGS84 +units=m +no_defs +ellps=WGS84 +towgs84=0,0,0")) ref<-as.data.frame(extract(a1,shp)) - + - ##1.c.1## p <- as(extent(a1), 'SpatialPolygons') -- GitLab From 903261da598f6ac18c5d2045d62f2a5d8efcf6a4 Mon Sep 17 00:00:00 2001 From: carstennh Date: Tue, 1 Jun 2021 18:36:12 +0200 Subject: [PATCH 2/2] optimize processing time in the sampling routine of model_opt.r --- R-package/R/model_opt.r | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/R-package/R/model_opt.r b/R-package/R/model_opt.r index c9c674d..fb19eb9 100644 --- a/R-package/R/model_opt.r +++ b/R-package/R/model_opt.r @@ -58,11 +58,11 @@ model_opt_r <- function(k, } pbt <- spatialEco::point.in.poly(pbt, area)[, 1:n_channel] - #f <- which(is.na(pbt@data[1])) - #if (length(f) != 0) { - # pbt <- pbt[-f,] - #} - pbt@data <- pbt@data[complete.cases(pbt@data[1]), ] + f <- which(is.na(pbt@data[1])) + if (length(f) != 0) { + pbt <- pbt[-f,] + } + set.seed(seed2[k]) classes <- -- GitLab