v1.0.2.9064

* refactor: Add new fish metric (pi_BCG2_att1234b) + MetricNames.xlsx + metric_values.R
leppott · Nov 6, 2024 · ee88dd4 · ee88dd4
1 parent d2b6a5c
commit ee88dd4
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: BioMonTools
 Type: Package
 Title: Tools for Biomonitoring and Bioassessment
-Version: 1.0.2.9063
+Version: 1.0.2.9064
 Author: c(
 	person("Erik W.", "Leppo", email="[email protected]", role=c("aut","cre")), 
 	person("Jen", "Stamp", role="ctb"),

diff --git a/NEWS b/NEWS
@@ -4,10 +4,16 @@ NEWS
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2024-11-06 08:28:24.319915
+    #> Last Update: 2024-11-06 10:12:51.279687
 
 # Version History
 
+## Changes in version 1.0.2.9064 (2024-11-06)
+
+- refactor: Add new fish metric (pi_BCG2_att1234b)
+  - MetricNames.xlsx
+  - metric_values.R
+
 ## Changes in version 1.0.2.9063 (2024-11-06)
 
 - docs: Update comment about NATIVE in metric.values help

diff --git a/NEWS.md b/NEWS.md
@@ -4,10 +4,16 @@ NEWS
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2024-11-06 08:28:24.319915
+    #> Last Update: 2024-11-06 10:12:51.279687
 
 # Version History
 
+## Changes in version 1.0.2.9064 (2024-11-06)
+
+- refactor: Add new fish metric (pi_BCG2_att1234b)
+  - MetricNames.xlsx
+  - metric_values.R
+
 ## Changes in version 1.0.2.9063 (2024-11-06)
 
 - docs: Update comment about NATIVE in metric.values help

diff --git a/NEWS.rmd b/NEWS.rmd
@@ -18,6 +18,12 @@ cat(paste0("Last Update: ",Sys.time()))
 
 # Version History
 
+## Changes in version 1.0.2.9064 (2024-11-06)
+
+* refactor: Add new fish metric (pi_BCG2_att1234b)
+    + MetricNames.xlsx
+    + metric_values.R
+
 ## Changes in version 1.0.2.9063 (2024-11-06)
 
 * docs: Update comment about NATIVE in metric.values help

diff --git a/R/metric_values.R b/R/metric_values.R
@@ -4608,6 +4608,13 @@ metric.values.fish <- function(myDF
                                                      | BCG_ATTR == "3"
                                                      | BCG_ATTR == "4")]
                                              , na.rm = TRUE) / ni_total
+                  , pi_BCG2_att1234b = 100 * (sum(N_TAXA[(BCG_ATTR == "1"
+                                                          | BCG_ATTR == "2"
+                                                          | BCG_ATTR == "3"
+                                                          | BCG_ATTR == "4")]
+                                                  , na.rm = TRUE) +
+                                              sum(N_TAXA[BCG_ATTR2 == "4_BETTER"]
+                                                  , na.rm = TRUE)) / ni_total
                   , pi_BCG_att1236 = 100 * sum(N_TAXA[(BCG_ATTR == "1"
                                                      | BCG_ATTR == "2"
                                                      | BCG_ATTR == "3"

diff --git a/inst/extdata/MetricNames.xlsx b/inst/extdata/MetricNames.xlsx
diff --git a/inst/shiny-examples/BioMonTools/global.R b/inst/shiny-examples/BioMonTools/global.R
@@ -1,7 +1,7 @@
 # Shiny Global File
 
 # Version ----
-pkg_version <- "1.0.2.9063"
+pkg_version <- "1.0.2.9064"
 
 # Packages----
 library(BioMonTools)