Skip to content

Commit

Permalink
version 1.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
iembry authored and cran-robot committed Jun 6, 2024
1 parent 991a620 commit 2f181e2
Show file tree
Hide file tree
Showing 117 changed files with 3,803 additions and 1,136 deletions.
14 changes: 7 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: iemisc
Title: Irucka Embry's Miscellaneous Functions
Version: 1.0.4
Version: 1.0.5
Authors@R: c(person("Irucka", "Embry", role = c("aut", "cre"), email = "[email protected]"),
person("Felix", "Andrews", role = c("aut", "ctb"), comment = "zoo code"),
person("Hans Werner", "Borchers", role = c("aut", "ctb"), comment = "pracma code"),
Expand All @@ -26,12 +26,12 @@ Imports: zoo, pracma, iemiscdata, gsubfn (>= 0.7), fpCompare, units (>=
chem.databases, methods, ramify, foreach, stats, data.table (>=
1.10.2), measurements, roperators, berryFunctions, round,
USA.state.boundaries (>= 1.0.1), sf, ggplot2, ggpubr, matlab,
sjmisc, lubridate, anytime, qdapRegex, mgsub, geosphere,
matlab2r, signal, utils
sjmisc, lubridate, anytime, mgsub, geosphere, matlab2r, signal,
utils, qdapRegex
Suggests: install.load, knitr, import, fractional, fracture, MASS,
rmarkdown, tinytest, maps, spelling, sampler, callr, rando,
geometry, linguisticsdown, aiRthermo, hydraulics, ie2misc,
formatR, pander, printr, tibble, lintr
formatR, pander, printr, tibble, lintr, opencpu
Description: A collection of Irucka Embry's miscellaneous functions
(Engineering Economics, Civil & Environmental/Water Resources Engineering,
Construction Measurements, GNU Octave compatible functions, Python
Expand All @@ -43,9 +43,9 @@ License: GPL (>= 3) | file LICENSE
Language: en-US
Encoding: UTF-8
VignetteBuilder: knitr
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
NeedsCompilation: no
Packaged: 2023-09-25 00:27:37 UTC; xbyri
Packaged: 2024-06-05 17:19:37 UTC; xbyri
Author: Irucka Embry [aut, cre],
Felix Andrews [aut, ctb] (zoo code),
Hans Werner Borchers [aut, ctb] (pracma code),
Expand All @@ -67,4 +67,4 @@ Author: Irucka Embry [aut, cre],
Josh O'Brien [aut, ctb] (stackoverflow R code),
R. van Twisk [aut, ctb] (LibreCAD code)
Repository: CRAN
Date/Publication: 2023-09-25 10:20:02 UTC
Date/Publication: 2024-06-05 21:40:18 UTC
206 changes: 108 additions & 98 deletions MD5

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ importFrom(berryFunctions,traceCall)
importFrom(checkmate,qtest)
importFrom(checkmate,testCharacter)
importFrom(checkmate,testDataTable)
importFrom(checkmate,testDate)
importFrom(checkmate,testString)
importFrom(checkmate,test_data_frame)
importFrom(data.table,"%chin%")
Expand Down Expand Up @@ -204,6 +205,7 @@ importFrom(roperators,"%+%")
importFrom(round,round_r3)
importFrom(sf,st_as_sf)
importFrom(sf,st_coordinates)
importFrom(sf,st_crs)
importFrom(sf,st_intersects)
importFrom(sf,st_transform)
importFrom(signal,fftfilt)
Expand All @@ -212,7 +214,6 @@ importFrom(stats,approx)
importFrom(stats,na.omit)
importFrom(stats,sd)
importFrom(stats,uniroot)
importFrom(stringi,stri_count_fixed)
importFrom(stringi,stri_count_regex)
importFrom(stringi,stri_detect_fixed)
importFrom(stringi,stri_detect_regex)
Expand Down
11 changes: 9 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
# iemisc 1.0.4 (23 September 2023)
# iemisc 1.0.5 (5 June 2024)

* Re-submitted the package due to the removal & readmittal of the `iemiscdata` package.
* Replaced as.numeric with drop_units in the engr_survey function. Made other revisions in the engr_survey & engr_survey_reverse functions.
* Revised the reduce_single_digit function to allow for dates with /s


# iemisc 1.0.4 (25 September 2023)

* Received an e-mail issue from Kurt Hornik on 19 August 2023 regarding the use of "@docType package" which is no longer valid. Replaced the iemisc.R file with iemisc-package.R to reflect the requested change.
* Added the `chem.databases` package to Imports to replace `CHNOSZ` which has been removed from Imports
* Added `printr` to Suggests to allow the printing of help functions in the vignettes & added `tibble` and `lintr` to Suggests
* Modified the Help section on the README again & Added the additional available function to the README
* Revised the URL for Urban Hydrology for Small Watersheds Technical Release 55 (TR-55) in the weighted_CN function Reference
* Revised the URL for Urban Hydrology for Small Watersheds Technical Release 55 (TR-55) in the weighted_CN function Reference. Revised various other URLs to get `iemisc` accepted into CRAN. Used the ResearchGate version of certain articles or the Internet Archive: Wayback Machine archive for other URLs that had issues.
* Revised the air_stripper function to search for the CAS Number in the atsdr_tsca_ld50_a data set of the `chem.databases` package. Also revised the package to obtain the molecular formulas and average mass from the chem_wiki data set of the `chem.databases` package
* Added the "%inorder%" function to return character vectors in a given sequence
* Added the c_composite_CN function for connected impervious areas
Expand Down
18 changes: 9 additions & 9 deletions R/Manningcirc.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#' \deqn{Q = \frac{K_n}{n}\frac{A^\frac{5}{3}}{P^\frac{2}{3}}\sqrt{S}}
#'
#' \describe{
#' \item{\emph{Q}}{the discharge {m^3/s or ft^3/s (cfs)} is VA}
#' \item{\emph{Q}}{the discharge [m^3/s or ft^3/s (cfs)] is VA}
#' \item{\emph{n}}{Manning's roughness coefficient (dimensionless)}
#' \item{\emph{P}}{the wetted perimeters of the channel (m or ft)}
#' \item{\emph{A}}{the cross-sectional area (m^2 or ft^2)}
Expand Down Expand Up @@ -85,7 +85,7 @@
#'
#' \describe{
#' \item{\emph{d}}{the initial diameters of the cross-section [m or ft]}
#' \item{\emph{Q}}{the discharge {m^3/s or ft^3/s (cfs)} is VA}
#' \item{\emph{Q}}{the discharge [m^3/s or ft^3/s (cfs)] is VA}
#' \item{\emph{n}}{Manning's roughness coefficient (dimensionless)}
#' \item{\emph{S}}{the slope of the channel bed (m/m or ft/ft)}
#' \item{\emph{K_n}}{the conversion constant -- 1.0 for SI and
Expand Down Expand Up @@ -143,7 +143,7 @@
#'
#' \describe{
#' \item{\emph{E}}{the Specific Energy (m or ft)}
#' \item{\emph{Q}}{the discharge {m^3/s or ft^3/s (cfs)} is VA}
#' \item{\emph{Q}}{the discharge [m^3/s or ft^3/s (cfs)] is VA}
#' \item{\emph{g}}{gravitational acceleration (m/s^2 or ft/sec^2)}
#' \item{\emph{A}}{the cross-sectional area (m^2 or ft^2)}
#' \item{\emph{y}}{the flow depth (normal depth in this function) [m or ft]}
Expand Down Expand Up @@ -206,7 +206,7 @@
#'
#'
#'
#' @param Q numeric vector that contains the discharge value {m^3/s or ft^3/s},
#' @param Q numeric vector that contains the discharge value (m^3/s or ft^3/s),
#' if known.
#' @param n numeric vector that contains the Manning's roughness coefficient n,
#' if known.
Expand All @@ -217,10 +217,10 @@
#' @param y numeric vector that contains the flow depth (m or ft), if known.
#' @param Temp numeric vector that contains the temperature (degrees C or degrees
#' Fahrenheit), if known.
#' @param units character vector that contains the system of units {options are
#' @param units character vector that contains the system of units [options are
#' \code{SI} for International System of Units or \code{Eng} for English units
#' (United States Customary System in the United States and Imperial Units in
#' the United Kingdom)}
#' the United Kingdom)]
#'
#' @return the missing parameters (Q, n, or Sf) & theta, area (A), wetted
#' perimeters (P), velocity (V), top width (B), hydraulic depth (D), hydraulic radius (R), E (Specific Energy), Vel_Head (Velocity Head), Z (Section Factor), Reynolds number (Re), and Froude number (Fr) as a \code{\link[base]{list}}. for the
Expand Down Expand Up @@ -600,7 +600,7 @@ return(list(Sf = Sf, V = V, A = A, P = P, R = R, Re = Re, Fr = Fr))
#' Manning equation for a circular cross-section and uniform flow. The possible
#' inputs are y, d, y_d (ratio of y/d), and theta.
#'
#' @param Q numeric vector that contains the discharge value {m^3/s or ft^3/s},
#' @param Q numeric vector that contains the discharge value (m^3/s or ft^3/s),
#' if known.
#' @param d numeric vector that contains the diameters value (m or ft),
#' if known.
Expand All @@ -610,10 +610,10 @@ return(list(Sf = Sf, V = V, A = A, P = P, R = R, Re = Re, Fr = Fr))
#' @param y_d numeric vector that contains the filling ration (y/d), if known.
#' @param theta numeric vector that contains the angle theta (radians), if
#' known.
#' @param units character vector that contains the system of units {options are
#' @param units character vector that contains the system of units [options are
#' \code{SI} for International System of Units or \code{Eng} for English units
#' (United States Customary System in the United States and Imperial Units in
#' the United Kingdom)}
#' the United Kingdom)]
#'
#'
#'
Expand Down
10 changes: 5 additions & 5 deletions R/Manningpara.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#' \deqn{Q = \frac{K_n}{n}\frac{A^\frac{5}{3}}{P^\frac{2}{3}}S^\frac{1}{2}}
#'
#' \describe{
#' \item{\emph{Q}}{the discharge {m^3/s or ft^3/s (cfs)} is VA}
#' \item{\emph{Q}}{the discharge [m^3/s or ft^3/s (cfs)] is VA}
#' \item{\emph{n}}{Manning's roughness coefficient (dimensionless)}
#' \item{\emph{P}}{the wetted perimeters of the channel (m or ft)}
#' \item{\emph{A}}{the cross-sectional area (m^2 or ft^2)}
Expand Down Expand Up @@ -117,7 +117,7 @@
#'
#' \describe{
#' \item{\emph{E}}{the Specific Energy (m or ft)}
#' \item{\emph{Q}}{the discharge {m^3/s or ft^3/s (cfs)} is VA}
#' \item{\emph{Q}}{the discharge [m^3/s or ft^3/s (cfs)] is VA}
#' \item{\emph{g}}{gravitational acceleration (m/s^2 or ft/sec^2)}
#' \item{\emph{A}}{the cross-sectional area (m^2 or ft^2)}
#' \item{\emph{y}}{the flow depth (normal depth in this function) [m or ft]}
Expand Down Expand Up @@ -174,7 +174,7 @@
#'
#'
#'
#' @param Q numeric vector that contains the discharge value {m^3/s or ft^3/s},
#' @param Q numeric vector that contains the discharge value (m^3/s or ft^3/s),
#' if known.
#' @param n numeric vector that contains the Manning's roughness coefficient n,
#' if known.
Expand All @@ -187,10 +187,10 @@
#' @param y1 numeric vector that contains the "bank-full depth", if known.
#' @param Temp numeric vector that contains the temperature (degrees C or degrees
#' Fahrenheit), if known.
#' @param units character vector that contains the system of units {options are
#' @param units character vector that contains the system of units [options are
#' \code{SI} for International System of Units or \code{Eng} for English units
#' (United States Customary System in the United States and Imperial Units in
#' the United Kingdom)}
#' the United Kingdom)]
#'
#'
#' @return the missing parameter (Q, n, m, Sf, B1, y1, or y) & area (A), wetted
Expand Down
10 changes: 5 additions & 5 deletions R/Manningrect.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#' \deqn{Q = \frac{K_n}{n}\frac{A^\frac{5}{3}}{P^\frac{2}{3}}S^\frac{1}{2}}
#'
#' \describe{
#' \item{\emph{Q}}{the discharge {m^3/s or ft^3/s (cfs)} is VA}
#' \item{\emph{Q}}{the discharge [m^3/s or ft^3/s (cfs)] is VA}
#' \item{\emph{n}}{Manning's roughness coefficient (dimensionless)}
#' \item{\emph{P}}{the wetted perimeters of the channel (m or ft)}
#' \item{\emph{A}}{the cross-sectional area (m^2 or ft^2)}
Expand Down Expand Up @@ -107,7 +107,7 @@
#'
#' \describe{
#' \item{\emph{E}}{the Specific Energy (m or ft)}
#' \item{\emph{Q}}{the discharge {m^3/s or ft^3/s (cfs)} is VA}
#' \item{\emph{Q}}{the discharge [m^3/s or ft^3/s (cfs)] is VA}
#' \item{\emph{g}}{gravitational acceleration (m/s^2 or ft/sec^2)}
#' \item{\emph{A}}{the cross-sectional area (m^2 or ft^2)}
#' \item{\emph{y}}{the flow depth (normal depth in this function) [m or ft]}
Expand Down Expand Up @@ -171,7 +171,7 @@
#'
#'
#'
#' @param Q numeric vector that contains the discharge value {m^3/s or ft^3/s},
#' @param Q numeric vector that contains the discharge value (m^3/s or ft^3/s),
#' if known.
#' @param n numeric vector that contains the Manning's roughness coefficient n,
#' if known.
Expand All @@ -181,10 +181,10 @@
#' @param y numeric vector that contains the flow depth (m or ft), if known.
#' @param Temp numeric vector that contains the temperature (degrees C or degrees
#' Fahrenheit), if known.
#' @param units character vector that contains the system of units {options are
#' @param units character vector that contains the system of units [options are
#' \code{SI} for International System of Units or \code{Eng} for English units
#' (United States Customary System in the United States and Imperial Units in
#' the United Kingdom)}
#' the United Kingdom)]
#'
#' @return the missing parameters (Q, n, b, Sf, or y) & area (A), wetted
#' perimeter (P), velocity (V), top width (B), hydraulic radius (R),
Expand Down
16 changes: 8 additions & 8 deletions R/Manningtrap.R
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
#' \deqn{Q = \frac{K_n}{n}\frac{A^\frac{5}{3}}{P^\frac{2}{3}}S^\frac{1}{2}}
#'
#' \describe{
#' \item{\emph{Q}}{the discharge {m^3/s or ft^3/s (cfs)} is VA}
#' \item{\emph{Q}}{the discharge [m^3/s or ft^3/s (cfs)] is VA}
#' \item{\emph{n}}{Manning's roughness coefficient (dimensionless)}
#' \item{\emph{P}}{the wetted perimeters of the channel (m or ft)}
#' \item{\emph{A}}{water area (m^2 or ft^2)}
Expand Down Expand Up @@ -156,7 +156,7 @@
#'
#' \describe{
#' \item{\emph{E}}{the Specific Energy (m or ft)}
#' \item{\emph{Q}}{the discharge {m^3/s or ft^3/s (cfs)} is VA}
#' \item{\emph{Q}}{the discharge [m^3/s or ft^3/s (cfs)] is VA}
#' \item{\emph{g}}{gravitational acceleration (m/s^2 or ft/sec^2)}
#' \item{\emph{A}}{water area (m^2 or ft^2)}
#' \item{\emph{y}}{the flow depth (normal depth in this function) [m or ft]}
Expand Down Expand Up @@ -285,7 +285,7 @@
#'
#'
#'
#' @param Q numeric vector that contains the discharge value {m^3/s or ft^3/s},
#' @param Q numeric vector that contains the discharge value (m^3/s or ft^3/s),
#' if known.
#' @param n numeric vector that contains the Manning's roughness coefficient n,
#' if known.
Expand All @@ -302,10 +302,10 @@
#' @param Temp numeric vector that contains the temperature (degrees C or degrees
#' Fahrenheit), if known. Otherwise, the default value is 20 degrees Celsius
#' (68 degrees Fahrenheit).
#' @param units character vector that contains the system of units {options are
#' @param units character vector that contains the system of units [options are
#' \code{SI} for International System of Units or \code{Eng} for English units
#' (United States Customary System in the United States and Imperial Units in
#' the United Kingdom)}
#' the United Kingdom)]
#' @param type character vector that contains the type of trapezoid (symmetrical
#' or non-symmetrical). The symmetrical trapezoid uses \code{m} while the non-
#' symmetrical trapezoid uses \code{m1} and \code{m2}.
Expand Down Expand Up @@ -1892,7 +1892,7 @@ result_table
#'
#'
#'
#' @param Q numeric vector that contains the discharge value {m^3/s or ft^3/s},
#' @param Q numeric vector that contains the discharge value (m^3/s or ft^3/s),
#' if known.
#' @param n numeric vector that contains the Manning's roughness coefficient n,
#' if known.
Expand All @@ -1908,10 +1908,10 @@ result_table
#' @param y numeric vector that contains the flow depth (m or ft), if known.
#' @param Temp numeric vector that contains the temperature (degrees C or degrees
#' Fahrenheit), if known.
#' @param units character vector that contains the system of units {options are
#' @param units character vector that contains the system of units [options are
#' \code{SI} for International System of Units or \code{Eng} for English units
#' (United States Customary System in the United States and Imperial Units in
#' the United Kingdom)}
#' the United Kingdom)]
#' @param type character vector that contains the type of trapezoid (symmetrical
#' or non-symmetrical). The symmetrical trapezoid uses \code{m} while the non-
#' symmetrical trapezoid uses \code{m1} and \code{m2}.
Expand Down
10 changes: 5 additions & 5 deletions R/Manningtri.R
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#' \deqn{Q = \frac{K_n}{n}\frac{A^\frac{5}{3}}{P^\frac{2}{3}}S^\frac{1}{2}}
#'
#' \describe{
#' \item{\emph{Q}}{the discharge {m^3/s or ft^3/s (cfs)} is VA}
#' \item{\emph{Q}}{the discharge [m^3/s or ft^3/s (cfs)] is VA}
#' \item{\emph{n}}{Manning's roughness coefficient (dimensionless)}
#' \item{\emph{P}}{the wetted perimeters of the channel (m or ft)}
#' \item{\emph{A}}{the cross-sectional area (m^2 or ft^2)}
Expand Down Expand Up @@ -105,7 +105,7 @@
#'
#' \describe{
#' \item{\emph{E}}{the Specific Energy (m or ft)}
#' \item{\emph{Q}}{the discharge {m^3/s or ft^3/s (cfs)} is VA}
#' \item{\emph{Q}}{the discharge [m^3/s or ft^3/s (cfs)] is VA}
#' \item{\emph{g}}{gravitational acceleration (m/s^2 or ft/sec^2)}
#' \item{\emph{A}}{the cross-sectional area (m^2 or ft^2)}
#' \item{\emph{y}}{the flow depth (normal depth in this function) [m or ft]}
Expand Down Expand Up @@ -173,7 +173,7 @@
#'
#'
#'
#' @param Q numeric vector that contains the discharge value {m^3/s or ft^3/s},
#' @param Q numeric vector that contains the discharge value (m^3/s or ft^3/s),
#' if known.
#' @param n numeric vector that contains the Manning's roughness coefficient n,
#' if known.
Expand All @@ -184,10 +184,10 @@
#' @param y numeric vector that contains the flow depth (m or ft), if known.
#' @param Temp numeric vector that contains the temperature (degrees C or degrees
#' Fahrenheit), if known.
#' @param units character vector that contains the system of units {options are
#' @param units character vector that contains the system of units [options are
#' \code{SI} for International System of Units or \code{Eng} for English units
#' (United States Customary System in the United States and Imperial Units in
#' the United Kingdom)}
#' the United Kingdom)]
#'
#' @return the missing parameter (Q, n, m, Sf, or y) & area (A), wetted
#' perimeter (P), velocity (V), top width (B), hydraulic radius (R),
Expand Down
Loading

0 comments on commit 2f181e2

Please sign in to comment.