version 0.9.9

cran · Aug 2, 2020 · 46c23c8 · 46c23c8
1 parent 7ccdecf
commit 46c23c8
Show file tree

Hide file tree

Showing 53 changed files with 752 additions and 1,659 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,15 +1,15 @@
 Package: iemisc
 Title: Irucka Embry's Miscellaneous Functions
-Version: 0.9.8
+Version: 0.9.9
 Author: Irucka Embry [aut, cre], Felix Andrews [aut, ctb] (zoo code), Hans
     Werner Borchers [aut, ctb] (pracma code), Samit Basu [aut, ctb]
     (FreeMat code), David Bateman [aut, ctb] (GNU Octave code), Rik Wehbring
     [aut, ctb] (GNU Octave code)
 Maintainer: Irucka Embry <[email protected]>
 Depends: R (>= 3.0.0)
 Imports: zoo, pracma, iemiscdata, import, gsubfn (>= 0.7), fpCompare,
-        units, CHNOSZ, IAPWS95, testit, stringi, rgdal, sp, stats,
-        data.table (>= 1.10.2)
+        units, CHNOSZ, testit, stringi, rgdal, sp, stats, data.table
+        (>= 1.10.2)
 Suggests: install.load, ie2misc, Rcpp (>= 0.11.5), NISTunits, optiRum,
         rivr, knitr, rmarkdown, ramify
 Description: A collection of Irucka Embry's miscellaneous functions
@@ -18,13 +18,12 @@ Description: A collection of Irucka Embry's miscellaneous functions
     in degrees, etc.).
 URL: https://gitlab.com/iembry/iemisc
 BugReports: https://gitlab.com/iembry/iemisc/issues
-License: GPL (>= 3)
-LazyData: true
+License: GPL (>= 3) | file LICENSE
 Language: en-US
 Encoding: UTF-8
-VignetteBuilder: knitr
+LazyData: true
 NeedsCompilation: no
-RoxygenNote: 7.0.2
-Packaged: 2020-01-29 23:33:51 UTC; miwbg
+RoxygenNote: 7.1.1
+Packaged: 2020-07-31 03:05:08 UTC; xbyri
 Repository: CRAN
-Date/Publication: 2020-01-30 09:00:12 UTC
+Date/Publication: 2020-08-02 01:30:02 UTC
diff --git a/LICENSE b/LICENSE
diff --git a/MD5 b/MD5
@@ -1,6 +1,7 @@
-ac1a34d61bb34040918dd3c0e634277b *DESCRIPTION
-160db193ccd432b99115edf6be931c38 *NAMESPACE
-ebff6967ad08d80cf6121358961c0c06 *NEWS.md
+5c420b8fe36feb2afdba62c3c5e5ce09 *DESCRIPTION
+3b420796240b16ef8aa59e970f75770f *LICENSE
+2d593ce5575fd238c6cbd6f8d4ecc8ce *NAMESPACE
+cf57cef72497d4f6c2c1c7f4b23a5fba *NEWS.md
 57adc119219db099e7a772ae0b6a25e2 *R/AgivenF.R
 0ae17dc8c673ae161ce6931472492e92 *R/AgivenFcont.R
 67a934dc2f772e8499dd0955e48d1bf1 *R/AgivenP.R
@@ -21,7 +22,7 @@ aa323ac87ef999dfa17050f2871ab415 *R/PgivenG.R
 0586a555d3debbea018b88bfcc96b53d *R/benefitcost.R
 4e14517c4d363492c7d4362b8d4bb28b *R/cosd.R
 1b8f03d531429e25e4d4a295ff14e81a *R/cv.R
-8470e3d9083c47d3bf6bcd3ee68c90cd *R/iemisc.R
+ded079d013449bf6fd375a90479e730d *R/iemisc.R
 b01679468e26ca2325f3b73a108a8467 *R/igivenPFn.R
 fc1f98bdb2fa57562fda336c8f37885f *R/na.interp1.R
 f812cdcd8411d0790fb1e398415211ee *R/nc.R
