diff --git a/DESCRIPTION b/DESCRIPTION index 7c5c85c6..21ca709e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: FSA Title: Simple Fisheries Stock Assessment Methods Version: 0.8.10 -Date: 2016-9-7 +Date: 2016-9-23 Description: A variety of simple fish stock assessment methods. Detailed vignettes are available on the fishR website . Authors@R: person("Derek","Ogle",email="derek@derekogle.com",role=c("aut","cre")) diff --git a/NEWS.md b/NEWS.md index 7f18e93b..48c4e02c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,7 @@ * `chapmanRobson()`: Modified. Added `axis.age=` argument that allows the user to choose which type of x-axis is displayed (see examples; this addresses [#20](https://github.com/droglenc/FSA/issues/20)) Also modified code that adds the axes so that they should "look better" in more instances. Added `na.rm=TRUE` to y-range calculation for the plot method. Added a `coef()` method. Added a `parm=` argument to the `confint()` and `summary()` methods. Added tests. * `confint.nlsBoot()`,`confint.bootCase()`. Modified. Result is now a matrix even if only one parameter is chosen (previously it was an unnamed vector). The `parm=` now properly handles negative values. Streamlined plotting results. Added tests. * `depletion()`: Modified. Checked for bad `conf.level=` in `confint()` method. +* `GompertzFuns()`: Modified. Fixed bug related to selecting `QuinnDeriso3`. * `htest.nlsBoot()`,`htest.bootCase()`. Modified. The `b0` now defaults to 0. Matrix of results now include the parameter as the rowname. Modified the internals of how the data are handled. Added tests. * `iAddLoessLine()`: Modified. Suppressed warnings related to the loess line predictions. * `mrClosed()`: Modified. Checked for bad `conf.level=` in `confint()` method. @@ -633,7 +634,7 @@ * `removal()`: Modified. Completely modified the code so that the examples with `apply()` and `lapply()` would also provide confidence intervals. Also changed the code to reflect that $\sum_{i=1}^{k-1}T_{i}$ from Schnute (1983) is the same as $X$ from Carle and Strub (1978), the $\sum_{i=1}^{k-1}T_{i}-C_{1}$ in Schnute (1983) is the same as $X-(k-1)C_{1}$, and $q$ in Schnute (1983) is $p$ in most other resources. These changes allowed some efficiencies and connected the theory behind the methods more firmly. Removed the check for character data. Kept the check for whether catch was a vector or not but if catch is a one row or one column matrix or data.frame then it will be converted to a vector to continue. The latter change allows one to extract one row from a data.frame to send to `removal()` without having to use `as.numeric()`. Modified and added examples of the use of `apply()` and `lapply()`. # FSA 0.4.22 Aug14 -* `ageKey()`: Modified. Changed to using `all.equal()` to check if the ALK has rows that don't sum to 1. This was an attempt to minimize the number of "false negatives" caused by [R FAQ 7.31](http://cran.r-project.org/doc/FAQ/R-FAQ.html#Why-doesn_0027t-R-think-these-numbers-are-equal_003f). Changed the check of whether the longest fish in the length sample is greater than the longest length bin in the ALK to whether the longest fish in the length sample is greater than the longest length bin in ALK PLUS the minimum width of length categories. This last change is an attempt to minimize the number of warnings that occur when the longest fish in the length sample would be in the last length category ALK but because the length categories are labelled by their minimum length it looks like it is not. The minimum width is used to still allow unevent length categories and, thus, this check may still produce some "false negatives." +* `ageKey()`: Modified. Changed to using `all.equal()` to check if the ALK has rows that don't sum to 1. This was an attempt to minimize the number of "false negatives" caused by [R FAQ 7.31](https://cran.r-project.org/doc/FAQ/R-FAQ.html#Why-doesn_0027t-R-think-these-numbers-are-equal_003f). Changed the check of whether the longest fish in the length sample is greater than the longest length bin in the ALK to whether the longest fish in the length sample is greater than the longest length bin in ALK PLUS the minimum width of length categories. This last change is an attempt to minimize the number of warnings that occur when the longest fish in the length sample would be in the last length category ALK but because the length categories are labelled by their minimum length it looks like it is not. The minimum width is used to still allow unevent length categories and, thus, this check may still produce some "false negatives." * `ageKeyPlot()`: Modified. Removed `bubble.ylab=`. Modified `ylab=` to handle what `bubble.ylab=` used to handle. * `removal()`: Modified. Added options to perform Moran (1951) and Schnute (1983) removal methods. Added examples of the new functionality. Updated the tests for the new functionality. diff --git a/R/growthModels.R b/R/growthModels.R index 7a534051..32846cdd 100644 --- a/R/growthModels.R +++ b/R/growthModels.R @@ -690,7 +690,7 @@ GompertzFuns <- function(param=c("Ricker1","Ricker2","Ricker3", " gi = instantaneous growth rate at the inflection point\n", " a = dimenstionless parameter related to growth\n\n") }, - QD3=,QuinnDeriso3== { + QD3=,QuinnDeriso3= { message("You have chosen the 'QuinnDeriso3' ",comcat, " E[L|t] = Linf*exp(-(1/gi)*exp(-gi*(t-t0)))\n\n", " where Linf = asymptotic mean length\n",