Skip to content

Commit e939fba

Browse files
CarterButtsCarterButts
committed
Merge branch 'master' into v1.17
2 parents c31e8c2 + a6221ce commit e939fba

41 files changed

Lines changed: 68 additions & 68 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DESCRIPTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: network
22
Version: 1.17.0
3-
Date: 2021-06-05
3+
Date: 2021-06-06
44
Title: Classes for Relational Data
55
Authors@R: c(
66
person("Carter T.", "Butts", role=c("aut","cre"), email="buttsc@uci.edu"),

‎R/access.R‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# David Hunter <dhunter@stat.psu.edu> and Mark S. Handcock
77
# <handcock@u.washington.edu>.
88
#
9-
# Last Modified 02/24/19
9+
# Last Modified 06/06/21
1010
# Licensed under the GNU General Public License version 2 (June, 1991)
1111
# or greater
1212
#
@@ -104,7 +104,7 @@
104104
#' \code{\link{network.edgelist}}
105105
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
106106
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
107-
#' \url{http://www.jstatsoft.org/v24/i02/}
107+
#' \url{https://www.jstatsoft.org/v24/i02/}
108108
#' @keywords classes graphs
109109
#' @examples
110110
#'
@@ -253,7 +253,7 @@ add.edges.network<-function(x, tail, head, names.eval=NULL, vals.eval=NULL, ...)
253253
#' \code{\link{set.vertex.attribute}}
254254
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
255255
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
256-
#' \url{http://www.jstatsoft.org/v24/i02/}
256+
#' \url{https://www.jstatsoft.org/v24/i02/}
257257
#' @keywords classes graphs
258258
#' @examples
259259
#'
@@ -430,7 +430,7 @@ add.vertices.network<-function(x, nv, vattr=NULL, last.mode=TRUE, ...){
430430
#' \code{\link{as.matrix.network}}, \code{\link{network.extraction}}
431431
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
432432
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
433-
#' \url{http://www.jstatsoft.org/v24/i02/}
433+
#' \url{https://www.jstatsoft.org/v24/i02/}
434434
#' @author Carter T. Butts \email{buttsc@uci.edu}
435435
#' @examples
436436
#' #Create a network with three edges
@@ -537,7 +537,7 @@ delete.edge.attribute.network <- function(x, attrname, ...) {
537537
#'
538538
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
539539
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
540-
#' \url{http://www.jstatsoft.org/v24/i02/}
540+
#' \url{https://www.jstatsoft.org/v24/i02/}
541541
#' @author Carter T. Butts \email{buttsc@uci.edu}
542542
#'
543543
#' @seealso \code{\link{get.edgeIDs}}, \code{\link{network.extraction}},
@@ -763,7 +763,7 @@ get.edge.value.list <- get.edge.value.network
763763
#' @seealso \code{\link{get.neighborhood}}, \code{\link{valid.eids}}
764764
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
765765
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
766-
#' \url{http://www.jstatsoft.org/v24/i02/}
766+
#' \url{https://www.jstatsoft.org/v24/i02/}
767767
#' @keywords classes graphs
768768
#' @examples
769769
#'
@@ -1049,7 +1049,7 @@ get.network.attribute.network <- function(x, attrname, unlist=FALSE, ...) {
10491049
#' @seealso \code{\link{get.edges}}, \code{\link{is.adjacent}}
10501050
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
10511051
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
1052-
#' \url{http://www.jstatsoft.org/v24/i02/}
1052+
#' \url{https://www.jstatsoft.org/v24/i02/}
10531053
#'
10541054
#' Wasserman, S. and Faust, K. 1994. \emph{Social Network Analysis: Methods
10551055
#' and Applications.} Cambridge: Cambridge University Press.
@@ -1176,7 +1176,7 @@ get.vertex.attribute.network <- function(x, attrname, na.omit=FALSE, null.na=TRU
11761176
#' \code{set.network.attribute}, \code{\link{add.edges}}
11771177
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
11781178
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
1179-
#' \url{http://www.jstatsoft.org/v24/i02/}
1179+
#' \url{https://www.jstatsoft.org/v24/i02/}
11801180
#' @keywords classes graphs
11811181
#' @examples
11821182
#'
@@ -1247,7 +1247,7 @@ has.loops<-function(x){
12471247
#' \code{\link{attribute.methods}}
12481248
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
12491249
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
1250-
#' \url{http://www.jstatsoft.org/v24/i02/}
1250+
#' \url{https://www.jstatsoft.org/v24/i02/}
12511251
#'
12521252
#' Wasserman, S. and Faust, K. 1994. \emph{Social Network Analysis: Methods
12531253
#' and Applications}. Cambridge: Cambridge University Press.
@@ -1376,7 +1376,7 @@ is.multiplex<-function(x){
13761376
#' \code{\link{get.network.attribute}}, \code{is.adjacent}, \code{\link{is.na}}
13771377
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
13781378
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
1379-
#' \url{http://www.jstatsoft.org/v24/i02/}
1379+
#' \url{https://www.jstatsoft.org/v24/i02/}
13801380
#' @keywords classes graphs
13811381
#' @examples
13821382
#'
@@ -1497,7 +1497,7 @@ is.na.network<-function(x){
14971497
#' \code{\link{network.indicators}}, \code{\link{plot.network}}
14981498
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
14991499
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
1500-
#' \url{http://www.jstatsoft.org/v24/i02/}
1500+
#' \url{https://www.jstatsoft.org/v24/i02/}
15011501
#' @keywords classes graphs
15021502
#' @examples
15031503
#'
@@ -1604,7 +1604,7 @@ network.dyadcount<-function(x, ...) UseMethod("network.dyadcount")
16041604
#' \code{\link{network.edgecount}}, \code{\link{is.directed}}
16051605
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
16061606
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
1607-
#' \url{http://www.jstatsoft.org/v24/i02/}
1607+
#' \url{https://www.jstatsoft.org/v24/i02/}
16081608
#' @keywords classes graphs
16091609
#' @examples
16101610
#'
@@ -1709,7 +1709,7 @@ network.edgecount<-function(x, ...) UseMethod("network.edgecount")
17091709
#' @seealso \code{\link{get.network.attribute}}
17101710
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
17111711
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
1712-
#' \url{http://www.jstatsoft.org/v24/i02/}
1712+
#' \url{https://www.jstatsoft.org/v24/i02/}
17131713
#' @keywords classes graphs
17141714
#' @examples
17151715
#'
@@ -1760,7 +1760,7 @@ network.naedgecount.network<-function(x, ...){
17601760
#' @seealso \code{\link{get.network.attribute}}
17611761
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
17621762
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
1763-
#' \url{http://www.jstatsoft.org/v24/i02/}
1763+
#' \url{https://www.jstatsoft.org/v24/i02/}
17641764
#' @keywords classes graphs
17651765
#' @examples
17661766
#'
@@ -1831,7 +1831,7 @@ network.vertex.names<-function(x){
18311831
#' @seealso \code{\link{network}}
18321832
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
18331833
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
1834-
#' \url{http://www.jstatsoft.org/v24/i02/}
1834+
#' \url{https://www.jstatsoft.org/v24/i02/}
18351835
#' @keywords manip graphs
18361836
#' @examples
18371837
#'

‎R/coercion.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
#' \code{\link{network.extraction}},\code{\link{as.edgelist}}
100100
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
101101
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
102-
#' \url{http://www.jstatsoft.org/v24/i02/}
102+
#' \url{https://www.jstatsoft.org/v24/i02/}
103103
#' @keywords classes graphs
104104
#' @examples
105105
#'
@@ -407,7 +407,7 @@ as.network<-function(x,...)
407407
#' \code{\link{which.matrix.type}}
408408
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
409409
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
410-
#' \url{http://www.jstatsoft.org/v24/i02/}
410+
#' \url{https://www.jstatsoft.org/v24/i02/}
411411
#' @keywords classes graphs
412412
#' @examples
413413
#'
@@ -588,7 +588,7 @@ as.network.matrix<-function(x, matrix.type=NULL,
588588
#' @seealso \code{\link{as.matrix.network}}, \code{\link{network}}
589589
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
590590
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
591-
#' \url{http://www.jstatsoft.org/v24/i02/}
591+
#' \url{https://www.jstatsoft.org/v24/i02/}
592592
#' @keywords graphs manip
593593
#' @examples
594594
#'

‎R/constructors.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# David Hunter <dhunter@stat.psu.edu> and Mark S. Handcock
77
# <handcock@u.washington.edu>.
88
#
9-
# Last Modified 06/05/21
9+
# Last Modified 06/06/21
1010
# Licensed under the GNU General Public License version 2 (June, 1991)
1111
# or greater
1212
#
@@ -119,7 +119,7 @@ network<-function(x, vertex.attr=NULL, vertex.attrnames=NULL,
119119
#'
120120
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
121121
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
122-
#' \url{http://www.jstatsoft.org/v24/i02/}
122+
#' \url{https://www.jstatsoft.org/v24/i02/}
123123
#'
124124
#' @author Carter T. Butts \email{buttsc@uci.edu} and David Hunter
125125
#' \email{dhunter@stat.psu.edu}
@@ -432,7 +432,7 @@ network.incidence<-function(x, g, ignore.eval=TRUE, names.eval=NULL, ...){
432432
#' @seealso \code{\link{network}}, \code{\link{as.network.matrix}}
433433
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
434434
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
435-
#' \url{http://www.jstatsoft.org/v24/i02/}
435+
#' \url{https://www.jstatsoft.org/v24/i02/}
436436
#' @keywords classes graphs
437437
#' @examples
438438
#'

‎R/layout.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# David Hunter <dhunter@stat.psu.edu> and Mark S. Handcock
77
# <handcock@u.washington.edu>.
88
#
9-
# Last Modified 03/4/13
9+
# Last Modified 06/06/21
1010
# Licensed under the GNU General Public License version 2 (June, 1991)
1111
# or greater
1212
#
@@ -100,7 +100,7 @@
100100
#' @seealso \code{\link{plot.network}}
101101
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
102102
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
103-
#' \url{http://www.jstatsoft.org/v24/i02/}
103+
#' \url{https://www.jstatsoft.org/v24/i02/}
104104
#'
105105
#' Fruchterman, T.M.J. and Reingold, E.M. (1991). \dQuote{Graph Drawing by
106106
#' Force-directed Placement.} \emph{Software - Practice and Experience,}

‎R/misc.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# David Hunter <dhunter@stat.psu.edu> and Mark S. Handcock
77
# <handcock@u.washington.edu>.
88
#
9-
# Last Modified 02/26/13
9+
# Last Modified 06/06/21
1010
# Licensed under the GNU General Public License version 2 (June, 1991)
1111
# or greater
1212
#
@@ -353,7 +353,7 @@ print.mixingmatrix <- function(x, ...) {
353353
#' @seealso \code{\link{network.edgecount}}, \code{\link{network.size}}
354354
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
355355
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
356-
#' \url{http://www.jstatsoft.org/v24/i02/}
356+
#' \url{https://www.jstatsoft.org/v24/i02/}
357357
#'
358358
#' Wasserman, S. and Faust, K. (1994). \emph{Social Network Analysis: Methods
359359
#' and Applications.} Cambridge: Cambridge University Press.
@@ -518,7 +518,7 @@ is.discrete<-function(x){
518518
#' @seealso \code{\link{as.matrix.network}}, \code{\link{as.network.matrix}}
519519
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
520520
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
521-
#' \url{http://www.jstatsoft.org/v24/i02/}
521+
#' \url{https://www.jstatsoft.org/v24/i02/}
522522
#' @keywords graphs
523523
#' @examples
524524
#'

‎R/network-package.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ NULL
183183
#'
184184
#' Butts, C. T. (2008). \dQuote{network: a Package for Managing Relational
185185
#' Data in R.} \emph{Journal of Statistical Software}, 24(2).
186-
#' \url{http://www.jstatsoft.org/v24/i02/}
186+
#' \url{https://www.jstatsoft.org/v24/i02/}
187187
#' @keywords classes graphs
188188
#' @examples
189189
#'

‎R/operators.R‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# David Hunter <dhunter@stat.psu.edu> and Mark S. Handcock
77
# <handcock@u.washington.edu>.
88
#
9-
# Last Modified 01/28/11
9+
# Last Modified 06/06/21
1010
# Licensed under the GNU General Public License version 2 (June, 1991)
1111
# or greater
1212
#
@@ -156,7 +156,7 @@ out_of_bounds <- function(x, el){
156156
#' \code{\link{network.operators}}, and \code{\link{get.inducedSubgraph}}
157157
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
158158
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
159-
#' \url{http://www.jstatsoft.org/v24/i02/}
159+
#' \url{https://www.jstatsoft.org/v24/i02/}
160160
#' @keywords graphs manip
161161
#' @examples
162162
#'
@@ -554,7 +554,7 @@ out_of_bounds <- function(x, el){
554554
#' @seealso \code{\link{network.extraction}}
555555
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
556556
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
557-
#' \url{http://www.jstatsoft.org/v24/i02/}
557+
#' \url{https://www.jstatsoft.org/v24/i02/}
558558
#'
559559
#' Wasserman, S. and Faust, K. (1994). \emph{Social Network Analysis: Methods
560560
#' and Applications.} Cambridge: University of Cambridge Press.
@@ -1292,7 +1292,7 @@ networkOperatorSetup<-function(x,y=NULL){
12921292
#' @seealso \code{\link{network.operators}}
12931293
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
12941294
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
1295-
#' \url{http://www.jstatsoft.org/v24/i02/}
1295+
#' \url{https://www.jstatsoft.org/v24/i02/}
12961296
#' @keywords arith graphs
12971297
#' @examples
12981298
#'
@@ -1357,7 +1357,7 @@ prod.network<-function(..., attrname=NULL, na.rm=FALSE){
13571357
#' @seealso \code{\link{network.operators}}
13581358
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
13591359
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
1360-
#' \url{http://www.jstatsoft.org/v24/i02/}
1360+
#' \url{https://www.jstatsoft.org/v24/i02/}
13611361
#' @keywords arith graphs
13621362
#' @examples
13631363
#'

‎R/plot.R‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# David Hunter <dhunter@stat.psu.edu> and Mark S. Handcock
77
# <handcock@u.washington.edu>.
88
#
9-
# Last Modified 11/24/19
9+
# Last Modified 06/06/21
1010
# Licensed under the GNU General Public License version 2 (June, 1991)
1111
# or greater
1212
#
@@ -122,7 +122,7 @@ make.arrow.poly.coords<-function(x0,y0,x1,y1,ahangle,ahlen,swid,toff,hoff,ahead,
122122
#' \code{\link{polygon}}
123123
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
124124
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
125-
#' \url{http://www.jstatsoft.org/v24/i02/}
125+
#' \url{https://www.jstatsoft.org/v24/i02/}
126126
#' @keywords aplot graphs
127127
#' @examples
128128
#'
@@ -333,7 +333,7 @@ make.vertex.poly.coords<-function(x,y,r,s,rot){
333333
#' @seealso \code{\link{plot.network}}, \code{\link{polygon}}
334334
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
335335
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
336-
#' \url{http://www.jstatsoft.org/v24/i02/}
336+
#' \url{https://www.jstatsoft.org/v24/i02/}
337337
#' @keywords aplot graphs
338338
#' @examples
339339
#'
@@ -600,7 +600,7 @@ network.edgelabel<-function(px0,py0,px1,py1,label,directed,loops=FALSE,cex,curve
600600
#' \code{\link{network.loop}}, \code{\link{network.vertex}}
601601
#' @references Butts, C. T. (2008). \dQuote{network: a Package for Managing
602602
#' Relational Data in R.} \emph{Journal of Statistical Software}, 24(2).
603-
#' \url{http://www.jstatsoft.org/v24/i02/}
603+
#' \url{https://www.jstatsoft.org/v24/i02/}
604604
#'
605605
#' Wasserman, S., and Faust, K. (1994). \emph{Social Network Analysis:
606606
#' Methods and Applications.} Cambridge: Cambridge University Press.

‎inst/CITATION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ bibentry("Article",
2929
year = 2008,
3030
volume = 24,
3131
number = 2,
32-
url ="http://www.jstatsoft.org/v24/i02/paper")
32+
url ="https://www.jstatsoft.org/v24/i02/paper")
3333

3434
# add a network-specific footer
3535
citFooter("Some additional information regarding the C-level network API can be found in the README file within the network.api subdirectory under the package \"inst\" directory -- check your installed library tree.")

0 commit comments

Comments
 (0)