update

land-info-lab · Oct 30, 2023 · 224bf36 · 224bf36
1 parent dad885a
commit 224bf36
Showing 1 changed file with 39 additions and 43 deletions.
diff --git a/src/multiLabel.cpp b/src/multiLabel.cpp
@@ -20,58 +20,54 @@ Rcpp::List multiLabel(Rcpp::NumericMatrix &vpts,
   Rcpp::List output(vptnum);
   #ifdef _WIN32
     #pragma omp parallel shared(output, dsm_list, max_dis, vpth, h, vptnum) num_threads(workers)
-      {
-        //#pragma omp schedule(static) for
-        {
-          for (int i = 0; i < vptnum; i++) {
-            const Rcpp::NumericMatrix sub_dsm = dsm_list[i];
-            int vx = vpts(i,0);
-            int vy = vpts(i,1);
-            const double vz = vpts(i,2) + vpth;
+      for (int i = 0; i < vptnum; i++) {
+        const Rcpp::NumericMatrix sub_dsm = dsm_list[i];
+        int vx = vpts(i,0);
+        int vy = vpts(i,1);
+        const double vz = vpts(i,2) + vpth;
 
-            Rcpp::NumericVector zl;
-            Rcpp::NumericVector xl;
-            Rcpp::NumericVector yl;
+        Rcpp::NumericVector zl;
+        Rcpp::NumericVector xl;
+        Rcpp::NumericVector yl;
 
-            const int sub_rows = sub_dsm.nrow();
-            const int sub_cols = sub_dsm.ncol();
+        const int sub_rows = sub_dsm.nrow();
+        const int sub_cols = sub_dsm.ncol();
 
-            int steps;
-            Rcpp::IntegerMatrix visible(sub_rows, sub_cols);
-            for (int j = 0; j < sub_rows; j++) {
-              for (int k = 0; k < sub_cols; k++) {
-                steps = sqrt((vx-k)*(vx-k) + (vy-j)*(vy-j));
-                const double z = sub_dsm(j,k) + h;
-                if (steps <= max_dis) {
-                  Rcpp::NumericVector sequence(steps);
-                  std::iota(sequence.begin(), sequence.end(), 1);
-                  xl = vx + sequence * (k-vx)/steps;
-                  yl = vy + sequence * (j-vy)/steps;
+        int steps;
+        Rcpp::IntegerMatrix visible(sub_rows, sub_cols);
+        #pragma omp critical
+        for (int j = 0; j < sub_rows; j++) {
+          for (int k = 0; k < sub_cols; k++) {
+            steps = sqrt((vx-k)*(vx-k) + (vy-j)*(vy-j));
+            const double z = sub_dsm(j,k) + h;
+            if (steps <= max_dis) {
+              Rcpp::NumericVector sequence(steps);
+              std::iota(sequence.begin(), sequence.end(), 1);
+              xl = vx + sequence * (k-vx)/steps;
+              yl = vy + sequence * (j-vy)/steps;
 
-                  if(vz<z) {
-                    zl = vz + sequence/steps*fabs(vz-z);
-                  } else if (vz>z) {
-                    zl = vz - sequence/steps*fabs(vz-z);
-                  } else if (vz==z) {
-                    zl = vz + 0*sequence;
-                  }
-                  int temp = 1;
-                  for (int p = 0; p < steps; p++) {
-                    const double d = zl[p] - sub_dsm(yl[p],xl[p]);
-                    if (d < 0) {
-                      temp = 0;
-                      break;
-                    }
-                  }
-                  visible(j,k) = temp;
-                } else {
-                  visible(j,k) = 0;
+              if(vz<z) {
+                zl = vz + sequence/steps*fabs(vz-z);
+              } else if (vz>z) {
+                zl = vz - sequence/steps*fabs(vz-z);
+              } else if (vz==z) {
+                zl = vz + 0*sequence;
+              }
+              int temp = 1;
+              for (int p = 0; p < steps; p++) {
+                const double d = zl[p] - sub_dsm(yl[p],xl[p]);
+                if (d < 0) {
+                  temp = 0;
+                  break;
                 }
               }
+              visible(j,k) = temp;
+            } else {
+              visible(j,k) = 0;
             }
-            output[i] = visible;
           }
         }
+        output[i] = visible;
       }
   #endif
   return output;