Merge pull request #155 from StoXProject/catchLotteryStox4

Catch lottery stox4
StoXProject · Jan 5, 2025 · c5c742b · c5c742b
2 parents c549e2b + 777dc5b
commit c5c742b
Show file tree

Hide file tree

Showing 20 changed files with 1,121 additions and 149 deletions.
diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: RstoxFDA
 Version: 1.5.0-9003
-Date: 2024-12-27
+Date: 2024-12-28
 Title: Fisheries Dependent Analysis with RstoX
 Authors@R: c(
   person(given = "Edvin", 

diff --git a/NAMESPACE b/NAMESPACE
@@ -24,8 +24,10 @@ export(DefinePeriod)
 export(DefineSamplingHierarchy)
 export(DefineStockSplittingParameters)
 export(DefineWeightConversionFactor)
+export(ExtendAnalyticalSamplingFrameCoverage)
 export(FilterAgeLengthOutliersStoxBiotic)
 export(FilterWeightLengthOutliersStoxBiotic)
+export(InterpolateAnalyticalDomainEstimates)
 export(LiftStrata)
 export(ListBioticDifference)
 export(LoadFdaStratumPolygon)

diff --git a/NEWS.md b/NEWS.md
@@ -1,8 +1,12 @@
 # 1.5.0-9003
+* Added functions for sampling frame expansion (ExtendAnalyticalSamplingFrameCoverage), and domain interpolation (InterpolateAnalyticalDomainEstimates) (#154)
 * Changed how Stratification variables and Domain variables are matched to landings with AnalyticalRatioEstimate (# 125)
 * Replaced DefinePSUSamplingParameters (processdata) with ComputePSUSamplingParameters (no processdata) and ReadPSUSamplingParameters (no processdata). This change breaks some pre-release projects (v. v1.3-9006). (#127)
 * Replaced DefineIndividualSamplingParameters (processdata) with ComputeIndividualSamplingParameters (no processdata). This change breaks some pre-release projects (v. v1.3-9006).
 * Added documentation for ECA convergence analsysis (#153)
+* Fixed issue with reporting IndividualAge as SamplingVariable in ReportFdaSampling (#146)
+* Fixed issue with running RunRecaModels with temporal resolution 'month' (#144)
+* Fixed issue with plotting with other column variables than 'Area' in PlotFisheriesOverviewSpatial (#147)
 * Fixed naming of age groups in reports from analytical estimates (#145)
 * Fixed documentation for handling NA age groups (#151)
 * Fixed issue with using integer columns in landings as stratification column in ratio estimates (#133)

diff --git a/R/StoxAnalysisFunctions.R b/R/StoxAnalysisFunctions.R
@@ -702,7 +702,7 @@ getLandingsFromStoxLandings <- function(RecaParameterData, StoxLandingData, Temp
     quarter <- data.table::quarter(StoxLandingData$Landing$CatchDate)
   }
   else if (TemporalResolution == "Month"){
-    month <- month(StoxLandingData$Landing$CatchDate)
+    month <- data.table::month(StoxLandingData$Landing$CatchDate)
   }
   else if (TemporalResolution == "Day"){
     date <- StoxLandingData$Landing$CatchDate