From b39b007b28f88dd0451452b43b4d4d672c3734cb Mon Sep 17 00:00:00 2001 From: andybeet <22455149+andybeet@users.noreply.github.com> Date: Fri, 13 Sep 2024 13:31:38 -0400 Subject: [PATCH] moved old functions, not used in package to another folder --- NAMESPACE | 1 - R/{ => oldfunctions}/Comland.r | 0 R/{ => oldfunctions}/Comland_skates_hakes.R | 0 R/{ => oldfunctions}/aggregate_by_epu.R | 0 R/{ => oldfunctions}/assign_catch_area.R | 0 R/{ => oldfunctions}/assign_catch_gear.R | 0 R/{ => oldfunctions}/assign_catch_qy_hy.R | 0 R/{ => oldfunctions}/assign_catch_size.R | 0 R/{ => oldfunctions}/comland_aggregate.R | 0 R/{ => oldfunctions}/comland_herring.R | 0 R/{ => oldfunctions}/comland_menhaden.R | 0 R/{ => oldfunctions}/comland_nafo.R | 0 R/{ => oldfunctions}/comland_separate_hakes.R | 0 R/{ => oldfunctions}/comland_unknowns.R | 0 .../comland_winter_little.R} | 0 man/comland.Rd | 61 ------------------- 16 files changed, 62 deletions(-) rename R/{ => oldfunctions}/Comland.r (100%) rename R/{ => oldfunctions}/Comland_skates_hakes.R (100%) rename R/{ => oldfunctions}/aggregate_by_epu.R (100%) rename R/{ => oldfunctions}/assign_catch_area.R (100%) rename R/{ => oldfunctions}/assign_catch_gear.R (100%) rename R/{ => oldfunctions}/assign_catch_qy_hy.R (100%) rename R/{ => oldfunctions}/assign_catch_size.R (100%) rename R/{ => oldfunctions}/comland_aggregate.R (100%) rename R/{ => oldfunctions}/comland_herring.R (100%) rename R/{ => oldfunctions}/comland_menhaden.R (100%) rename R/{ => oldfunctions}/comland_nafo.R (100%) rename R/{ => oldfunctions}/comland_separate_hakes.R (100%) rename R/{ => oldfunctions}/comland_unknowns.R (100%) rename R/{Comland_winter_little.R => oldfunctions/comland_winter_little.R} (100%) delete mode 100644 man/comland.Rd diff --git a/NAMESPACE b/NAMESPACE index 14b7c22..6c8f7c0 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -7,7 +7,6 @@ export(assign_area) export(assign_unknown) export(calc_DK) export(calc_discards) -export(comland) export(disaggregate_skates_hakes) export(get_areas) export(get_comdisc_data) diff --git a/R/Comland.r b/R/oldfunctions/Comland.r similarity index 100% rename from R/Comland.r rename to R/oldfunctions/Comland.r diff --git a/R/Comland_skates_hakes.R b/R/oldfunctions/Comland_skates_hakes.R similarity index 100% rename from R/Comland_skates_hakes.R rename to R/oldfunctions/Comland_skates_hakes.R diff --git a/R/aggregate_by_epu.R b/R/oldfunctions/aggregate_by_epu.R similarity index 100% rename from R/aggregate_by_epu.R rename to R/oldfunctions/aggregate_by_epu.R diff --git a/R/assign_catch_area.R b/R/oldfunctions/assign_catch_area.R similarity index 100% rename from R/assign_catch_area.R rename to R/oldfunctions/assign_catch_area.R diff --git a/R/assign_catch_gear.R b/R/oldfunctions/assign_catch_gear.R similarity index 100% rename from R/assign_catch_gear.R rename to R/oldfunctions/assign_catch_gear.R diff --git a/R/assign_catch_qy_hy.R b/R/oldfunctions/assign_catch_qy_hy.R similarity index 100% rename from R/assign_catch_qy_hy.R rename to R/oldfunctions/assign_catch_qy_hy.R diff --git a/R/assign_catch_size.R b/R/oldfunctions/assign_catch_size.R similarity index 100% rename from R/assign_catch_size.R rename to R/oldfunctions/assign_catch_size.R diff --git a/R/comland_aggregate.R b/R/oldfunctions/comland_aggregate.R similarity index 100% rename from R/comland_aggregate.R rename to R/oldfunctions/comland_aggregate.R diff --git a/R/comland_herring.R b/R/oldfunctions/comland_herring.R similarity index 100% rename from R/comland_herring.R rename to R/oldfunctions/comland_herring.R diff --git a/R/comland_menhaden.R b/R/oldfunctions/comland_menhaden.R similarity index 100% rename from R/comland_menhaden.R rename to R/oldfunctions/comland_menhaden.R diff --git a/R/comland_nafo.R b/R/oldfunctions/comland_nafo.R similarity index 100% rename from R/comland_nafo.R rename to R/oldfunctions/comland_nafo.R diff --git a/R/comland_separate_hakes.R b/R/oldfunctions/comland_separate_hakes.R similarity index 100% rename from R/comland_separate_hakes.R rename to R/oldfunctions/comland_separate_hakes.R diff --git a/R/comland_unknowns.R b/R/oldfunctions/comland_unknowns.R similarity index 100% rename from R/comland_unknowns.R rename to R/oldfunctions/comland_unknowns.R diff --git a/R/Comland_winter_little.R b/R/oldfunctions/comland_winter_little.R similarity index 100% rename from R/Comland_winter_little.R rename to R/oldfunctions/comland_winter_little.R diff --git a/man/comland.Rd b/man/comland.Rd deleted file mode 100644 index 8da11a4..0000000 --- a/man/comland.Rd +++ /dev/null @@ -1,61 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/Comland.r -\name{comland} -\alias{comland} -\title{Comland.r Version now controlled by git - originally part of comcatch.r} -\usage{ -comland( - channel, - GEARS = comlandr::GEARs, - EPUS = comlandr::EPUs, - use.existing = "y", - landed = "y", - foreign = "y", - adjust.ppi = "y", - sum.by = "EPU", - endyear = 2018, - reftime = c(2016, 1), - out.dir = here::here(), - Stand.alone = F -) -} -\arguments{ -\item{channel}{an Object inherited from \link[DBI]{DBIConnection-class}. This object is used to connect -to communicate with the database engine. (see \code{\link[dbutils]{connect_to_database}})} - -\item{GEARS}{List. Designates the NEGEAR codes that comprise a fishing fleet. Default = GEARs (lazily loaded data)} - -\item{EPUS}{List. Designates the stat areas that comprise an EPU. Default = EPUs (lazily loaded data)} - -\item{use.existing}{String. Pull from database "n" or use existing pull "y" (saves time) . Default = "y"} - -\item{landed}{Character String. Use landed weight for scallops and clams or live weight. Default = "y" (meatwt), "n" (livewt)} - -\item{foreign}{Character String. Mark foreign landings and keep seperate. Default = "y"} - -\item{adjust.ppi}{Character String. Adjust value for inflation. Default = "y" (deflated) vs "n" (notdeflated)} - -\item{sum.by}{Character String. Variable to sum landings by either "EPU" (Default) or "stat.area"} - -\item{endyear}{Numeric Scalar. Final year of query. Default = 2018} - -\item{reftime}{Numeric Vector. (Length 2). Specifies the year and month if adjusting for inflation. Default = c(2016,1)} - -\item{out.dir}{Character string. Path to directory where final output will be saved or where data is to be read from} - -\item{Stand.alone}{Boolean. Flag to determine whether to save Skate and hake data to file. defualt = F (Both a US catch file and a NAFO catch file will be saved)} -} -\value{ -An RDS file is created - - -A file will be written to your hard drive in the directory specified by \code{out.dir}. The name of the file will be named depending on user input. For example: - -Filename = 'comland_meatwt_deflated_stat_areas.RDS' -arises from user: landed = "y", adjust.ppi = "y", sum.by = "stat.area" -} -\description{ -Grab commercial landings data from US and Foreign countries (NAFO) -Need to fix menhaden data -SML -}