@@ -33,12 +34,8 @@ e04af872c0a41dcd3f8ae0ef125527b0 *R/righttri.R
 3c812ee14f467ddb5378b01a3b27015e *R/shm.R
 4ce7f6192aa47ea7055e8149b5ba17ef *R/size.R
 65288d65886a9a49708f7da7d8795aaa *R/volsphere.R
-2beba07e94aeb984d7994c994bba54bc *README.md
-d94f781600f78dc75a12bd22c5ab9be6 *build/vignette.rds
-98d63bc8cfb3a2e88b1c91359fa79a12 *inst/CITATION
-75bba1e86e634bf9969bda6b0ae1bb94 *inst/doc/Open-Channel-Flow_Examples_Geometric_Shapes.R
-5de4e40995486e76041920a73e6b9cc0 *inst/doc/Open-Channel-Flow_Examples_Geometric_Shapes.Rmd
-d0bba01631e255184f573b166364149f *inst/doc/Open-Channel-Flow_Examples_Geometric_Shapes.html
+c1a464b579a2d8339611fba102de59ce *README.md
+2f20f164d7b0d6be895441315c3f1b41 *inst/CITATION
 725bf7fce3f7cff99b7b481b0fccf6ee *man/AgivenF.Rd
 898ce64391eb7063aea31ad003a36a4f *man/AgivenFcont.Rd
 7e545a9636f06b7e2669d3ad43631795 *man/AgivenG.Rd
@@ -50,17 +47,17 @@ ac53acba2c82878d4d2c99ced9f7c742 *man/AgivenPcont.Rd
 043995033a7d6801c19b010bd7b9d3db *man/FgivenAcont.Rd
 cbbd5a902dde0176f3dfe521168a05a2 *man/FgivenP.Rd
 16da73f0fe7874a5dfb74e2fcc2aee1b *man/FgivenPcont.Rd
-8e66677562376b0d129ca7b0f0ae53c6 *man/Manningcirc.Rd
-d7e6c13989ad88ad57f9c326eb79a574 *man/Manningpara.Rd
-9ff23d3f536415d82550e0e111deb04c *man/Manningrect.Rd
-08756ebe3bda630e6cea677cb257df9d *man/Manningtrap.Rd
-022c4f354729696120e1407495694cfd *man/Manningtri.Rd
+567451245c16712fb0947b9ce281b760 *man/Manningcirc.Rd
+3a32bcd19a8f6ad3c4b84ac808413797 *man/Manningpara.Rd
+fd00ebcfac1919261718cb77fabb6322 *man/Manningrect.Rd
+5155539f68441b4a3c68f89f6a94f232 *man/Manningtrap.Rd
+ec8da11a5f8980943399c86001498e23 *man/Manningtri.Rd
 64ca091c45942902beb5f7c944435454 *man/PgivenA.Rd
 320e34dc851f50727cfdb1fa10d7fc23 *man/PgivenA1.Rd
 54f5fa7a8aaa315b0e27a06599fd7942 *man/PgivenAcont.Rd
 ef70fae708d03c08c38c7ce6068f8b3e *man/PgivenF.Rd
 4e274c0d071d1c6e53c564427f503060 *man/PgivenFcont.Rd
-a60ebdf23a60b7d3cbcb3471b77e6a83 *man/PgivenFivary.Rd
+391f39054a4ff41c348cdaf073e6a158 *man/PgivenFivary.Rd
 b70c24c8993f5048cecc5419f3c02a3c *man/PgivenG.Rd
 5938af970a477b38f5be62df681af378 *man/SimpIntPaid.Rd
 16c2b1d27c4670f67eeefbf374e523f2 *man/acosd.Rd
