Skip to content

Commit

Permalink
Merge pull request #125 from jfisher-usgs/master
Browse files Browse the repository at this point in the history
merge with upstream
  • Loading branch information
jfisher-usgs authored Sep 23, 2019
2 parents 4b47d1a + 6e04104 commit 1a93457
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: inlmisc
Title: Miscellaneous Functions for the USGS INL Project Office
Version: 0.4.7.9000
Version: 0.4.8
Authors@R: person(given=c("Jason", "C."), family="Fisher", role=c("aut", "cre"), email="[email protected]", comment=c(ORCID="0000-0001-9032-8912"))
Description: A collection of functions for creating high-level graphics,
performing raster-based analysis, processing MODFLOW-based models,
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# inlmisc 0.4.7.9000
# inlmisc 0.4.8

- In `FindOptimalSubset` function, add `numIslands` argument, used to specify the number of islands,
was previously dependent on the `parallel` argument;
Expand Down
2 changes: 1 addition & 1 deletion R/AddInsetMap.R
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#' Defaults to the user coordinate extent of the main plot region, see \code{par("usr")}.
#' @param bty 'character' string.
#' Type of box to be drawn about the inset map.
#' A value of \code{"o"} (the default) results in a box and a value of \code{"n"} supresses the box.
#' A value of \code{"o"} (the default) results in a box and a value of \code{"n"} suppresses the box.
#'
#' @return Invisible \code{NULL}
#'
Expand Down
4 changes: 2 additions & 2 deletions R/AddPoints.R
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
#' @param bty 'character' string.
#' Type of box to be drawn about the legend.
#' A value of \code{"o"} (the default) results in a box and
#' a value of \code{"n"} supresses the box.
#' a value of \code{"n"} suppresses the box.
#' @param breaks 'numeric' vector.
#' Finite breakpoints for the legend circle symbols.
#' @param break.labels 'character' vector.
Expand All @@ -77,7 +77,7 @@
#' @param draw.legend 'logical' flag.
#' If true, a legend is drawn.
#' @param draw.points 'logical' flag.
#' If true, the circle symobls are drawn.
#' If true, the circle symbols are drawn.
#' @param add 'logical' flag.
#' If true, circle symbols (and an optional legend) are added to an existing plot.
#' @param ...
Expand Down
4 changes: 2 additions & 2 deletions R/FindOptimalSubset.R
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#' \dQuote{best} fitness value before the GA is stopped.
#' @param suggestions integer 'matrix'.
#' Integer chromosomes to be included in the initial population.
#' See returned \code{solution} component for a suggested value for this arugment.
#' See returned \code{solution} component for a suggested value for this argument.
#' @param parallel 'logical' flag or 'integer' count.
#' Whether to use parallel computing.
#' This argument can also be used to specify the number of cores to employ; by default,
Expand Down Expand Up @@ -101,7 +101,7 @@
#'
#' @examples
#' # Problem: Choose the 4 smallest numbers from a list
#' # of 100 values genearated from a standard
#' # of 100 values generated from a standard
#' # uniform distribution.
#' k <- 4
#' n <- 100
Expand Down
30 changes: 15 additions & 15 deletions R/Grid2Polygons.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@
#' and result in much "cleaner" images when plotted.
#'
#' @param grd 'SpatialGridDataFrame', 'SpatialPixelsDataFrame', or 'Raster*'.
#' Spatial grid
#' Spatial grid
#' @param zcol 'character' string or 'integer' count.
#' Layer to extract from a multi-layer spatial grid.
#' Layer to extract from a multi-layer spatial grid.
#' @param level 'logical' flag.
#' If true, a set of levels is used to partition the range of attribute values,
#' its default is false.
#' If true, a set of levels is used to partition the range of attribute values,
#' its default is false.
#' @param at 'numeric' vector.
#' Breakpoints along the range of attribute values.
#' Breakpoints along the range of attribute values.
#' @param cuts 'integer' count.
#' Number of levels the range of attribute values would be divided into.
#' Number of levels the range of attribute values would be divided into.
#' @param pretty 'logical' flag.
#' Whether to use pretty cut locations.
#' Whether to use pretty cut locations.
#' @param xlim 'numeric' vector of length 2.
#' Left and right limits of the spatial grid, data outside these limits is excluded.
#' Left and right limits of the spatial grid, data outside these limits is excluded.
#' @param ylim 'numeric' vector of length 2.
#' Lower and upper limits of the spatial grid,
#' data outside these limits is excluded.
#' Lower and upper limits of the spatial grid,
#' data outside these limits is excluded.
#' @param zlim 'numeric' vector of length 2.
#' Minimum and maximum limits of the attribute variable,
#' data outside these limits is excluded.
#' Minimum and maximum limits of the attribute variable,
#' data outside these limits is excluded.
#' @param ply 'SpatialPolygons', or 'SpatialGridDataFrame'.
#' Cropping polygon
#' Cropping polygon
#' @param check_validity 'logical' flag.
#' If true (default), check the validity of polygons.
#' If any of the polygons are invalid, try making them valid by zero-width buffering.
#' If true (default), check the validity of polygons.
#' If any of the polygons are invalid, try making them valid by zero-width buffering.
#'
#' @return An object of class 'SpatialPolygonsDataFrame'.
#' The objects \code{data} slot is a data frame, number of rows equal to
Expand Down
2 changes: 1 addition & 1 deletion R/PrintPackageHelp.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#' @param sep 'character' string.
#' HTML to separate help topics, a horizontal line by default.
#' @param notrun 'logical' flag.
#' Whether to inlcude \code{## Not run} comments in the Examples section of help documentation.
#' Whether to include \code{## Not run} comments in the Examples section of help documentation.
#' @param links 'character' vector.
#' Names of packages searched (level 0) when creating internal hyperlinks to functions and datasets.
#' @param ...
Expand Down
2 changes: 1 addition & 1 deletion R/ReadModflowBinary.R
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#' \code{"flow"} for cell-by-cell flow data (budget data).
#' @param endian 'character' string.
#' Endian-ness (or byte-order) of the binary file.
#' @param rm.totim.0 'logical' falg.
#' @param rm.totim.0 'logical' flag.
#' Whether data associated with the stress period at time zero should be removed.
#'
#' @return A 'list' of length equal to the
Expand Down
2 changes: 1 addition & 1 deletion man/AddInsetMap.Rd

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

4 changes: 2 additions & 2 deletions man/AddPoints.Rd

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

4 changes: 2 additions & 2 deletions man/FindOptimalSubset.Rd

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

2 changes: 1 addition & 1 deletion man/PrintPackageHelp.Rd

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

2 changes: 1 addition & 1 deletion man/ReadModflowBinary.Rd

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

0 comments on commit 1a93457

Please sign in to comment.