Updated everything to 1.18.0. This version is now on CRAN (will creat…

…e tag presently).

ChangeLog

@@ -1,4 +1,8 @@
 CHANGELOG:
+v1.18.0
+  - Many network methods are now S3 generics (to facilitate objects like networkLite).
+  - get.dyads.eids now has an na.omit argument.
+  - Minor bug fixes.
 v1.17.2
   - Deactivated tests to appease CRAN.
   - Modified various protection calls in a hopefully more conservative manner.  This should not produce user-visible changes, but will be cleaner on rchk.

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: network
-Version: 1.17.2-748
-Date: 2022-05-20
+Version: 1.18.0
+Date: 2022-10-05
 Title: Classes for Relational Data
 Authors@R: c(
     person("Carter T.", "Butts", role=c("aut","cre"), email="[email protected]"),
@@ -13,16 +13,6 @@ Authors@R: c(
     person("Brendan", "Knapp", role=c("ctb"), email="[email protected]", comment=c(ORCID="0000-0003-3284-4972")),
     person("Michał", "Bojanowski", role=c("ctb"), email = "[email protected]", comment = c(ORCID = "0000-0001-7503-852X")),
     person("Chad", "Klumb", role=c("ctb"), email="[email protected]"))
-Author: Carter T. Butts [aut, cre],
-    David Hunter [ctb],
-    Mark Handcock [ctb],
-    Skye Bender-deMoll [ctb],
-    Jeffrey Horner [ctb],
-    Li Wang [ctb],
-    Pavel N. Krivitsky [ctb] (<https://orcid.org/0000-0002-9101-3362>),
-    Brendan Knapp [ctb] (<https://orcid.org/0000-0003-3284-4972>),
-    Michał Bojanowski [ctb],
-    Chad Klumb [ctb]
 Maintainer: Carter T. Butts <[email protected]>
 Depends: R (>= 2.10), utils
 Imports: tibble, magrittr, statnet.common (>= 4.5), stats
@@ -32,7 +22,7 @@ Suggests:
     covr
 Description: Tools to create and modify network objects.  The network class can represent a range of relational data types, and supports arbitrary vertex/edge/graph attributes.
 License: GPL (>=2)
-URL: http://statnet.org/
+URL: https://statnet.org/
 RoxygenNote: 7.2.0
 Roxygen: list(markdown = TRUE)
 Collate:

tests/general.tests.R

@@ -1,6 +1,9 @@
 #The following battery of tests is intended to verify the functionality of
 #the network library
 
+#Set to TRUE to run tests
+if(FALSE){
+
 library(network)
 
 # ----- check assigning multiple attribute values in a single call ------
@@ -188,3 +191,5 @@ if(!identical(NULL,get.edge.attribute(net,'nullval',null.na=TRUE))){
   stop("get.edge.attribute not returning NULL values stored as edge attribute correctly")
 }
 
+#End tests
+}

tests/general.tests2.R

@@ -1,3 +1,6 @@
+#Set to TRUE to run tests
+if(FALSE){
+
 # additional tests of misc network functionality split off from general.tests.R to avoid speed warnings
 library(network)
 
@@ -90,3 +93,6 @@ result5<-as.matrix.network.incidence(network.initialize(0))
 if(nrow(result5) != 0 & ncol(result5) != 0){
   stop('as.matrix.network.incidence did not return matrix with correct dimensions')
 }
+
+#End test
+}

tests/list.attribute.tests.R

@@ -1,3 +1,6 @@
+#Set to TRUE to run tests
+if(FALSE){
+
 require(network)
 
 # --------- test list.vertex.attributes ---
@@ -59,3 +62,6 @@ net%n%'a_list'<-list(part1=list(c("A","B")),part2=list("c"))
 net%n%'a_desc_vec'<-numeric(rep(100,1))
 net%n%'a_net'<-network.initialize(5)
 print.network(net)
+
+#End tests
+}

tests/network.access.test.R

@@ -1,3 +1,6 @@
+#Set to TRUE to run tests
+if(FALSE){
+
 library(network)
 
 binet = network.initialize(10, bipartite = 6)
@@ -83,4 +86,7 @@ if(!all(valid.eids(net)==c(1,2,3,7,8,9,10,11,12))){
 #If everything worked, check is TRUE
 if(!all(check)){                                               #Should be TRUE
   stop(paste("network package test failed on test(s):",which(!check)))
-}
+}
+
+#End tests
+}

tests/network.battery.R

@@ -1,6 +1,9 @@
 #The following battery of tests is intended to verify the functionality of
 #the network library
 
+#Set to TRUE to run tests
+if(FALSE){
+
 library(network)
 #These functions are intended to mimic functionality from the sna package.
 #Said package is not required to use network, but was used in creating this
@@ -207,3 +210,6 @@ check[81]<-network.edgecount(!nw2)==2 # Should have choose(3,2)-1=2, has 2.
 if(!all(check)){                                               #Should be TRUE
   stop(paste("network package test failed on test(s):",which(!check)))
 }
+
+#End test
+}

tests/pathological.tests.R

@@ -1,3 +1,6 @@
+#Set to TRUE to run tests
+if(FALSE){
+
 library(network)
 if (require(statnet.common,quietly=TRUE)){
 
@@ -28,3 +31,6 @@ if (require(statnet.common,quietly=TRUE)){
   },'Ticket #827','NETWORK_pathology_TESTS')
 
 }
+
+#End tests
+}

tests/plotflo.R

@@ -1,3 +1,6 @@
+#Set to TRUE to run tests
+if(FALSE){
+
 #
 # load the library
 #
@@ -47,3 +50,6 @@ data(emon)
 par(mar=c(0,0,0,0))
 plot(emon[[5]],edge.label=TRUE,edge.label.cex=0.6,
      edge.col='gray',edge.lwd=(emon[[5]]%e%'Frequency')*2)
+
+#End tests
+}

tests/speedTests.R

@@ -1,3 +1,5 @@
+#Set to TRUE to run tests
+if(FALSE){
 
 # some really basic speed checks to help us know if we make changes that massively degrade performance
 require(network)
@@ -63,3 +65,6 @@ if(addmoree>5){
 if(addmorev>5){
   stop("add.vertices for a network with large number of vertices took longer than expected")
 }
+
+#End tests
+}