Skip to content

Commit a8e517d

Browse files
committed
Closing out v0.9.2
1 parent 8b9c7a7 commit a8e517d

File tree

244 files changed

+16809
-23646
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+16809
-23646
lines changed

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: FSA
2-
Version: 0.9.1.9000
3-
Date: 2021-9-25
2+
Version: 0.9.2
3+
Date: 2022-2-12
44
Title: Simple Fisheries Stock Assessment Methods
55
Description: A variety of simple fish stock assessment methods.
66
Detailed vignettes are available on the fishR website <http://derekogle.com/fishR/>.
@@ -48,4 +48,4 @@ Suggests:
4848
tibble,
4949
covr
5050
Encoding: UTF-8
51-
RoxygenNote: 7.1.1
51+
RoxygenNote: 7.1.2

NEWS.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
# FSA 0.9.2 ongoing
1+
# FSA 0.9.2 12-Feb-21
2+
* Last version maintained by Derek Ogle. Transfering to fishR Core Team for next version.
23
* `psdAdd()`: Modified. Changed the way `PSDlit` was loaded into the function environment so that `FSA::psdAdd()` will work. Addresses [#85](https://github.com/droglenc/FSA/issues/85).
4+
* `PSDLit`: Modified. Added info for Utah Chub (from [here](https://webpages.uidaho.edu/quistlab/publications/NAJFM_2021_Black_et_al_UTC_Ws_length_categories.pdf); address [#84](https://github.com/droglenc/FSA/issues/84)).
35
* `psdVal()`: Modified. Changed the way `PSDlit` was loaded into the function environment so that `FSA::psdVal()` will work. Addresses [#85](https://github.com/droglenc/FSA/issues/85).
46
* `wrAdd()`: Modified. Changed the way `WSlit` was loaded into the function environment so that `FSA::wrAdd()` will work. Addresses [#85](https://github.com/droglenc/FSA/issues/85).
7+
* `WSLit`: Modified. Added info for Utah Chub (from [here](https://webpages.uidaho.edu/quistlab/publications/NAJFM_2021_Black_et_al_UTC_Ws_length_categories.pdf); address [#84](https://github.com/droglenc/FSA/issues/84)).
58
* `wsVal()`: Modified. Changed the way `WSlit` was loaded into the function environment so that `FSA::wsVal()` will work. Addresses [#85](https://github.com/droglenc/FSA/issues/85).
69

710
# FSA 0.9.1 17-Jul-21

data-raw/PSDlit.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ Striped Bass (landlocked),12,20,30,35,45,30,51,76,89,114,Gabelhouse (1984a)
5656
Striped Bass (hybrid),10,16,20,24,28,25,41,51,61,71,Dumont and Neely (2011)
5757
Striped Bass X White Bass,10,16,20,24,28,25,41,51,61,71,Dumont and Neely (2011)
5858
Suwannee Bass,6,9.75,11.75,13.75,15.75,15,25,30,35,40,Bonvechio et al. (2010)
59+
Utah Chub,4,8,10,12,15,10,20,25,30,38,Black et al. (2021)
5960
Walleye,10,15,20,25,30,25,38,51,63,76,Gabelhouse (1984a)
6061
Warmouth,3,6,8,10,12,8,15,20,25,30,Gabelhouse (1984a)
6162
White Bass,6,9,12,15,18,15,23,30,38,46,Gabelhouse (1984a)

data-raw/WSlit.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ Striped Bass X White Bass,metric,linear,75,TL,RLP,115,NA,-5.201,3.139,NA,Brown a
174174
Suwannee Bass,metric,quadratic,75,TL,EmP,110,NA,-0.106,-1.363,0.995,Bonvechio et al. (2010),none
175175
Tiger Muskellunge,English,linear,75,TL,RLP,9.5,NA,-4.095,3.337,NA,Rogers and Koupal (1997),none
176176
Tiger Muskellunge,metric,linear,75,TL,RLP,240,NA,-6.126,3.337,NA,Rogers and Koupal (1997),none
177+
Utah Chub,metric,linear,75,TL,EmP,90,410,-4.938,3.031,NA,Black et al. (2021),none
178+
Utah Chub,English,linear,75,TL,EmP,4,16,-3.335,3.031,NA,Black et al. (2021),none
177179
Walleye,English,linear,75,TL,RLP,6,NA,-3.642,3.18,NA,Murphy et al. (1990),none
178180
Walleye,metric,linear,75,TL,RLP,150,NA,-5.453,3.18,NA,Murphy et al. (1990),none
179181
Walleye (30-149 mm),English,linear,75,TL,RLP,1.25,NA,-3.431,2.869,NA,Flammang et al. (1999),none

data-raw/aaaConvertCSV2RDATA.R

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,18 @@
55
## aaaConvertTab2CSV.R if there is.
66
################################################################################
77

8-
library(tools)
9-
10-
## Get all .csv files in the data-raw directory
11-
setwd("C:/aaaWork/Programs/GitHub/FSA/data-raw")
12-
raw <- list.files(pattern="*.csv")
13-
14-
## You may only want to use a few files ... use this (e.g.) to do that
15-
#raw
8+
## Get all .csv files in the data-raw directory (assumes wd is project directory)
9+
raw <- list.files(path="./data-raw",pattern="*.csv")
10+
## If you only want to use a few files then do this (e.g.)
1611
#raw <- raw[c(10,16)]
12+
raw
1713

18-
#### Convert to .rdata files ####
19-
## Cycle through each file to make it an RDA file
14+
#### Convert all in raw to .rdata files
2015
for (f in raw) {
21-
print(f)
22-
## Read file
23-
nm <- file_path_sans_ext(f)
24-
assign(nm,read.csv(f))
25-
## Save as an .rdata file
26-
save(list=nm,file=paste0("../data/",nm,".rdata"))
16+
oldf <- paste0("data-raw/",f)
17+
nm <- tools::file_path_sans_ext(f)
18+
newf <- paste0("data/",nm,".rdata")
19+
cat(oldf,"---->",newf,"\n")
20+
assign(nm,read.csv(oldf)) ## Read file
21+
save(list=nm,file=newf) ## Save as an .rdata file
2722
}

data/PSDlit.rdata

35 Bytes
Binary file not shown.

data/WSlit.rdata

51 Bytes
Binary file not shown.

docs/LICENSE-text.html

Lines changed: 18 additions & 91 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)