version 1.5.2

cran · Feb 24, 2024 · 5024a28 · 5024a28
1 parent 81c6bbe
commit 5024a28
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: networktools
 Title: Tools for Identifying Important Nodes in Networks
-Version: 1.5.1
-Date: 2023-8-22
+Version: 1.5.2
+Date: 2024-2-23
 Authors@R: person("Payton", "Jones", email = "paytonjjones@gmail.com", role = c("aut", "cre"))
 Description: Includes assorted tools for network analysis. Bridge centrality; goldbricker; MDS, PCA, & eigenmodel network plotting.
 Depends: R (>= 3.0.0)
@@ -15,8 +15,8 @@ Suggests: dplyr, testthat
 URL: https://CRAN.R-project.org/package=networktools
 BugReports: https://github.com/paytonjjones/networktools/issues
 NeedsCompilation: no
-Packaged: 2023-08-22 21:39:59 UTC; payton-jones
+Packaged: 2024-02-23 17:06:11 UTC; payton-jones
 Author: Payton Jones [aut, cre]
 Maintainer: Payton Jones <paytonjjones@gmail.com>
 Repository: CRAN
-Date/Publication: 2023-08-22 22:10:02 UTC
+Date/Publication: 2024-02-23 23:40:02 UTC
diff --git a/MD5 b/MD5
@@ -1,14 +1,14 @@
-7ba5b7930c7afb40c1177ca9a1a5c582 *DESCRIPTION
+f9c9e60637722da20f0ee9e1c4466417 *DESCRIPTION
 f33ff8db9d9cc9660a1499fbd2924811 *NAMESPACE
-3e247aa11d6bd51e55d9f5d4c99c577e *NEWS.md
+c3e4714c4dea043969d1dec5796be980 *NEWS.md
 2d100b244cdcbe0d35427837a02f529d *R/EIGENnet.R
 97b8ba8a4b21a201df4c6989bf213fbb *R/MDSnet.R
 8bb34bd45871e6e303214577e127f6bb *R/PCAnet.R
 96d9a3a71a2838232150a642b043aa4d *R/assumptionCheck.R
 5d15457ed4bbe618b454c8646c5f5f64 *R/bridge.R
 05653ea51754a504500b01fc72938c74 *R/data_documentation.R
 1744a35f2a4ef529128c972d0b7c78e3 *R/expectedInf.R
-f7600a38f0e1b942b468ecd70dd263a0 *R/goldbricker.R
+2d79d9c86143d93d9a2d761b2f31545b *R/goldbricker.R
 00bcde31fa5deb2d5dcdd6156f106d10 *R/hidden_functions.R
 a7e0a8db67920c6785b472726a2f51d1 *R/imports.R
 7277cd2c2a26facfa6a78f54810b8327 *R/net_reduce.R

diff --git a/NEWS.md b/NEWS.md
@@ -61,3 +61,7 @@ output:
 # networktools 1.5.1
 
 * Update package description to conform to roxygen2 7.0.0
+
+# networktools 1.5.2
+
+* Fixed a bug affecting the zou2007 method of goldbricker
diff --git a/R/goldbricker.R b/R/goldbricker.R
@@ -55,7 +55,10 @@
 #'
 #'@export
 goldbricker <- function(data, p=0.05, method="hittner2003", threshold=0.25, corMin=0.5, progressbar=TRUE) {
-  if(method=="zou2007"){warning("zou2007 uses a confidence interval, argument \"p\" is ignored")}
+  if(method=="zou2007"){
+    p <- 0.5
+    warning("zou2007 uses a confidence interval, argument \"p\" is ignored")
+    }
   if("tbl" %in% class(data)){
     data <- as.data.frame(data)
   }
@@ -73,7 +76,7 @@ goldbricker <- function(data, p=0.05, method="hittner2003", threshold=0.25, corM
         for(k in 1:d){
           test <- switch(method,
                          hittner2003 = suppressWarnings(cocor::cocor.dep.groups.overlap(cormat[k,i], cormat[k,j], cormat[i, j], n, test="hittner2003"))@hittner2003$p.value,
-                         zou2007 = ifelse(prod(suppressWarnings(cocor::cocor.dep.groups.overlap(.3, .4, .4, 30, test="zou2007"))@zou2007$'conf.int'[1:2])<0,1,0),
+                         zou2007 = ifelse(prod(suppressWarnings(cocor::cocor.dep.groups.overlap(cormat[k,i], cormat[k,j], cormat[i, j], n, test="zou2007"))@zou2007$'conf.int'[1:2])<0,1,0),
                          pearson1898 = suppressWarnings(cocor::cocor.dep.groups.overlap(cormat[k,i], cormat[k,j], cormat[i, j], n, test="pearson1898"))@pearson1898$p.value,
                          hotelling1940 = suppressWarnings(cocor::cocor.dep.groups.overlap(cormat[k,i], cormat[k,j], cormat[i, j], n, test="hotelling1940"))@hotelling1940$p.value,
                          williams1959 = suppressWarnings(cocor::cocor.dep.groups.overlap(cormat[k,i], cormat[k,j], cormat[i, j], n, test="williams1959"))@williams1959$p.value,