Merge pull request #314 from leoniedu/dodgt-times-pairwise

add pairwise option to dodgr_times.

Author: mpadge

R/times.R

@@ -9,6 +9,7 @@ dodgr_times <- function (graph,
                          from = NULL,
                          to = NULL,
                          shortest = FALSE,
+                         pairwise = FALSE,
                          heap = "BHeap") {
 
     graph <- tbl_to_df (graph)
@@ -29,6 +30,6 @@ dodgr_times <- function (graph,
         }
         graph [[gr_cols$d_weighted]] <- graph [[gr_cols$time_weighted]]
     }
-
-    dodgr_dists (graph, from, to, heap = heap)
-}
+    
+    dodgr_dists (graph = graph, from = from, to = to, heap = heap, pairwise= pairwise)
+}

man/dodgr_times.Rd

@@ -178,6 +178,21 @@ test_that ("times", {
     expect_identical (t2, t0)
 })
 
+test_that ("times-pairwise", {
+    graph <- weight_streetnet (hampi)
+    n <- 50
+    set.seed (1)
+    from <- sample (graph$from_id, size = n)
+    to <- sample (graph$to_id, size = n)
+    expect_silent (d <- dodgr_times (graph, from = from, to = to))
+    expect_equal (dim (d), c (n, n))
+    expect_silent (d <- dodgr_times (graph,
+                                         from = from, to = to,
+                                         pairwise = TRUE
+    ))
+    expect_equal (dim (d), c (50, 1))
+})
+
 test_that ("all dists", {
     graph <- weight_streetnet (hampi)
     graph <- graph [graph$component == 2, ]