Skip to content

Commit

Permalink
Auto stash before merge of "development" and "origin/development"
Browse files Browse the repository at this point in the history
  • Loading branch information
ecologics committed Jul 14, 2017
1 parent ed1563b commit 16d5c53
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 13 deletions.
9 changes: 5 additions & 4 deletions R/GOC.R
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,12 @@
#' tinyPatchGOC <- GOC(tinyPatchMPG, nThresh = 5)
#'
#' ## Examine the properties of the GOC graph of grain 3 of 5
#' print(tinyPatchGOC@th[[3]]$goc, vertex = TRUE, edge = TRUE)
#' graphdf(grain(tinyPatchGOC, nThresh = 3))
#'
#' ## Extract specified grains of connectivity and produce a vector SpatialPolygons
#' ## representation of the finest grain of connectivity (Threshold = 0)
#' tinyPatchGOC <- GOC(tinyPatchMPG, doThresh = c(0, 20, 40), sp = TRUE)
#' ## Extract grains of connectivity
#' ## representation of the finest grain and three others
#' ## by giving thresholds in link weights (doThresh)
#' tinyPatchGOC <- GOC(tinyPatchMPG, doThresh = c(0, 20, 40))
#' }
#'
setGeneric("GOC", function(x, ...) {
Expand Down
6 changes: 4 additions & 2 deletions R/export.R
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,10 @@
#' export(tinyPatchMPG)
#'
#' ## Export raster and vectors of a grain to a specified directory
#' tmpDir <- file.path(tempdir(), "tiny_goc_thresh2")
#' export(grain(tinyPatchGOC, 2), dirname = tmpDir)
#' export(grain(tinyPatchGOC, 2), dirname = "tiny_goc_thresh2", path = tempdir())
#'
#' ## Export rasters and vectors of the MPG and place in an R object
#' sp_tinyPatchMPG <- export(tinyPatchMPG, R = TRUE)
#' }
#'
setGeneric(
Expand Down
9 changes: 5 additions & 4 deletions man/GOC.Rd

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

11 changes: 8 additions & 3 deletions man/export.Rd

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

0 comments on commit 16d5c53

Please sign in to comment.