Skip to content

Commit 1a93457

Browse files
authored
Merge pull request #125 from jfisher-usgs/master
merge with upstream
2 parents 4b47d1a + 6e04104 commit 1a93457

13 files changed

+31
-31
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: inlmisc
22
Title: Miscellaneous Functions for the USGS INL Project Office
3-
Version: 0.4.7.9000
3+
Version: 0.4.8
44
Authors@R: person(given=c("Jason", "C."), family="Fisher", role=c("aut", "cre"), email="jfisher@usgs.gov", comment=c(ORCID="0000-0001-9032-8912"))
55
Description: A collection of functions for creating high-level graphics,
66
performing raster-based analysis, processing MODFLOW-based models,

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# inlmisc 0.4.7.9000
1+
# inlmisc 0.4.8
22

33
- In `FindOptimalSubset` function, add `numIslands` argument, used to specify the number of islands,
44
was previously dependent on the `parallel` argument;

R/AddInsetMap.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#' Defaults to the user coordinate extent of the main plot region, see \code{par("usr")}.
2525
#' @param bty 'character' string.
2626
#' Type of box to be drawn about the inset map.
27-
#' A value of \code{"o"} (the default) results in a box and a value of \code{"n"} supresses the box.
27+
#' A value of \code{"o"} (the default) results in a box and a value of \code{"n"} suppresses the box.
2828
#'
2929
#' @return Invisible \code{NULL}
3030
#'

R/AddPoints.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#' @param bty 'character' string.
6060
#' Type of box to be drawn about the legend.
6161
#' A value of \code{"o"} (the default) results in a box and
62-
#' a value of \code{"n"} supresses the box.
62+
#' a value of \code{"n"} suppresses the box.
6363
#' @param breaks 'numeric' vector.
6464
#' Finite breakpoints for the legend circle symbols.
6565
#' @param break.labels 'character' vector.
@@ -77,7 +77,7 @@
7777
#' @param draw.legend 'logical' flag.
7878
#' If true, a legend is drawn.
7979
#' @param draw.points 'logical' flag.
80-
#' If true, the circle symobls are drawn.
80+
#' If true, the circle symbols are drawn.
8181
#' @param add 'logical' flag.
8282
#' If true, circle symbols (and an optional legend) are added to an existing plot.
8383
#' @param ...

R/FindOptimalSubset.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#' \dQuote{best} fitness value before the GA is stopped.
4242
#' @param suggestions integer 'matrix'.
4343
#' Integer chromosomes to be included in the initial population.
44-
#' See returned \code{solution} component for a suggested value for this arugment.
44+
#' See returned \code{solution} component for a suggested value for this argument.
4545
#' @param parallel 'logical' flag or 'integer' count.
4646
#' Whether to use parallel computing.
4747
#' This argument can also be used to specify the number of cores to employ; by default,
@@ -101,7 +101,7 @@
101101
#'
102102
#' @examples
103103
#' # Problem: Choose the 4 smallest numbers from a list
104-
#' # of 100 values genearated from a standard
104+
#' # of 100 values generated from a standard
105105
#' # uniform distribution.
106106
#' k <- 4
107107
#' n <- 100

R/Grid2Polygons.R

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@
66
#' and result in much "cleaner" images when plotted.
77
#'
88
#' @param grd 'SpatialGridDataFrame', 'SpatialPixelsDataFrame', or 'Raster*'.
9-
#' Spatial grid
9+
#' Spatial grid
1010
#' @param zcol 'character' string or 'integer' count.
11-
#' Layer to extract from a multi-layer spatial grid.
11+
#' Layer to extract from a multi-layer spatial grid.
1212
#' @param level 'logical' flag.
13-
#' If true, a set of levels is used to partition the range of attribute values,
14-
#' its default is false.
13+
#' If true, a set of levels is used to partition the range of attribute values,
14+
#' its default is false.
1515
#' @param at 'numeric' vector.
16-
#' Breakpoints along the range of attribute values.
16+
#' Breakpoints along the range of attribute values.
1717
#' @param cuts 'integer' count.
18-
#' Number of levels the range of attribute values would be divided into.
18+
#' Number of levels the range of attribute values would be divided into.
1919
#' @param pretty 'logical' flag.
20-
#' Whether to use pretty cut locations.
20+
#' Whether to use pretty cut locations.
2121
#' @param xlim 'numeric' vector of length 2.
22-
#' Left and right limits of the spatial grid, data outside these limits is excluded.
22+
#' Left and right limits of the spatial grid, data outside these limits is excluded.
2323
#' @param ylim 'numeric' vector of length 2.
24-
#' Lower and upper limits of the spatial grid,
25-
#' data outside these limits is excluded.
24+
#' Lower and upper limits of the spatial grid,
25+
#' data outside these limits is excluded.
2626
#' @param zlim 'numeric' vector of length 2.
27-
#' Minimum and maximum limits of the attribute variable,
28-
#' data outside these limits is excluded.
27+
#' Minimum and maximum limits of the attribute variable,
28+
#' data outside these limits is excluded.
2929
#' @param ply 'SpatialPolygons', or 'SpatialGridDataFrame'.
30-
#' Cropping polygon
30+
#' Cropping polygon
3131
#' @param check_validity 'logical' flag.
32-
#' If true (default), check the validity of polygons.
33-
#' If any of the polygons are invalid, try making them valid by zero-width buffering.
32+
#' If true (default), check the validity of polygons.
33+
#' If any of the polygons are invalid, try making them valid by zero-width buffering.
3434
#'
3535
#' @return An object of class 'SpatialPolygonsDataFrame'.
3636
#' The objects \code{data} slot is a data frame, number of rows equal to

R/PrintPackageHelp.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#' @param sep 'character' string.
1919
#' HTML to separate help topics, a horizontal line by default.
2020
#' @param notrun 'logical' flag.
21-
#' Whether to inlcude \code{## Not run} comments in the Examples section of help documentation.
21+
#' Whether to include \code{## Not run} comments in the Examples section of help documentation.
2222
#' @param links 'character' vector.
2323
#' Names of packages searched (level 0) when creating internal hyperlinks to functions and datasets.
2424
#' @param ...

R/ReadModflowBinary.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#' \code{"flow"} for cell-by-cell flow data (budget data).
1212
#' @param endian 'character' string.
1313
#' Endian-ness (or byte-order) of the binary file.
14-
#' @param rm.totim.0 'logical' falg.
14+
#' @param rm.totim.0 'logical' flag.
1515
#' Whether data associated with the stress period at time zero should be removed.
1616
#'
1717
#' @return A 'list' of length equal to the

man/AddInsetMap.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/AddPoints.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)