- update

land-info-lab · Jan 26, 2024 · e017111 · e017111
1 parent 9fefde6
commit e017111
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 101 deletions.
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -5,10 +5,6 @@ get_depths <- function(px, py, x, y, num) {
     .Call('_viewscape_get_depths', PACKAGE = 'viewscape', px, py, x, y, num)
 }
 
-multiLabel <- function(vpts, dsm, max_dis, vpth, h) {
-    .Call('_viewscape_multiLabel', PACKAGE = 'viewscape', vpts, dsm, max_dis, vpth, h)
-}
-
 visibleLabel <- function(viewpoint, dsm, h, max_dis) {
     .Call('_viewscape_visibleLabel', PACKAGE = 'viewscape', viewpoint, dsm, h, max_dis)
 }

diff --git a/R/compute_viewshed.R b/R/compute_viewshed.R
@@ -144,10 +144,6 @@ compute_viewshed <- function(dsm,
       # inputs <- split(viewpoints,seq(nrow(viewpoints)))
       if (isTRUE(Sys.info()[1]=="Windows") == TRUE){
         workers = 1
-        # viewsheds <- radius_viewshed_m(dsm=dsm,
-        #                                r=r,
-        #                                viewPts=viewpoints,
-        #                                offset=offset_viewpoint)
       }
       suppressWarnings(
         viewsheds <- paral_nix(X = inputs,
@@ -157,19 +153,6 @@ compute_viewshed <- function(dsm,
                                workers = workers)
       )
     } else {
-      # if (isTRUE(Sys.info()[1]=="Windows") == TRUE){
-      #   viewsheds <- c()
-      #   for(i in 1:length(viewpoints[,1])){
-      #     viewpoint <- c(viewpoints[i,1],viewpoints[i,2])
-      #     output <- radius_viewshed(dsm, r, viewpoint, offset_viewpoint)
-      #     viewsheds <- c(viewsheds, output)
-      #   }
-      # } else {
-      #   viewsheds <- radius_viewshed_m(dsm=dsm,
-      #                                  r=r,
-      #                                  viewPts=viewpoints,
-      #                                  offset=offset_viewpoint)
-      # }
       suppressWarnings(
         viewsheds <- paral_nix(X = inputs,
                                dsm = dsm,

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -25,21 +25,6 @@ BEGIN_RCPP
     return rcpp_result_gen;
 END_RCPP
 }
-// multiLabel
-Rcpp::List multiLabel(Rcpp::NumericMatrix& vpts, Rcpp::List& dsm, const int max_dis, const double vpth, const double h);
-RcppExport SEXP _viewscape_multiLabel(SEXP vptsSEXP, SEXP dsmSEXP, SEXP max_disSEXP, SEXP vpthSEXP, SEXP hSEXP) {
-BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
-    Rcpp::traits::input_parameter< Rcpp::NumericMatrix& >::type vpts(vptsSEXP);
-    Rcpp::traits::input_parameter< Rcpp::List& >::type dsm(dsmSEXP);
-    Rcpp::traits::input_parameter< const int >::type max_dis(max_disSEXP);
-    Rcpp::traits::input_parameter< const double >::type vpth(vpthSEXP);
-    Rcpp::traits::input_parameter< const double >::type h(hSEXP);
-    rcpp_result_gen = Rcpp::wrap(multiLabel(vpts, dsm, max_dis, vpth, h));
-    return rcpp_result_gen;
-END_RCPP
-}
 // visibleLabel
 Rcpp::IntegerMatrix visibleLabel(const Rcpp::NumericVector& viewpoint, const Rcpp::NumericMatrix& dsm, const double h, const int max_dis);
 RcppExport SEXP _viewscape_visibleLabel(SEXP viewpointSEXP, SEXP dsmSEXP, SEXP hSEXP, SEXP max_disSEXP) {
@@ -57,7 +42,6 @@ END_RCPP
 
 static const R_CallMethodDef CallEntries[] = {
     {"_viewscape_get_depths", (DL_FUNC) &_viewscape_get_depths, 5},
-    {"_viewscape_multiLabel", (DL_FUNC) &_viewscape_multiLabel, 5},
     {"_viewscape_visibleLabel", (DL_FUNC) &_viewscape_visibleLabel, 4},
     {NULL, NULL, 0}
 };

diff --git a/src/RcppExports.o b/src/RcppExports.o
diff --git a/src/multiLabel.cpp b/src/multiLabel.cpp
diff --git a/src/viewscape.so b/src/viewscape.so