Merge branch 'feature/fix_network_plot_nstudy' into develop

.github/workflows/commit-commands.yaml

@@ -31,8 +31,8 @@ jobs:
 
       - name: Commit
         run: |
-          git config --local user.name "$GITHUB_ACTOR"
-          git config --local user.email "[email protected].github.com"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config user.name "github-actions[bot]"
           git add man/\* NAMESPACE
           git commit -m 'Document'
           git push
@@ -64,8 +64,8 @@ jobs:
 
       - name: Commit
         run: |
-          git config --local user.name "$GITHUB_ACTOR"
-          git config --local user.email "[email protected].github.com"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config user.name "github-actions[bot]"
           git add vignettes/\* tests/testthat/\*.R
           git commit -m 'Build pre-compiled vignettes'
           git push

.github/workflows/pr-commands.yaml

@@ -35,8 +35,8 @@ jobs:
 
       - name: Commit
         run: |
-          git config --local user.name "$GITHUB_ACTOR"
-          git config --local user.email "[email protected].github.com"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config user.name "github-actions[bot]"
           git add man/\* NAMESPACE
           git commit -m 'Document'
 
@@ -75,8 +75,8 @@ jobs:
 
       - name: Commit
         run: |
-          git config --local user.name "$GITHUB_ACTOR"
-          git config --local user.email "[email protected].github.com"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config user.name "github-actions[bot]"
           git add vignettes/\* tests/testthat/\*.R
           git commit -m 'Build pre-compiled vignettes'
 

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: multinma
 Title: Bayesian Network Meta-Analysis of Individual and Aggregate Data
-Version: 0.6.1.9002
+Version: 0.6.1.9003
 Authors@R: 
     person(given = c("David", "M."),
            family = "Phillippo",
@@ -57,6 +57,7 @@ RoxygenNote: 7.2.3
 Roxygen: list(markdown = TRUE)
 Suggests: 
     testthat (>= 2.1.0),
+    vdiffr,
     withr,
     knitr,
     rmarkdown,

NEWS.md

@@ -4,6 +4,10 @@
 installed now works properly, rather than giving errors.
 * Fix: Small bug caused `predict()` for AgD meta-regression models with new data 
 and `baseline_type = "response"` to fail with an error.
+* Fix: The number of studies on a contrast in a network plot `plot.nma_data()`
+with `weight_edges = TRUE` was incorrect when a study had multiple arms of the 
+same treatment. This now correctly counts the number of studies making a 
+comparison, rather than the number of arms.
 
 # multinma 0.6.1
 

R/nma_data-class.R

@@ -279,7 +279,7 @@ as.igraph.nma_data <- function(x, ..., collapse = TRUE) {
     if (collapse) {
       e_ipd <- e_ipd %>%
         dplyr::group_by(.data$.trt, .data$.trt_b) %>%
-        dplyr::summarise(.nstudy = dplyr::n(), .type = "IPD")
+        dplyr::summarise(.nstudy = dplyr::n_distinct(.data$.study), .type = "IPD")
     } else {
       e_ipd$.type <- "IPD"
     }
@@ -300,7 +300,7 @@ as.igraph.nma_data <- function(x, ..., collapse = TRUE) {
     if (collapse) {
       e_agd <- e_agd %>%
         dplyr::group_by(.data$.trt, .data$.trt_b) %>%
-        dplyr::summarise(.nstudy = dplyr::n(), .type = "AgD")
+        dplyr::summarise(.nstudy = dplyr::n_distinct(.data$.study), .type = "AgD")
     } else {
       e_agd$.type <- "AgD"
     }