Merge pull request #232 from UrbanAnalyst/pairwise-flows

from/to as coord matrices for #229

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dodgr
 Title: Distances on Directed Graphs
-Version: 0.4.0.011
+Version: 0.4.0.014
 Authors@R: c(
     person("Mark", "Padgham", , "[email protected]", role = c("aut", "cre")),
     person("Andreas", "Petutschnig", role = "aut"),

R/dists.R

@@ -227,6 +227,10 @@ get_index_id_cols <- function (graph,
             is.matrix (pts) ||
             is.data.frame (pts)) {
             index <- get_pts_index (graph, gr_cols, vert_map, pts)
+            if ((is.matrix (pts) || is.data.frame (pts)) &&
+                !any (duplicated (index))) {
+                rownames (pts) <- vert_map$vert [index]
+            }
         } else {
             stop (
                 "routing points are of unknown form; must be either ",

R/flows.R

@@ -202,19 +202,7 @@ dodgr_flows_aggregate <- function (graph,
         stop ("flows matrix is not compatible with 'from'/'to' arguments")
     }
     if (pairwise) {
-        if (length (from) != length (to)) {
-            stop (
-                "'from' and 'to' must be the same length ",
-                "when using 'pairwise = TRUE'.",
-                call. = FALSE
-            )
-        }
-        if (nrow (flows) != length (from)) {
-            stop (
-                "'flows' must be the same length as 'from' and 'to'",
-                call. = FALSE
-            )
-        }
+        check_pairwise_from_to (from, to, flows)
     }
 
     if (!quiet) {
@@ -597,6 +585,26 @@ check_k <- function (k, from) {
     list (k = k, nk = nk)
 }
 
+check_pairwise_from_to <- function (from, to, flows) {
+
+    nf <- ifelse (is.vector (from), length (from), nrow (from))
+    nt <- ifelse (is.vector (to), length (to), nrow (to))
+
+    if (nf != nt) {
+        stop (
+            "'from' and 'to' must be the same length or dimensions",
+            "when using 'pairwise = TRUE'.",
+            call. = FALSE
+        )
+    }
+    if (nrow (flows) != nf) {
+        stop (
+            "'flows' must be the same length or dimensions as 'from' and 'to'",
+            call. = FALSE
+        )
+    }
+}
+
 get_random_prefix <- function (prefix = "flow",
                                n = 5) {
 

codemeta.json

@@ -11,7 +11,7 @@
   "codeRepository": "https://github.com/UrbanAnalyst/dodgr",
   "issueTracker": "https://github.com/UrbanAnalyst/dodgr/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.4.0.011",
+  "version": "0.4.0.014",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",