@@ -76,7 +73,7 @@ af24580eaad839126edeb88c0d17c6a6 *man/cosd.Rd
 eda53689ba06d79415c7e64c9af7d610 *man/cotd.Rd
 f78ac6fc0b050bbb08ae22e03ffd2e33 *man/cscd.Rd
 49c83f3a14e9a66b62f9ecad9a279917 *man/cv.Rd
-9f05f3576df18798079a6c6509d582d2 *man/iemisc.Rd
+eb3987e582cc2bad952d8c4de20aa269 *man/iemisc.Rd
 5bca23e932cab43dd4379c4413877dcd *man/igivenPFn.Rd
 397c61796826010b5b49db3f08eb1529 *man/length_octave.Rd
 91877496783ef9f78da69e4025c5cfd1 *man/n.Rd
@@ -86,10 +83,10 @@ f78ac6fc0b050bbb08ae22e03ffd2e33 *man/cscd.Rd
 5816cfad4af137efc60ddab1442983fe *man/nc3.Rd
 6a19731e429d4e96fda70b111d83c2b0 *man/nc4.Rd
 7b5ecd3c23628e0eae12c00f25ab028c *man/ngivenPFi.Rd
-8269862b831a7a0ddfa4d8710791e197 *man/numel.Rd
+9482f2f5aad371ddc6f86b291a43fa13 *man/numel.Rd
 3a5dde1c14111e78c05e0bbc378dca4e *man/ranges.Rd
 9f4aa1584a0251bfb1a396119b26e46a *man/relerror.Rd
-fe3be6e00c5e04b783bba8c8bc8e7132 *man/righttri.Rd
+dafc597107065d209ff7a12efd787638 *man/righttri.Rd
 3da61d2e82a4a7e1e65824fdb2f6d9c2 *man/rms.Rd
 14000af10a47a71ba53144e8b602b832 *man/secd.Rd
 a05cbdfbaa3aa69338d8aa63d232efb2 *man/sgm.Rd
@@ -98,4 +95,3 @@ f51087633627648ef4f2e44d04c95dd5 *man/sind.Rd
 faad8c0b08b6bac9551e1172a8e4b731 *man/size.Rd
 49772368955ce9eea66503ab59736b9e *man/tand.Rd
 e0479de4f031262134d8d2f7f5b763eb *man/volsphere.Rd
-5de4e40995486e76041920a73e6b9cc0 *vignettes/Open-Channel-Flow_Examples_Geometric_Shapes.Rmd
diff --git a/NAMESPACE b/NAMESPACE
@@ -66,7 +66,6 @@ export(size)
 export(tand)
 export(volsphere)
 import(CHNOSZ)
-import(IAPWS95)
 import(data.table)
 import(fpCompare)
 import(gsubfn)

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# iemisc 0.9.9
+
+* CRAN request for `IAPWS95` package to be corrected or archived which would impact this package. The functions requiring `IAPWS95` have been re-written so that `IAPWS95` can be removed from Imports
+
+
 # iemisc 0.9.8
 
 * CRAN request for `listless` package to be corrected or archived which would impact this package. The functions requiring `listless` have been re-written so that `listless` can be removed from Imports

