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.

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

Develop #313

Merged
merged 4 commits into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 22 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
# StoX v4.1.2 (2025-01-21)

## Summary
* The StoX version 4.1.2 is a patch release which includes a critical bug fix related to renaming or deleting a baseline process that is included in the OutputProcesses in a Bootstrap process, which caused StoX 4.1.1 to freeze with no simple work-around.

## General changes
* Changed the behavior of DefinitionMethod = "Manual" from deleting all strata, to passing the StratumPolygon as output unchanged. In addition, a new option is added, "DeleteAllStrata", which replaces the old behavior of DefinitionMethod = "Manual".

## Bug fixes
* Fixed a bug in the communication to the StoX GUI which caused the GUI to freeze when a process listed in the OutputProcesses of a Bootstrap process was renamed or deleted.

## Detailed changes
* Improved warning when multiple serial numbers have the same station in NMDBiotic input files.
* Updated documentation on LengthDependentLengthDistributionCompensation with equations.


# StoX v4.1.2-9003 (2025-01-18)

## Summary
* The StoX version 4.1.2-9003 is a pre-release to the patch release 4.1.2. It fixes the bug when processes listed in the OutputProcesses of a Bootstrap process was deleted.


# StoX v4.1.2-9002 (2025-01-17)

## Summary
Expand Down Expand Up @@ -33,7 +55,6 @@ I addition, the resamling function "ResampleBioticAssignmentByAcousticPSU" that
## General changes
* Updated the documentation of ResampleFunction in the BootstrapMethodTable of Bootstrap(). Specifically the pros and cons of ResampleFunction "ResampleBioticAssignmentByStratum" and "ResampleBioticAssignmentByAcousticPSU" are described. There are dangers to using the "ResampleBioticAssignmentByAcousticPSU" in that the variance may be lower than expected due to Hauls being resampled multiple times for the same Stratum, which smoothes out the extreme values.


## Bug fixes
* Fixed the 29 cm bug again, as it was not properly fixed in RstoxData v2.1.0. Refactored how precision is set both when reading data and in the ICESBiotic() and ICESAcoustic(). In R one example is format(29 / 100 * 100, digits = 20) = "28.999999999999996447", which results in 28 when converted to integer. The following values are affected:
* 29, 57, 58, 113, 114, 115, 116 when BiologyLengthCode is "cm" (lengthresolution "3")
Expand All @@ -42,7 +63,6 @@ I addition, the resamling function "ResampleBioticAssignmentByAcousticPSU" that
* Fixed bug in MeanNASC() causing StratumPolygon to show in the Function inputs if the user first selects PSUDefinition = "FunctionParameter" and PSUDefinitionMethod = "EDSUToPSU" and then changing to PSUDefinition = "FunctionInput".
* Fixed bug in DefineAcousticTargetStrength() where specifying a table with the columns AcousticCategory, Frequency, TotalLength and TargetStrength in the case of AcousticTargetStrengthModel = "TargetStrengthByLength" resulted in the error message "The output from DefineAcousticTargetStrength() contains duplicated keys (AcousticCategory, Frequency) in rows 1, 2.". The reason was that only the first two columns were considered as grouping variables, whereas all three first columns should (specifying different lengths, and a target strength per length).


## Detailed changes
* Removed rscript_args from mapplyOnCores(), since this caused the Renviron to be ignored in the sub processes, resulting in errors with finding RstoxFramework in the case of multiple libraries on Linux and macOS.
* Introduced the EchoType as a column in the Data table of ICESBiotic() (and WriteICESBiotic()).
Expand Down
1 change: 1 addition & 0 deletions Official_StoX_versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ Official StoX versions are fully tested and are the only one that should be used
| 4.0.0| 4.0.0| 2.0.0| 2.0.0| 1.2.0| 2024-07-10| [StoX-v4.0.0](https://github.com/StoXProject/StoX/releases/tag/v4.0.0)|
| 4.1.0| 4.1.0| 2.1.0| 2.1.0| 1.2.0| 2024-11-06| [StoX-v4.1.0](https://github.com/StoXProject/StoX/releases/tag/v4.1.0)| R >= 4.3
| 4.1.1| 4.1.1| 2.1.1| 2.1.1| 1.3.0| 2024-12-20| [StoX-v4.1.1](https://github.com/StoXProject/StoX/releases/tag/v4.1.1)| R >= 4.3
| 4.1.2| 4.1.2| 2.1.2| 2.1.2| 1.3.0| 2025-01-21| [StoX-v4.1.2](https://github.com/StoXProject/StoX/releases/tag/v4.1.2)| R >= 4.3
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ StoX is an open source software developed at IMR, Norway, to analyze survey data

The following describes installation of the latest *official* StoX version (Se [all official StoX versions](https://github.com/StoXProject/StoX/blob/master/Official_StoX_versions.md)). For unofficial versions installation of the Rstox-packages must be done in R (details given at the end of this paragraph). It is highly recommended to use official versions, as these are fully tested, whereas tetsting is limited for unofficial versions.

See [release notes for StoX 4.1.1](https://github.com/StoXProject/StoX/blob/master/NEWS.md#stox-v411-2024-12-20).
See [release notes for StoX 4.1.2](https://github.com/StoXProject/StoX/blob/master/NEWS.md#stox-v412-2025-01-21).

Download StoX from (https://github.com/StoXProject/StoX/releases/tag/v4.1.1). For Windows download the .msi file, for MacOS download the .dmg file and for Linux download the .rpm or .deb file. Then follow the instructions below:
Download StoX from (https://github.com/StoXProject/StoX/releases/tag/v4.1.2). For Windows download the .msi file, for MacOS download the .dmg file and for Linux download the .rpm or .deb file. Then follow the instructions below:

### Windows:

Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "stox",
"version": "4.1.2-9002",
"version": "4.1.2",
"scripts": {
"ng": "ng",
"start": "ng serve",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "StoX",
"productName": "StoX",
"version": "4.1.2-9002",
"version": "4.1.2",
"description": "StoX: An open source software for marine survey analyses",
"main": "build/index.js",
"scripts": {
Expand Down
4 changes: 3 additions & 1 deletion srv/OfficialRstoxFrameworkVersions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,6 @@ StoX RstoxFramework Dependencies OptionalDependencies Official Date
4.1.1-9001 4.1.1-9003 RstoxBase_2.1.1-9001,RstoxData_2.1.1-9001 RstoxFDA_1.5.0-9002 FALSE 2024-12-19
4.1.1 4.1.1 RstoxBase_2.1.1,RstoxData_2.1.1 RstoxFDA_1.3.0 TRUE 2024-12-20
4.1.2-9001 4.1.2-9001 RstoxBase_2.1.2-9001,RstoxData_2.1.1 RstoxFDA_1.3.0 FALSE 2025-01-10
4.1.2-9002 4.1.2-9002 RstoxBase_2.1.2-9002,RstoxData_2.1.2-9001 RstoxFDA_1.5.0-9002 FALSE 2025-01-16
4.1.2-9002 4.1.2-9002 RstoxBase_2.1.2-9002,RstoxData_2.1.2-9001 RstoxFDA_1.3.0 FALSE 2025-01-16
4.1.2-9003 4.1.2-9003 RstoxBase_2.1.2-9002,RstoxData_2.1.2-9001 RstoxFDA_1.3.0 FALSE 2025-01-17
4.1.2 4.1.2 RstoxBase_2.1.2,RstoxData_2.1.2 RstoxFDA_1.3.0 TRUE 2025-01-21
1 change: 1 addition & 0 deletions srv/Official_StoX_versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
4.0.0
4.1.0
4.1.1
4.1.2
Loading