Skip to content

Commit

Permalink
Added BluegillIL and made minor typo corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
Derek Ogle committed Aug 23, 2016
1 parent 8e607a7 commit 7901915
Show file tree
Hide file tree
Showing 14 changed files with 123 additions and 29 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
@@ -1,7 +1,7 @@
Package: FSAdata
Title: Data to Support Fish Stock Assessment ('FSA') Package
Version: 0.3.4
Date: 2016-7-18
Date: 2016-8-23
Description: The datasets to support the Fish Stock Assessment ('FSA') package.
Authors@R: person("Derek","Ogle",email="derek@derekogle.com",role=c("aut","cre"))
URL: http://derekogle.com/fishR/, https://github.com/droglenc/FSAdata
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
@@ -1,6 +1,10 @@
# 0.3.4 ongoing
* `BluegillIL`: Added.
* `Cabezon`: Fixed small typo in documentation.
* `RBTroutKenai`: Fixed small typo in documentation.
* `RuffeSLRH92`: Added more specificity to documentation.
* `WalleyeErie2`: Fixed small typo in documentation.
* `WalleyeML`: Fixed small typo in documentation.
* `YERockfish`: Fixed small typo in documentation.

# 0.3.3 18-Jul-16
Expand Down
37 changes: 37 additions & 0 deletions R/BluegillIL.R
@@ -0,0 +1,37 @@
#' @title Length-at-marking and recapture and time-at-large of Bluegill.
#'
#' @description Length-at-marking and recapture and time-at-large for Bluegill (\emph{Lepomis macrochirus}) originally captured in Spring 2010 from Inch Lake, Wisconsin.
#'
#' @name BluegillIL
#'
#' @docType data
#'
#' @format A data frame with 61 observations on the following 5 variables:
#' \describe{
#' \item{tag}{Unique Floy tag number.}
#' \item{Lm}{length (mm) at tagging.}
#' \item{Lr}{Length (mm) at recapture.}
#' \item{dL}{Change in length (mm).}
#' \item{dt}{Time-at-large (yrs).}
#' }
#'
#' @section Topic(s):
#' \itemize{
#' \item Growth
#' \item von Bertalanffy
#' \item Fabens method
#' }
#'
#' @concept Growth 'von Bertalanffy' Fabens
#'
#' @source These unpublished data are from Derek H. Ogle, Northland College. \bold{Do not use for other than educational purposes without permission from the source.}
#'
#' @keywords datasets
#'
#' @examples
#' data(BluegillIL)
#' str(BluegillIL)
#' head(BluegillIL)
#' plot((Lr-Lm)~dt,data=BluegillIL)
#'
NULL
8 changes: 4 additions & 4 deletions R/RBTroutKenai.R
@@ -1,16 +1,16 @@
#' @title Length-at-marking and recapture and time-at-large of Rainbow Trout.
#'
#' @description Length-at-marking and recapture and time-at-large for Rainbow Trout (\emph{Oncorhynchus mykiss}) in the Kenai River, Alaska.
#' @description Length-at-marking and recapture and time-at-large for Rainbow Trout (\emph{Oncorhynchus mykiss}) from the Kenai River, Alaska.
#'
#' @name RBTroutKenai
#'
#' @docType data
#'
#' @format A data frame with 102 observations on the following 3 variables:
#' \describe{
#' \item{Lr}{length (mm) at recapture.}
#' \item{Lm}{length (mm) at marking.}
#' \item{dt}{time-at-large (yrs).}
#' \item{Lr}{Length (mm) at recapture.}
#' \item{Lm}{Length (mm) at marking.}
#' \item{dt}{Time-at-large (yrs).}
#' }
#'
#' @section Topic(s):
Expand Down
4 changes: 3 additions & 1 deletion R/RuffeSLRH92.R
Expand Up @@ -49,7 +49,9 @@
#' par(op)
#' xtabs(~age,data=RuffeSLRH92)
#' xtabs(~sex,data=RuffeSLRH92)
#' RuffeSLRH92$maturity <- ordered(RuffeSLRH92$maturity,levels=c("yoy","immature","developing","mature","nearly.ripe","ripe","running","nearly.spent","spent","recovering","unknown"))
#' tmp <- c("yoy","immature","developing","mature","nearly.ripe","ripe",
#' "running","nearly.spent","spent","recovering","unknown")
#' RuffeSLRH92$maturity <- ordered(RuffeSLRH92$maturity,levels=tmp)
#' xtabs(~maturity,data=RuffeSLRH92)
#' xtabs(~maturity+month+sex,data=RuffeSLRH92)
#'
Expand Down
16 changes: 8 additions & 8 deletions R/WalleyeErie2.R
Expand Up @@ -7,14 +7,14 @@
#' @format A data frame of 33734 observations on the following 10 variables:
#' \describe{
#' \item{setID}{Unique gear (multifilament gill net kegged 6 ft below surface) set identification number.}
#' \item{loc}{Regional location (1=Toledo to Huron, 2=Huron to Fairport Harbor, 3=Fairport Harbor Conneaut).}
#' \item{grid}{2.5-minute sampling grid location}
#' \item{year}{Year of data}
#' \item{tl}{Total length (mm)}
#' \item{w}{Weight (g). There are several missing values}
#' \item{sex}{Sex (female, male)}
#' \item{mat}{Maturity (immature, mature)}
#' \item{age}{Age (yrs) from otoliths}
#' \item{loc}{Regional location (1=Toledo to Huron, 2=Huron to Fairport Harbor, 3=Fairport Harbor to Conneaut).}
#' \item{grid}{2.5-minute sampling grid location.}
#' \item{year}{Year of data.}
#' \item{tl}{Total length (mm).}
#' \item{w}{Weight (g). There are several missing values.}
#' \item{sex}{Sex (female, male).}
#' \item{mat}{Maturity (immature, mature).}
#' \item{age}{Age (yrs) from otoliths.}
#' }
#' @section Topic(s): \itemize{
#' \item Growth
Expand Down
2 changes: 1 addition & 1 deletion R/WalleyeML.R
Expand Up @@ -12,7 +12,7 @@
#' \item{Est.Age}{Estimated (from otoliths) age (yrs) at capture.}
#' \item{TL}{Total length (mm).}
#' \item{Scale.Rad}{Total scale radius (mm) at capture.}
#' \item{Dist.Ann}{Scale radisus (mm) to annulus given in \code{BC.Age}.}
#' \item{Dist.Ann}{Scale radius (mm) to annulus given in \code{BC.Age}.}
#' \item{BC.Age}{Annulus or previous age.}
#' \item{BC.Len}{Back-calculated length at \code{BC.Age}. Lengths were back-calculated using the \emph{Scale-Proportional Hypothesis} method.}
#' }
Expand Down
9 changes: 9 additions & 0 deletions cran-comments/cran-comments_v0_3_4.md
@@ -0,0 +1,9 @@
* This updates the existing FSAdata package on CRAN.

## Notes
* There is a note about "datasets" being misspelled in the description. I do not consider "datasets" to be misspelled.

## Testing Environments
* My Windows machine.
* Win Builder -- current and development.
* Travis-CI.
Binary file added data/BluegillIL.rdata
Binary file not shown.
40 changes: 40 additions & 0 deletions man/BluegillIL.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions man/RBTroutKenai.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion man/RuffeSLRH92.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions man/WalleyeErie2.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/WalleyeML.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7901915

Please sign in to comment.