Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch stockeff #53

Merged
merged 25 commits into from
Nov 30, 2023
Merged

Switch stockeff #53

merged 25 commits into from
Nov 30, 2023

Conversation

slucey
Copy link
Member

@slucey slucey commented Nov 30, 2023 •
edited by andybeet
Loading

Points towards stockeff table and quick fixes for inflation and foreign landings (meat weights)

  • Now uses TONCL2 instead of TONCL1 (STOCKEFF only uncludes TONCL2)
    • This involved downsteam changes to assign_unknowns
    • disaggregate_skates_hakes
    • get_herring_data
  • Use MARKET_CODE (character string) instead of MKCAT (the 4th digit of NESPP4)
  • Added flag in in process_foreign_landings to convert livewt (NAFO default for shellfish) to meatwt

Sean Lucey and others added 24 commits November 9, 2023 10:36
Switched to pulling from stockeff table
1efa8a8
Merge branch 'switch_stockeff' of github.com:NOAA-EDAB/comlandr into …
e241174 
…switch_stockeff
switch channel to Sole
b1b966f
Needed to specify the object sql
89f681e
Missed an old comland.yr reference
526ffd2
Switched to one call for channel instead of two
c99f10f
Switched to toncl2...may want to revisit default
763cf97
Needed to remove NESPP4 code from raw data
61c756c
Changed from MKTCAT to MARKET_CODE...need to revisit default
900a38f
Needed to remove SPPLNDLB column
6da97a4
Replaced toncl1 with toncl2
be7294b
changed MKTCAT to MARKET_CODE
5cc9dc3
Needed to comment out toncl1 now using toncl2
e913998
Added gtools
0ebf47a
missed a call to data.table
4b49d29
added reference to data.table
9fdd81e
@andybeet
updated documentation relating to change in number of function arguments
ba74623
@andybeet
added MARKET_CODE to foreign data
d4feaf0 
replaced TONCL1 with TONCL2
@andybeet
used MARKET_CODE = NA for foreign catch
3ea428c
@andybeet
aded place holders for argument documention in get_comland_data
965e3ea
Merge pull request #52 from NOAA-EDAB/fix_foreign_stockeff
5c0bb16 
fixes to foreign data
Need a fix for inflation PPI - using flat file for now
127a074
Removed PPI code into a data script to make it available to the package
27bbbb1
Added useLanded argument for foreign data
c474f48
@slucey slucey requested a review from andybeet November 30, 2023 18:56
andybeet
andybeet approved these changes Nov 30, 2023
View reviewed changes
Copy link
Member

@andybeet andybeet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good.

@andybeet andybeet merged commit 2f9ac85 into dev Nov 30, 2023
2 checks passed
@andybeet andybeet deleted the switch_stockeff branch March 13, 2024 18:49
@andybeet andybeet linked an issue Oct 7, 2024 that may be closed by this pull request
include Market_Code and Negear codes #14
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andybeet andybeet andybeet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

include Market_Code and Negear codes
2 participants
@slucey @andybeet