diff --git a/R/AgivenF.R b/R/AgivenF.R
diff --git a/R/AgivenFcont.R b/R/AgivenFcont.R
diff --git a/R/AgivenP.R b/R/AgivenP.R
diff --git a/R/EffInt.R b/R/EffInt.R
diff --git a/R/FgivenA.R b/R/FgivenA.R
diff --git a/R/FgivenP.R b/R/FgivenP.R
diff --git a/R/Manningcirc.R b/R/Manningcirc.R
diff --git a/R/Manningpara.R b/R/Manningpara.R
diff --git a/R/Manningrect.R b/R/Manningrect.R
diff --git a/R/Manningtrap.R b/R/Manningtrap.R
diff --git a/R/Manningtri.R b/R/Manningtri.R
diff --git a/R/PgivenA.R b/R/PgivenA.R
diff --git a/R/PgivenA1.R b/R/PgivenA1.R
diff --git a/R/PgivenF.R b/R/PgivenF.R
diff --git a/R/PgivenFivary.R b/R/PgivenFivary.R
diff --git a/R/PgivenG.R b/R/PgivenG.R
diff --git a/R/SimpIntPaid.R b/R/SimpIntPaid.R
diff --git a/R/benefitcost.R b/R/benefitcost.R
diff --git a/R/cosd.R b/R/cosd.R
diff --git a/R/cv.R b/R/cv.R
diff --git a/R/iemisc.R b/R/iemisc.R
@@ -6,13 +6,13 @@
 #' future value, present value, annual value, gradients, interest, periods,
 #' etc.), geometry (sphere volume and right triangle), civil & environmental/
 #' water resources engineering (Air Stripper, Concrete Mix Design for Normal Strength &
-#' Structural Lightweight Concrete, Manning's
-#' n, Gauckler-Manning-Strickler equation for geometric cross-sections), a
+#' Structural Lightweight Concrete, Manning's n,
+#' Gauckler-Manning-Strickler equation for geometric cross-sections), a
 #' version of linear interpolation for use with NAs, & GNU Octave/MATLAB
 #' compatible size, numel, and length_octave functions.
 #'
 #' @docType package
 #' @name iemisc
-#' @import data.table stats iemiscdata import zoo gsubfn fpCompare units CHNOSZ stringi rgdal IAPWS95 sp
+#' @import data.table stats iemiscdata import zoo gsubfn fpCompare units CHNOSZ stringi rgdal sp
 #' @importFrom pracma isempty nthroot interp1 interp2 ones
-NULL
+NULL
diff --git a/R/igivenPFn.R b/R/igivenPFn.R
diff --git a/R/na.interp1.R b/R/na.interp1.R
diff --git a/R/nc.R b/R/nc.R
diff --git a/R/ngivenPFi.R b/R/ngivenPFi.R
diff --git a/R/ranges.R b/R/ranges.R
diff --git a/R/relerror.R b/R/relerror.R
diff --git a/R/righttri.R b/R/righttri.R
diff --git a/R/rms.R b/R/rms.R
diff --git a/R/shm.R b/R/shm.R
diff --git a/R/size.R b/R/size.R
diff --git a/R/volsphere.R b/R/volsphere.R
diff --git a/README.md b/README.md
@@ -11,13 +11,24 @@ install.packages("iemisc")
 ```
 
 
+# Help
+
+With credit due to the `matlab` package, for a complete list of functions and the package DESCRIPTION file, use `R library(help = "iemisc")`
+
+https://www.r-project.org/help.html | Getting Help with R
+help(shm, package = "iemisc")
+help(package = "iemisc")
+
+
+
 
 # Examples (see more examples in the vignette and in the function descriptions)
 
 ```R
 library("iemisc")
 require("stats")
 
+
 # 1)
 set.seed(200) # makes the example reproducible
 

diff --git a/build/vignette.rds b/build/vignette.rds
diff --git a/inst/CITATION b/inst/CITATION
@@ -1,13 +1,13 @@
 citHeader("To cite iemisc in publications use:")
 
 citEntry(entry = "Manual",
-  title        = "Irucka Embry's miscellaneous functions",
+  title        = "Irucka Embry's miscellaneous R functions",
   author       = personList(as.person("Irucka Embry, E.I.T.")),
-  year         = "2016",
+  year         = "2016-2019",
   url          = "https://gitlab.com/iembry/iemisc",
 
   textVersion  =
-  paste("Irucka Embry, E.I.T. (2016).",
-        "Irucka Embry's miscellaneous functions.",
+  paste("Irucka Embry, E.I.T. (2016-2019).",
+        "Irucka Embry's miscellaneous R functions.",
         "URL https://gitlab.com/iembry/iemisc.")
 )