diff --git a/cran-comments/cran-comments-v0_8_29.md b/cran-comments/cran-comments-v0_8_29.md new file mode 100644 index 00000000..74de2e6c --- /dev/null +++ b/cran-comments/cran-comments-v0_8_29.md @@ -0,0 +1,9 @@ +* This updates the existing FSA package on CRAN by removing the dependency on the epitools package (related to e-mail from Kurt Hornik on 7-Mar-20). + +## Notes +* There may be a note about "fishR" being misspelled in the description. This is not a misspelling. +* On [CRAN](https://cran.r-project.org/web/checks/check_results_FSA.html), there is a note in the previous version about a missing `RMark` package for the "r-patched-solaris-x86" flavor. Again (as with previous versions), I am not sure what to do about this note. + +## Testing Environments +* My Windows machine. +* Win Builder -- old-release, release, and development. diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 2a5954bc..74cb62f4 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -76,7 +76,7 @@
diff --git a/docs/authors.html b/docs/authors.html index 61dab9e2..a66dcb06 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -76,7 +76,7 @@ @@ -121,13 +121,13 @@Ogle DH, Wheeler P, Dinno A (2020). FSA: Fisheries Stock Analysis. -R package version 0.8.28, https://github.com/droglenc/FSA. +R package version 0.8.29, https://github.com/droglenc/FSA.
@Manual{, title = {FSA: Fisheries Stock Analysis}, author = {Derek H. Ogle and Powell Wheeler and Alexis Dinno}, year = {2020}, - note = {R package version 0.8.28}, + note = {R package version 0.8.29}, url = {https://github.com/droglenc/FSA}, }diff --git a/docs/index.html b/docs/index.html index 955bd4fb..7b8410f3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -39,7 +39,7 @@ diff --git a/docs/news/index.html b/docs/news/index.html index d1066b68..983bde57 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -76,7 +76,7 @@ @@ -119,9 +119,21 @@
NEWS.md
- epitools
package as it may soon be orphaned. See changes to binCI()
and poiCI()
outlined below.binCI()
: Modified. Added internal functions that are based on (but not identical to) functions in the epitools
package which will possibly be deprecated soon (per note from CRAN on 7-Mar-20).poiCI()
: Modified. Added internal functions that are based on (but not identical to) functions in the epitools
package which will possibly be deprecated soon (per note from CRAN on 7-Mar-20).Agresti, A. and B.A. Coull. 1998. Approximate is better than “exact” for interval estimation of binomial proportions. American Statistician, 52:119-126.
See binom.test
; binconf
in Hmisc; binom.exact
, binom.wilson
, and binom.approx
documented in binom.conf.int
in epitools, and functions in binom.
See binom.test
; binconf
in Hmisc; and functions in binom.
## All types at once @@ -221,7 +221,7 @@diff --git a/docs/reference/bootCase.html b/docs/reference/bootCase.html index 512297ef..b9e3cefe 100644 --- a/docs/reference/bootCase.html +++ b/docs/reference/bootCase.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/capHistConvert.html b/docs/reference/capHistConvert.html index 8f8b8ef8..2e36c546 100644 --- a/docs/reference/capHistConvert.html +++ b/docs/reference/capHistConvert.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/capHistSum.html b/docs/reference/capHistSum.html index 95f599b3..edc974ea 100644 --- a/docs/reference/capHistSum.html +++ b/docs/reference/capHistSum.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/catchCurve.html b/docs/reference/catchCurve.html index 9aff92c3..a00d6c7a 100644 --- a/docs/reference/catchCurve.html +++ b/docs/reference/catchCurve.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/chapmanRobson.html b/docs/reference/chapmanRobson.html index 290508ae..ec821edc 100644 --- a/docs/reference/chapmanRobson.html +++ b/docs/reference/chapmanRobson.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/chooseColors.html b/docs/reference/chooseColors.html index 5cfb4a3e..703c2d0c 100644 --- a/docs/reference/chooseColors.html +++ b/docs/reference/chooseColors.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/col2rgbt.html b/docs/reference/col2rgbt.html index 099555e2..744ac885 100644 --- a/docs/reference/col2rgbt.html +++ b/docs/reference/col2rgbt.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/compIntercepts.html b/docs/reference/compIntercepts.html index 23602790..e49dafef 100644 --- a/docs/reference/compIntercepts.html +++ b/docs/reference/compIntercepts.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/compSlopes.html b/docs/reference/compSlopes.html index 55453e7c..612b8a78 100644 --- a/docs/reference/compSlopes.html +++ b/docs/reference/compSlopes.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/depletion.html b/docs/reference/depletion.html index 8a81311c..30d1d898 100644 --- a/docs/reference/depletion.html +++ b/docs/reference/depletion.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/diags.html b/docs/reference/diags.html index c3e06215..20d7350a 100644 --- a/docs/reference/diags.html +++ b/docs/reference/diags.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/dunnTest.html b/docs/reference/dunnTest.html index 86c0fccd..66cf6203 100644 --- a/docs/reference/dunnTest.html +++ b/docs/reference/dunnTest.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/expandCounts.html b/docs/reference/expandCounts.html index 2e069e1f..687c3db0 100644 --- a/docs/reference/expandCounts.html +++ b/docs/reference/expandCounts.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/expandLenFreq.html b/docs/reference/expandLenFreq.html index f92d40e8..fac39834 100644 --- a/docs/reference/expandLenFreq.html +++ b/docs/reference/expandLenFreq.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/extraTests.html b/docs/reference/extraTests.html index 8f5b8cab..95c6773d 100644 --- a/docs/reference/extraTests.html +++ b/docs/reference/extraTests.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/fact2num.html b/docs/reference/fact2num.html index a0d96c5e..40aa1820 100644 --- a/docs/reference/fact2num.html +++ b/docs/reference/fact2num.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/fishR.html b/docs/reference/fishR.html index 42c7f978..c738afe5 100644 --- a/docs/reference/fishR.html +++ b/docs/reference/fishR.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/fitPlot.html b/docs/reference/fitPlot.html index 0ef4585f..8732450e 100644 --- a/docs/reference/fitPlot.html +++ b/docs/reference/fitPlot.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/fsaNews.html b/docs/reference/fsaNews.html index 65f2a40a..996c7860 100644 --- a/docs/reference/fsaNews.html +++ b/docs/reference/fsaNews.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/geomean.html b/docs/reference/geomean.html index ecf9bddb..2c13eac9 100644 --- a/docs/reference/geomean.html +++ b/docs/reference/geomean.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/growthModels.html b/docs/reference/growthModels.html index 6a6a6477..91c99f2e 100644 --- a/docs/reference/growthModels.html +++ b/docs/reference/growthModels.html @@ -77,7 +77,7 @@ @@ -267,8 +267,8 @@Contents
Author
-Derek H. Ogle, derek@derekogle.com
+Derek H. Ogle, derek@derekogle.com, though this is largely based on
binom.exact
,binom.wilson
, andbinom.approx
from the old epitools package.Examp #> } #> Linf * (1 - exp(-K * (t - t0))) #> } -#> <bytecode: 0x0000000015e5b5b0> -#> <environment: 0x0000000015def660>
ages <- 0:20 +#> <bytecode: 0x0000000015227498> +#> <environment: 0x0000000014c0a318>( vb2 <- vbFuns("Francis") )#> function (t, L1, L2 = NULL, L3 = NULL, t1, t3 = NULL) #> { #> if (length(L1) == 3) { @@ -284,15 +284,15 @@Examp #> L1 + (L3 - L1) * ((1 - r^(2 * ((t - t1)/(t3 - t1))))/(1 - #> r^2)) #> } -#> <bytecode: 0x0000000015e3ff10> -#> <environment: 0x000000001593f5b8>
( vb2c <- vbFuns("Francis",simple=TRUE) ) # compare to vb2#> function (t, L1, L2, L3, t1, t3) +#> <bytecode: 0x00000000175211e0> +#> <environment: 0x000000001581f540>( vb2c <- vbFuns("Francis",simple=TRUE) ) # compare to vb2#> function (t, L1, L2, L3, t1, t3) #> { #> r <- (L3 - L2)/(L2 - L1) #> L1 + (L3 - L1) * ((1 - r^(2 * ((t - t1)/(t3 - t1))))/(1 - #> r^2)) #> } -#> <bytecode: 0x0000000015e41ff0> -#> <environment: 0x000000001890ae70>+#> <bytecode: 0x00000000175232c0> +#> <environment: 0x0000000016017c88>## Simple Examples -- Gompertz ( gomp1 <- GompertzFuns() )#> function (t, Linf, gi = NULL, ti = NULL) #> { @@ -303,8 +303,8 @@Examp #> } #> Linf * exp(-exp(-gi * (t - ti))) #> } -#> <bytecode: 0x0000000017997dd0> -#> <environment: 0x00000000189f0760>
( gomp2 <- GompertzFuns("Ricker2") )#> function (t, L0, a = NULL, gi = NULL) +#> <bytecode: 0x0000000018a20980> +#> <environment: 0x00000000150b91c8>( gomp2 <- GompertzFuns("Ricker2") )#> function (t, L0, a = NULL, gi = NULL) #> { #> if (length(L0) == 3) { #> a <- L0[[2]] @@ -313,13 +313,13 @@Examp #> } #> L0 * exp(a * (1 - exp(-gi * t))) #> } -#> <bytecode: 0x000000001799a968> -#> <environment: 0x0000000017311d38>
( gomp2c <- GompertzFuns("Ricker2",simple=TRUE) ) # compare to gomp2#> function (t, L0, a, gi) +#> <bytecode: 0x0000000018a23518> +#> <environment: 0x000000001652a750>( gomp2c <- GompertzFuns("Ricker2",simple=TRUE) ) # compare to gomp2#> function (t, L0, a, gi) #> { #> L0 * exp(a * (1 - exp(-gi * t))) #> } -#> <bytecode: 0x0000000017999c80> -#> <environment: 0x000000000ad61040>( gompT <- GompertzFuns("Troynikov1"))#> function (Lm, dt, Linf, gi = NULL) +#> <bytecode: 0x0000000018a22830> +#> <environment: 0x00000000151ce0a0>( gompT <- GompertzFuns("Troynikov1"))#> function (Lm, dt, Linf, gi = NULL) #> { #> if (length(Linf) == 2) { #> gi <- Linf[2] @@ -327,8 +327,8 @@Examp #> } #> Linf * ((Lm/Linf)^exp(-gi * dt)) - Lm #> } -#> <bytecode: 0x00000000179a09d8> -#> <environment: 0x0000000017769c58>
+#> <bytecode: 0x00000000150b3ec0> +#> <environment: 0x00000000150c1488>## Simple Examples -- Richards ( rich1 <- RichardsFuns() )#> function (t, Linf, k = NULL, a = NULL, b = NULL) #> { @@ -340,8 +340,8 @@Examp #> } #> Linf * (1 - a * exp(-k * t))^b #> } -#> <bytecode: 0x0000000018ab78d0> -#> <environment: 0x000000000b7e2880>
( rich2 <- RichardsFuns(2) )#> function (t, Linf, k = NULL, ti = NULL, b = NULL) +#> <bytecode: 0x000000001609aaf0> +#> <environment: 0x0000000017596b80>( rich2 <- RichardsFuns(2) )#> function (t, Linf, k = NULL, ti = NULL, b = NULL) #> { #> if (length(Linf) == 4) { #> k <- Linf[[2]] @@ -351,8 +351,8 @@Examp #> } #> Linf * (1 - (1/b) * exp(-k * (t - ti)))^b #> } -#> <bytecode: 0x000000001756abe8> -#> <environment: 0x00000000174e8458>
( rich3 <- RichardsFuns(3) )#> function (t, Linf, k = NULL, ti = NULL, b = NULL) +#> <bytecode: 0x000000001609d3b0> +#> <environment: 0x000000000b790678>( rich3 <- RichardsFuns(3) )#> function (t, Linf, k = NULL, ti = NULL, b = NULL) #> { #> if (length(Linf) == 4) { #> k <- Linf[[2]] @@ -362,8 +362,8 @@Examp #> } #> Linf/((1 + b * exp(-k * (t - ti)))^(1/b)) #> } -#> <bytecode: 0x000000001884d350> -#> <environment: 0x000000000c167108>
( rich4 <- RichardsFuns(4) )#> function (t, Linf, k = NULL, ti = NULL, b = NULL) +#> <bytecode: 0x000000001609b9e0> +#> <environment: 0x0000000015740060>( rich4 <- RichardsFuns(4) )#> function (t, Linf, k = NULL, ti = NULL, b = NULL) #> { #> if (length(Linf) == 4) { #> k <- Linf[[2]] @@ -373,8 +373,8 @@Examp #> } #> Linf * (1 + (b - 1) * exp(-k * (t - ti)))^(1/(1 - b)) #> } -#> <bytecode: 0x0000000009c232d8> -#> <environment: 0x000000000bf39038>
( rich5 <- RichardsFuns(5) )#> function (t, Linf, k = NULL, L0 = NULL, b = NULL) +#> <bytecode: 0x000000001609dd60> +#> <environment: 0x000000001887be78>( rich5 <- RichardsFuns(5) )#> function (t, Linf, k = NULL, L0 = NULL, b = NULL) #> { #> if (length(Linf) == 4) { #> k <- Linf[[2]] @@ -385,8 +385,8 @@Examp #> Linf * (1 + (((L0/Linf)^(1 - b)) - 1) * exp(-k * t))^(1/(1 - #> b)) #> } -#> <bytecode: 0x0000000017025ed0> -#> <environment: 0x000000000b74c8d0>
( rich6 <- RichardsFuns(6) )#> function (t, Linf, k = NULL, ti = NULL, Lninf = NULL, b = NULL) +#> <bytecode: 0x000000001758fcd8> +#> <environment: 0x0000000018690600>( rich6 <- RichardsFuns(6) )#> function (t, Linf, k = NULL, ti = NULL, Lninf = NULL, b = NULL) #> { #> if (length(Linf) == 5) { #> k <- Linf[[2]] @@ -398,13 +398,13 @@Examp #> Lninf + (Linf - Lninf) * (1 + (b - 1) * exp(-k * (t - ti)))^(1/(1 - #> b)) #> } -#> <bytecode: 0x000000001655b0a8> -#> <environment: 0x000000000b440e40>
( rich2c <- RichardsFuns(2,simple=TRUE) ) # compare to rich2#> function (t, Linf, k, ti, b) +#> <bytecode: 0x0000000017591840> +#> <environment: 0x0000000009d33340>( rich2c <- RichardsFuns(2,simple=TRUE) ) # compare to rich2#> function (t, Linf, k, ti, b) #> { #> Linf * (1 - (1/b) * exp(-k * (t - ti)))^b #> } -#> <bytecode: 0x00000000160e1e58> -#> <environment: 0x000000000b1ee3e8>+#> <bytecode: 0x000000001609c2a0> +#> <environment: 0x0000000016a51b50>## Simple Examples -- Logistic ( log1 <- logisticFuns() )#> function (t, Linf, gninf = NULL, ti = NULL) #> { @@ -415,8 +415,8 @@Examp #> } #> Linf/(1 + exp(-gninf * (t - ti))) #> } -#> <bytecode: 0x000000000b1299a8> -#> <environment: 0x000000000b1220e0>
( log2 <- logisticFuns("CJ2") )#> function (t, Linf, gninf = NULL, a = NULL) +#> <bytecode: 0x0000000015a3d080> +#> <environment: 0x00000000159069a8>( log2 <- logisticFuns("CJ2") )#> function (t, Linf, gninf = NULL, a = NULL) #> { #> if (length(Linf) == 3) { #> gninf <- Linf[[2]] @@ -425,13 +425,13 @@Examp #> } #> Linf/(1 + a * exp(-gninf * t)) #> } -#> <bytecode: 0x000000000b128bd0> -#> <environment: 0x000000000ae6c698>
( log2c <- logisticFuns("CJ2",simple=TRUE) ) # compare to log2#> function (t, Linf, gninf, a) +#> <bytecode: 0x0000000015a28ab8> +#> <environment: 0x0000000014d12f28>( log2c <- logisticFuns("CJ2",simple=TRUE) ) # compare to log2#> function (t, Linf, gninf, a) #> { #> Linf/(1 + a * exp(-gninf * t)) #> } -#> <bytecode: 0x000000000b125c48> -#> <environment: 0x000000000ab400a0>( log3 <- logisticFuns("Karkach") )#> function (t, Linf, L0 = NULL, gninf = NULL) +#> <bytecode: 0x0000000015a29768> +#> <environment: 0x000000000b1c6c90>( log3 <- logisticFuns("Karkach") )#> function (t, Linf, L0 = NULL, gninf = NULL) #> { #> if (length(Linf) == 3) { #> L0 <- Linf[[2]] @@ -440,8 +440,8 @@Examp #> } #> L0 * Linf/(L0 + (Linf - L0) * exp(-gninf * t)) #> } -#> <bytecode: 0x000000000b1261f8> -#> <environment: 0x000000000aa95430>
( log4 <- logisticFuns("Haddon") )#> function (Lm, dLmax, L50 = NULL, L95 = NULL) +#> <bytecode: 0x0000000015a29d18> +#> <environment: 0x000000000b12ff78>( log4 <- logisticFuns("Haddon") )#> function (Lm, dLmax, L50 = NULL, L95 = NULL) #> { #> if (length(dLmax) == 3) { #> L50 <- dLmax[2] @@ -450,8 +450,8 @@Examp #> } #> dLmax/(1 + exp(log(19) * ((Lm - L50)/(L95 - L50)))) #> } -#> <bytecode: 0x000000000b1239a8> -#> <environment: 0x0000000009d865a0>
+#> <bytecode: 0x0000000015984ab8> +#> <environment: 0x000000000aa79cd8>########################################################### ## Examples of fitting diff --git a/docs/reference/headtail.html b/docs/reference/headtail.html index 2c68137f..82e00dc8 100644 --- a/docs/reference/headtail.html +++ b/docs/reference/headtail.html @@ -77,7 +77,7 @@diff --git a/docs/reference/hist.formula.html b/docs/reference/hist.formula.html index 45ec176e..e0d28175 100644 --- a/docs/reference/hist.formula.html +++ b/docs/reference/hist.formula.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/histFromSum.html b/docs/reference/histFromSum.html index 5cc487e0..c2adc97d 100644 --- a/docs/reference/histFromSum.html +++ b/docs/reference/histFromSum.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/hoCoef.html b/docs/reference/hoCoef.html index d7136726..29a01d8e 100644 --- a/docs/reference/hoCoef.html +++ b/docs/reference/hoCoef.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/hyperCI.html b/docs/reference/hyperCI.html index 5bfe1a1f..bc321969 100644 --- a/docs/reference/hyperCI.html +++ b/docs/reference/hyperCI.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/index.html b/docs/reference/index.html index 7aeeb367..60ce0838 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -76,7 +76,7 @@ diff --git a/docs/reference/knitUtil.html b/docs/reference/knitUtil.html index 69d41a8b..71fafdcf 100644 --- a/docs/reference/knitUtil.html +++ b/docs/reference/knitUtil.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/ksTest.html b/docs/reference/ksTest.html index 1e9ee07a..562ed905 100644 --- a/docs/reference/ksTest.html +++ b/docs/reference/ksTest.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/lagratio.html b/docs/reference/lagratio.html index 59b6a278..74453c67 100644 --- a/docs/reference/lagratio.html +++ b/docs/reference/lagratio.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/lencat.html b/docs/reference/lencat.html index b1504ff0..1dcc90ff 100644 --- a/docs/reference/lencat.html +++ b/docs/reference/lencat.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/logbtcf.html b/docs/reference/logbtcf.html index 3e3957d9..c9d8213d 100644 --- a/docs/reference/logbtcf.html +++ b/docs/reference/logbtcf.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/lwCompPreds.html b/docs/reference/lwCompPreds.html index b17dcd89..ee0e8319 100644 --- a/docs/reference/lwCompPreds.html +++ b/docs/reference/lwCompPreds.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/mapvalues.html b/docs/reference/mapvalues.html index eb9bcfeb..2005831b 100644 --- a/docs/reference/mapvalues.html +++ b/docs/reference/mapvalues.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/metaM.html b/docs/reference/metaM.html index 1c21b770..b4fdd6f2 100644 --- a/docs/reference/metaM.html +++ b/docs/reference/metaM.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/mrClosed.html b/docs/reference/mrClosed.html index 20471377..0a414926 100644 --- a/docs/reference/mrClosed.html +++ b/docs/reference/mrClosed.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/mrOpen.html b/docs/reference/mrOpen.html index 39b7ac09..e6882c05 100644 --- a/docs/reference/mrOpen.html +++ b/docs/reference/mrOpen.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/nlsBoot.html b/docs/reference/nlsBoot.html index 3e9674eb..b6112a9c 100644 --- a/docs/reference/nlsBoot.html +++ b/docs/reference/nlsBoot.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/nlsTracePlot.html b/docs/reference/nlsTracePlot.html index a806ea6e..acd2e111 100644 --- a/docs/reference/nlsTracePlot.html +++ b/docs/reference/nlsTracePlot.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/oddeven.html b/docs/reference/oddeven.html index f2117f19..10261458 100644 --- a/docs/reference/oddeven.html +++ b/docs/reference/oddeven.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/perc.html b/docs/reference/perc.html index 9d756fde..16982b19 100644 --- a/docs/reference/perc.html +++ b/docs/reference/perc.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/plotAB.html b/docs/reference/plotAB.html index 6887dd1c..8dc35dbc 100644 --- a/docs/reference/plotAB.html +++ b/docs/reference/plotAB.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/plotBinResp.html b/docs/reference/plotBinResp.html index 601042e5..220efc46 100644 --- a/docs/reference/plotBinResp.html +++ b/docs/reference/plotBinResp.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/poiCI.html b/docs/reference/poiCI.html index a4c400be..6a8f1a34 100644 --- a/docs/reference/poiCI.html +++ b/docs/reference/poiCI.html @@ -77,7 +77,7 @@ @@ -158,10 +158,8 @@Value
A #x2 matrix that contains the lower and upper confidence interval bounds as columns and, if
verbose=TRUE
x
.Details
-Computes a CI for the Poisson counts using the
-exact
, gamma distribution (daly
`), Byar's (byar
), or normal approximation (asymptotic
) methods. This is largely a wrapper topois.exact
,pois.daly
,pois.byar
, andpois.approx
functions documented inpois.conf.int
in epitools.See also
- -+See
pois.exact
,pois.daly
,pois.byar
, andpois.approx
(documented inpois.conf.int
) in epitools for more description and references.Computes a CI for the Poisson counts using the
+exact
, gamma distribution (daly
`), Byar's (byar
), or normal approximation (asymptotic
) methods.The
pois.daly
function gives essentially identical answers to thepois.exact
function except when x=0. When x=0, for the upper confidence limitpois.exact
returns 3.689 andpois.daly
returns 2.996.Examples
## Demonstrates using all types at once @@ -194,12 +192,11 @@diff --git a/docs/reference/psdAdd.html b/docs/reference/psdAdd.html index 15db98a3..6765e7f1 100644 --- a/docs/reference/psdAdd.html +++ b/docs/reference/psdAdd.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/psdCI.html b/docs/reference/psdCI.html index e74e37a6..d5047a53 100644 --- a/docs/reference/psdCI.html +++ b/docs/reference/psdCI.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/psdCalc.html b/docs/reference/psdCalc.html index d3f50564..66d02eed 100644 --- a/docs/reference/psdCalc.html +++ b/docs/reference/psdCalc.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/psdPlot.html b/docs/reference/psdPlot.html index 910fb9bf..6fdc0a65 100644 --- a/docs/reference/psdPlot.html +++ b/docs/reference/psdPlot.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/psdVal.html b/docs/reference/psdVal.html index cc739b22..e619bc38 100644 --- a/docs/reference/psdVal.html +++ b/docs/reference/psdVal.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/rSquared.html b/docs/reference/rSquared.html index de02eacc..8facb701 100644 --- a/docs/reference/rSquared.html +++ b/docs/reference/rSquared.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/rcumsum.html b/docs/reference/rcumsum.html index ff3c46d1..feae6993 100644 --- a/docs/reference/rcumsum.html +++ b/docs/reference/rcumsum.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/removal.html b/docs/reference/removal.html index c92c18d1..fe3e83b5 100644 --- a/docs/reference/removal.html +++ b/docs/reference/removal.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/residPlot.html b/docs/reference/residPlot.html index df7f6fbc..abec0f54 100644 --- a/docs/reference/residPlot.html +++ b/docs/reference/residPlot.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/se.html b/docs/reference/se.html index a726bc42..22040a4d 100644 --- a/docs/reference/se.html +++ b/docs/reference/se.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/srStarts.html b/docs/reference/srStarts.html index 22bf1b75..c1635405 100644 --- a/docs/reference/srStarts.html +++ b/docs/reference/srStarts.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/stockRecruitment.html b/docs/reference/stockRecruitment.html index 6c9af62a..6b2e4359 100644 --- a/docs/reference/stockRecruitment.html +++ b/docs/reference/stockRecruitment.html @@ -77,7 +77,7 @@ @@ -205,8 +205,8 @@Contents
Arguments Value Details -See also Examples Author
-Derek H. Ogle, derek@derekogle.com
+Derek H. Ogle, derek@derekogle.com, though this is largely based on
pois.exact
,pois.daly
,pois.byar
, andpois.approx
from the old epitools package.Examp #> } #> a * S * exp(-b * S) #> } -#> <bytecode: 0x0000000017c3a248> -#> <environment: 0x00000000169377e8>
+#> <bytecode: 0x0000000018e22450> +#> <environment: 0x0000000014c32378># create some dummy stock data stock <- seq(0.01,1000,length.out=199) @@ -219,8 +219,8 @@Examp #> } #> a * S/(1 + b * S) #> } -#> <bytecode: 0x00000000183094c0> -#> <environment: 0x0000000016ccb580>
+#> <bytecode: 0x0000000015939c50> +#> <environment: 0x00000000169a3e40># Ricker #1 parameterization ( r1 <- srFuns("Ricker") )#> function (S, a, b = NULL) #> { @@ -230,8 +230,8 @@Examp #> } #> a * S * exp(-b * S) #> } -#> <bytecode: 0x0000000017c3a248> -#> <environment: 0x0000000015d32cc0>
+#> <bytecode: 0x0000000018e22450> +#> <environment: 0x0000000016e39c90># Shephered parameterization ( s1 <- srFuns("Shepherd") )#> function (S, a, b = NULL, c = NULL) #> { @@ -242,8 +242,8 @@Examp #> } #> a * S/(1 + (b * S)^c) #> } -#> <bytecode: 0x0000000015e58590> -#> <environment: 0x0000000015f82950>
+#> <bytecode: 0x0000000018e2ae60> +#> <environment: 0x0000000015a465d0># Saila-Lorda parameterization ( sl1 <- srFuns("SailaLorda") )#> function (S, a, b = NULL, c = NULL) #> { @@ -254,8 +254,8 @@Examp #> } #> a * (S^c) * exp(-b * S) #> } -#> <bytecode: 0x0000000015e59a90> -#> <environment: 0x000000001654b068>
+#> <bytecode: 0x0000000018e2d838> +#> <environment: 0x000000000b781ae0>## Examples of fitting stock-recruitment functions # Fitting the Beverton-Holt #1 parameterization with multiplicative errors bh1s <- srStarts(recruits~stock,data=CodNorwegian) diff --git a/docs/reference/sumTable.html b/docs/reference/sumTable.html index 05bffbf0..d3d17c76 100644 --- a/docs/reference/sumTable.html +++ b/docs/reference/sumTable.html @@ -77,7 +77,7 @@diff --git a/docs/reference/tictactoe.html b/docs/reference/tictactoe.html index 3c19b29a..d297b496 100644 --- a/docs/reference/tictactoe.html +++ b/docs/reference/tictactoe.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/validn.html b/docs/reference/validn.html index 1ee4988a..6114e4cc 100644 --- a/docs/reference/validn.html +++ b/docs/reference/validn.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/vbStarts.html b/docs/reference/vbStarts.html index e65afa67..5a9f77b0 100644 --- a/docs/reference/vbStarts.html +++ b/docs/reference/vbStarts.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/wrAdd.html b/docs/reference/wrAdd.html index 90c5a563..05b0f895 100644 --- a/docs/reference/wrAdd.html +++ b/docs/reference/wrAdd.html @@ -77,7 +77,7 @@ diff --git a/docs/reference/wsVal.html b/docs/reference/wsVal.html index 93a370f7..52b56c01 100644 --- a/docs/reference/wsVal.html +++ b/docs/reference/wsVal.html @@ -77,7 +77,7 @@