Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
9ad8a63
Fix missing hash in example code
davidcurrie2001 Apr 14, 2025
686f6cf
Use package name in example
davidcurrie2001 Apr 14, 2025
d81ff0a
Bring in line with GitHub
davidcurrie2001 Apr 16, 2025
60dbd84
temporary fix
Kasia-MIR Apr 23, 2025
fb09de3
Update importRDBESDataCSV.R
Kasia-MIR Apr 24, 2025
cea8ae3
optimization, less dplyr in joining
Kasia-MIR Apr 24, 2025
5be9f3d
Revert "optimization, less dplyr in joining"
Kasia-MIR Apr 25, 2025
38cb277
Merge pull request #231 from ices-tools-dev/patch/upload-artifact-v4
rix133 Apr 25, 2025
5ce80bf
Merge pull request #232 from ices-tools-dev/main
rix133 May 6, 2025
cbca310
Merge branch 'dev' of https://github.com/ices-tools-dev/RDBEScore int…
davidcurrie2001 May 8, 2025
8f26b55
Function runs much quicker (sped up the code which handles sub-sampling)
davidcurrie2001 May 9, 2025
d50ba6f
Changed a join to use data.table rather than dplyr (#233)
davidcurrie2001 May 13, 2025
d762b39
Don't just match sub-samples using SAparSeqNum - also use SSid. Some …
davidcurrie2001 May 14, 2025
594772c
Ensure SSid also matches between sample and sub-sample in test data
davidcurrie2001 May 14, 2025
d7c396c
Use factors in RDBESEstObject to reduce size. Fix column order bug …
davidcurrie2001 May 14, 2025
a573227
data.table treats duplicate columns differently than dplyr - handle t…
davidcurrie2001 May 14, 2025
a2238dc
Actually fix the VDid code this time (#233)
davidcurrie2001 May 14, 2025
e1f7997
Changed order of SA and LE in H9
davidcurrie2001 May 14, 2025
518d02b
Added in a new incDesignVariables parameter to control whether the de…
davidcurrie2001 May 14, 2025
d6547ba
Revert back to using dplyr - data.table was giving the wrong result (…
davidcurrie2001 May 14, 2025
adf7fc1
Minor change
davidcurrie2001 May 14, 2025
35ca136
vignette renamed
nmprista Oct 13, 2025
ef21d56
more renaming of vignettes
nmprista Oct 13, 2025
77f62c8
renamed vignettes
nmprista Oct 13, 2025
6a19b2f
fix test data to latest format
rix133 Oct 13, 2025
12b6872
error with incosistent colum count input csv file
rix133 Oct 13, 2025
69ff587
update H7 dataset to latest format
rix133 Oct 13, 2025
fdb18ee
update rendered documentation
rix133 Oct 13, 2025
1011e05
new file for zip tests
rix133 Oct 14, 2025
6337208
updated "see other packages" section
nmprista Oct 14, 2025
8d3574a
fixes #236 the download format file name change to the new file name
rix133 Oct 14, 2025
acc7922
starndardized vignette
nmprista Oct 14, 2025
7c5e48d
Fixing double slash zipped subfolder issue #239
erosquesada Oct 14, 2025
65e359e
file renaming
nmprista Oct 14, 2025
7fe9851
some more corrections to file names
nmprista Oct 14, 2025
4451a0e
switching to data.table version of filtering
rix133 Oct 14, 2025
666f502
set up automatic documentation update
rix133 Oct 14, 2025
7af318f
update to use new data
rix133 Oct 14, 2025
3d97dd3
Update 02b Generating zeros for species not observed.Rmd
nmprista Oct 14, 2025
88785ca
some more corrections to filenames
nmprista Oct 14, 2025
82eb119
file renaming
nmprista Oct 14, 2025
1937e95
Merge branch 'dev' into organize-vignettes-#238
nmprista Oct 14, 2025
59d7736
fix tests
rix133 Oct 14, 2025
81127c0
Merge pull request #243 from ices-tools-dev/organize-vignettes-#238
nmprista Oct 14, 2025
734ebf1
version bump
rix133 Oct 14, 2025
f596eeb
Merge branch 'dev' of github.com:ices-tools-dev/RDBEScore into dev
rix133 Oct 14, 2025
d4fe12f
importRDBESDataCSV always validates by default
rix133 Oct 14, 2025
3f01c3e
make createRDBESDataObject to run validation unrespective of file typ…
rix133 Oct 14, 2025
3bb4ae6
added argument 'validate' for finer control
nmprista Oct 15, 2025
1b6546d
fixes H7 example #245
rix133 Oct 15, 2025
b88294f
added argument 'validate' and 'strict' with finer control
nmprista Oct 15, 2025
8ec32d0
changed documentation of 'strict'
nmprista Oct 15, 2025
ce2cc26
added validate = F so example runs
nmprista Oct 15, 2025
6b84bab
Merge branch 'dev' of https://github.com/ices-tools-dev/RDBEScore int…
nmprista Oct 15, 2025
8d13df2
removing unused MadeUpData_for_SL_SA_tests_v1 #245
rix133 Oct 15, 2025
e3e1ceb
#245 Pckg_SDAResources_agsrs_H1 removal
rix133 Oct 15, 2025
7587dd1
Merge branch 'dev' of github.com:ices-tools-dev/RDBEScore into dev
rix133 Oct 15, 2025
1511476
update species names
rix133 Oct 15, 2025
a524bec
updated to latest version of RDBES
nmprista Oct 15, 2025
87021f5
Merge branch 'dev' of https://github.com/ices-tools-dev/RDBEScore int…
nmprista Oct 15, 2025
5050cc6
#245 removing unused datasets from SDA_Resources
rix133 Oct 15, 2025
250517a
parameter validate was missing from preamble
nmprista Oct 15, 2025
97812a7
Intermediate version with dplyr
erosquesada Oct 15, 2025
bd75995
Merge branch 'dev' of github.com:ices-tools-dev/RDBEScore into dev
erosquesada Oct 15, 2025
1475fb9
Merge branch 'dev' of github.com:ices-tools-dev/RDBEScore into dev
rix133 Oct 15, 2025
3ce47fd
file renaming
nmprista Oct 15, 2025
03e020b
Merge branch 'dev' of github.com:ices-tools-dev/RDBEScore into dev
rix133 Oct 15, 2025
ea3a535
Upd Ratio Est fun
karolinamg Oct 15, 2025
a16e441
Restore to Nuno version
erosquesada Oct 15, 2025
d6b5bd2
Merge branch 'dev' of github.com:ices-tools-dev/RDBEScore into dev
erosquesada Oct 15, 2025
962e8d8
delete doumentation
rix133 Oct 15, 2025
473be0f
Merge branch 'dev' of github.com:ices-tools-dev/RDBEScore into dev
erosquesada Oct 15, 2025
80cd07e
Merge branch 'dev' of github.com:ices-tools-dev/RDBEScore into dev
rix133 Oct 15, 2025
9cd5504
#245 update manuals
rix133 Oct 15, 2025
4b99fc4
Upd param ratio est
karolinamg Oct 15, 2025
2769b7d
Merge branch 'dev' of https://github.com/ices-tools-dev/RDBEScore int…
karolinamg Oct 15, 2025
4315ec9
because .N is a data.table function to count #244
rix133 Oct 15, 2025
419c804
fix documentation #244
rix133 Oct 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@
^travis.yml$
^FishNCo$
^\.github$
^\.vscode$
^.DS_Store$
^docs$
^doc$
^Meta$
package_overview.Rmd
^.pptx$
^_pkgdown\.yml$
^pkgdown$
49 changes: 49 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
release:
types: [published]
workflow_dispatch:

name: pkgdown.yaml

permissions: read-all

jobs:
pkgdown:
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
clean: false
branch: gh-pages
folder: docs
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,11 @@ FishNCo/testData/RegionalTestData/*

/doc/
/Meta/
<<<<<<< Updated upstream
.vscode/
docs
=======

# Data to develop fun
/NLdata/
>>>>>>> Stashed changes
5 changes: 2 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: RDBEScore
Type: Package
Title: Functions for the ICES Regional Database and Estimation System (RDBES)
Version: 0.3.3
Version: 0.3.4
Author: c(
person(given = "David",
family = "Currie",
Expand Down Expand Up @@ -106,8 +106,7 @@ Maintainer: Colin Millar <[email protected]>
Description: The RDBEScore package provides functions to import and work with
fisheries data downloaded from the ICES RDBES database. It also contains
functions to perform estimation analysis using the resulting objects.
URL: https://github.com/ices-tools-dev/RDBEScore,
https://rdbes.ices.dk
URL: https://github.com/ices-tools-dev/RDBEScore, https://rdbes.ices.dk, https://ices-tools-dev.github.io/RDBEScore/
License: GPL-3 + file LICENSE
Encoding: UTF-8
LazyData: true
Expand Down
11 changes: 11 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# RDBEScore 0.3.4

- Defaults: `createRDBESDataObject()` now runs validation by default
- Estimation object: added `incDesignVariables` to `createRDBESEstObject()` to optionally drop design variables; convert character columns to factors to reduce size.
- SA sub-sampling: replaced recursive logic with a self-join + lookup (`prepareSubSampleLevelLookup`), with warnings for missing or non‑unique matches.
- Memory: added frequent `gc()` calls across estimation/join steps for large data.
- Joins: improved field selection for hierarchy 7 in `procRDBESEstObjUppHier()`; clarified logic for selecting `VDid` fields.
- Docs/CI: added pkgdown GitHub Actions workflow; improved function docs (params/returns); updated `.Rbuildignore` and package URLs.
- Vignettes: updated estimation workflow and sub-sampling sections; added memory tips, minimal examples, and brief benchmarking notes.
- Performance: `filterRDBESDataObject()` now uses `data.table` for faster filtering.

# RDBEScore 0.3.3

* Update to work with with the 2025 RDBES data call format
Expand Down
5 changes: 3 additions & 2 deletions R/createRDBESDataObject.R
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
#' @param verbose (Optional) Set to TRUE if you want informative text printed
#' out, or FALSE if you don't. The default is FALSE.
#' @param ... parameters passed to validateRDBESDataObject
#' if input is list of data frames e.g.`strict=FALSE`
#' e.g.`strict=FALSE`
#' @importFrom utils file_test
#'
#' @return A RDBESDataObject
Expand Down Expand Up @@ -106,7 +106,7 @@ createRDBESDataObject <- function(input = NULL,

if(import.type == "csv") output <- importRDBESDataCSV(rdbesExtractPath = input,
listOfFileNames = listOfFileNames,
castToCorrectDataTypes = castToCorrectDataTypes)
castToCorrectDataTypes = castToCorrectDataTypes, ...)


if(import.type == "list.of.dfs" || import.type == "list.of.dts") {
Expand All @@ -121,5 +121,6 @@ createRDBESDataObject <- function(input = NULL,
output <- newRDBESDataObject()
}


return(output)
}
Loading