Skip to content

Commit

Permalink
update docs for #254
Browse files Browse the repository at this point in the history
  • Loading branch information
mpadge committed Sep 27, 2024
1 parent 765d354 commit 8ca18e0
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 26 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.4.1.029
Version: 0.4.1.030
Authors@R: c(
person("Mark", "Padgham", , "[email protected]", role = c("aut", "cre")),
person("Andreas", "Petutschnig", role = "aut"),
Expand Down
21 changes: 15 additions & 6 deletions R/dists.R
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,21 @@
#' combination of names will be accepted (for example, `fromx, fromy`,
#' `from_x, from_y`, or `fr_lat, fr_lon`.)
#'
#' `from` and `to` values can be either two-column matrices or
#' equivalent of longitude and latitude coordinates, or else single columns
#' precisely matching node numbers or names given in `graph$from` or
#' `graph$to`. If `to` is `NULL`, pairwise distances are calculated from all
#' `from` points to all other nodes in `graph`. If both `from` and `to` are
#' `NULL`, pairwise distances are calculated between all nodes in `graph`.
#' `from` and `to` parameters passed to this function can be either:
#' \itemize{
#' \item Single character vectors precisely matching node numbers or names
#' given in `graph$from` or `graph$to`.
#' \item Single vectors of integer-ish values, in which case these will be
#' presumed to specify indices into \link{dodgr_vertices}, and NOT to
#' correspond to values in the "from" to "to" columns of the graph.
#' \item matrices or equivalent of longitude and latitude coordinates, in which
#' case these will be matched on to the nearest coordinates of "from" and "to"
#' points in the graph.
#' }
#'
#' If `to` is `NULL`, pairwise distances will be calculated from all `from`
#' points to all other nodes in `graph`. If both `from` and `to` are `NULL`,
#' pairwise distances are calculated between all nodes in `graph`.
#'
#' Calculations in parallel (`parallel = TRUE`) ought very generally be
#' advantageous. For small graphs, calculating distances in parallel is likely
Expand Down
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.029",
"version": "0.4.1.030",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
Expand Down
21 changes: 15 additions & 6 deletions man/dodgr_distances.Rd

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

21 changes: 15 additions & 6 deletions man/dodgr_dists.Rd

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

21 changes: 15 additions & 6 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 8ca18e0

Please sign in to comment.