fix other parallel categorical dists aggregators for #201

UrbanAnalyst · May 8, 2023 · 2b4fe95 · 2b4fe95
1 parent 8a78c91
commit 2b4fe95
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: dodgr
 Title: Distances on Directed Graphs
-Version: 0.2.20.016
+Version: 0.2.20.017
 Authors@R: c(
     person("Mark", "Padgham", , "mark.padgham@email.com", role = c("aut", "cre")),
     person("Andreas", "Petutschnig", role = "aut"),

diff --git a/codemeta.json b/codemeta.json
@@ -7,7 +7,7 @@
   "codeRepository": "https://github.com/ATFutures/dodgr",
   "issueTracker": "https://github.com/ATFutures/dodgr/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.2.20.016",
+  "version": "0.2.20.017",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",

diff --git a/src/run_sp_categorical.cpp b/src/run_sp_categorical.cpp
@@ -160,14 +160,11 @@ struct OnePairedCategoricalDist : public RcppParallel::Worker
             }
             pathfinder->AStarEdgeType (d, w, prev, heuristic, from_i, to_i);
 
-            if (w [to_i [0]] < INFINITE_DOUBLE)
+            for (size_t k = 0; k <= num_edge_types; k++)
             {
-                for (size_t k = 0; k < num_edge_types; k++)
-                {
-                    const double dto = d [to_i [0] + k * nverts];
-                    if (dto < INFINITE_DOUBLE)
-                        dout (i, k) = dto;
-                }
+                const double dto = d [to_i [0] + k * nverts];
+                if (dto < INFINITE_DOUBLE)
+                    dout (i, k) = dto;
             }
         }
     }
@@ -236,17 +233,14 @@ struct OneCategory : public RcppParallel::Worker
 
             for (size_t j = 0; j < toi.size (); j++)
             {
-                if (w [toi [j]] < INFINITE_DOUBLE)
+                for (size_t k = 0; k <= num_edge_types; k++)
                 {
-                    for (size_t k = 0; k <= num_edge_types; k++)
-                    {
-                        const double dto = d [toi [j] + k * nverts];
-                        if (dto < INFINITE_DOUBLE) {
-                            if (Rcpp::NumericMatrix::is_na (dout (i, k)))
-                                dout (i, k) = dto;
-                            else
-                                dout (i, k) += dto;
-                        }
+                    const double dto = d [toi [j] + k * nverts];
+                    if (dto < INFINITE_DOUBLE) {
+                        if (Rcpp::NumericMatrix::is_na (dout (i, k)))
+                            dout (i, k) = dto;
+                        else
+                            dout (i, k) += dto;
                     }
                 }
             }