Skip to content

Commit

Permalink
update docs for input graph param types; closes #220
Browse files Browse the repository at this point in the history
  • Loading branch information
mpadge committed May 17, 2024
1 parent d99192a commit 2780067
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 15 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: dodgr
Title: Distances on Directed Graphs
Version: 0.3.0.022
Version: 0.3.0.023
Authors@R: c(
person("Mark", "Padgham", , "mark.padgham@email.com", role = c("aut", "cre")),
person("Andreas", "Petutschnig", role = "aut"),
Expand Down
4 changes: 3 additions & 1 deletion R/dists.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#' Calculate matrix of pair-wise distances between points.
#'
#' @param graph `data.frame` or equivalent object representing the network
#' graph (see Notes)
#' graph (see Notes). For `dodgr` street networks, this may be a network derived
#' from either \pkg{sf} or \pkg{silicate} ("sc") data, generated with
#' \link{weight_streetnet}.
#' @param from Vector or matrix of points **from** which route distances are to
#' be calculated (see Notes)
#' @param to Vector or matrix of points **to** which route distances are to be
Expand Down
12 changes: 11 additions & 1 deletion R/iso.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
#' and vectors defining multiple isodistances.
#'
#' @param graph `data.frame` or equivalent object representing the network
#' graph (see Notes)
#' graph. For `dodgr` street networks, this may be a network derived from either
#' \pkg{sf} or \pkg{silicate} ("sc") data, generated with
#' \link{weight_streetnet}.
#' @param from Vector or matrix of points **from** which isodistances are to
#' be calculated.
#' @param dlim Vector of desired limits of isodistances in metres.
Expand Down Expand Up @@ -128,6 +130,10 @@ iso_pre <- function (graph, from = NULL, heap = "BHeap", contract = TRUE) {
#'
#' @inherit dodgr_isodists
#'
#' @param graph `data.frame` or equivalent object representing the network
#' graph. For `dodgr` street networks, this must be a network derived from
#' \pkg{silicate} ("sc") data, generated with \link{weight_streetnet}. This
#' function does not work with networks derived from \pkg{sf} data.
#' @param from Vector or matrix of points **from** which isochrones are to
#' be calculated.
#' @param tlim Vector of desired limits of isochrones in seconds
Expand Down Expand Up @@ -185,6 +191,10 @@ dodgr_isochrones <- function (graph,
#'
#' @inheritParams dodgr_isodists
#'
#' @param graph `data.frame` or equivalent object representing the network
#' graph. For `dodgr` street networks, this must be a network derived from
#' \pkg{silicate} ("sc") data, generated with \link{weight_streetnet}. This
#' function does not work with networks derived from \pkg{sf} data.
#' @param from Vector or matrix of points **from** which isodistances or
#' isochrones are to be calculated.
#' @param tlim Vector of desired limits of isochrones in seconds
Expand Down
10 changes: 7 additions & 3 deletions R/times.R
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
#' Calculate matrix of pair-wise travel times between points.
#'
#' @inherit dodgr_dists
#' @param graph A `dodgr` network returned from the \link{weight_streetnet}
#' function using a network obtained with the \pkg{osmdata} `osmdata_sc`
#' function, possibly contracted with \link{dodgr_contract_graph}.
#' @param graph `data.frame` or equivalent object representing the network
#' graph (see Notes). For `dodgr` street networks, this may be a network derived
#' from either \pkg{sf} or \pkg{silicate} ("sc") data, generated with
#' \link{weight_streetnet}. Note, however, that networks derived from \pkg{sf}
#' data will generally not produce reliable estimates of times. Accurate
#' estimates can only be guaranteed by using networks derived from
#' \pkg{silicate} ("sc") data.
#' @param shortest If `TRUE`, calculate times along the \emph{shortest} rather
#' than fastest paths.
#'
Expand Down
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"codeRepository": "https://github.com/UrbanAnalyst/dodgr",
"issueTracker": "https://github.com/UrbanAnalyst/dodgr/issues",
"license": "https://spdx.org/licenses/GPL-3.0",
"version": "0.3.0.022",
"version": "0.3.0.023",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
Expand Down
4 changes: 3 additions & 1 deletion man/dodgr_distances.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion man/dodgr_dists.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion man/dodgr_isochrones.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion man/dodgr_isodists.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion man/dodgr_isoverts.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions man/dodgr_times.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2780067

Please sign in to comment.