Skip to content

Testing #485

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

Merged
arnejohannesholmin merged 3 commits into from
Jan 19, 2026
Merged

Testing #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
293911f
Fixed bug in splitting ICESBiotic for backward compatibility.
Jan 19, 2026
d023ab3
Merge pull request #483 from StoXProject/StoXv4.1.0
arnejohannesholmin Jan 19, 2026
f6e3a7b
Merge pull request #484 from StoXProject/develop
arnejohannesholmin Jan 19, 2026
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
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: RstoxData
Version: 2.2.0-9011
Date: 2026-01-12
Date: 2026-01-19
Title: Tools to Read and Manipulate Fisheries Data
Authors@R: c(
person(given = "Arne Johannes",
Expand Down
5 changes: 1 addition & 4 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# RstoxData v2.2.0-9012 (2026-01-12)
# RstoxData v2.2.0-9011 (2026-01-11)
* Fixed bug in ICESAcoustic, where reading an NMDEchosounder file in the ReadAcoustic process used as input failed in the merging of tables "distance", "frequency", "sa", Now expanded to merge "distance", "frequency", "ch_type", "sa_by_acocat" and "sa".


# RstoxData v2.2.0-9011 (2026-01-12)
* Added units for area_weight_density.


Expand Down
3 changes: 2 additions & 1 deletion R/backwardCompatibility.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,8 @@ backwardCompatibility_RstoxData <- list(

allProcessNames <- unlist(lapply(projectDescription, function(model) lapply(model, "[[", "processName")))
if(any(processNameOfSecondProcess %in% allProcessNames)) {
stop("Cannot split process...")
# If the process "FilterICESBiotic_KeepOnlyICESSpecWoRMS" already exists, assume that the old ICESBitoic process has already been split
return(list())
}

# Create the filter expression:
Expand Down
Binary file modified inst/extdata/functionArguments.rds
View file
Open in desktop
Binary file not shown.
Loading