-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Made various updates in advance of the v19 release. Most are to appease
the CRAN gods. For now, I've replaced currently defunct Pajek URLs with Internet Archive equivalents; this will hopefully work for at least the medium term. I also fixed a bug in which a bad value of edge.check was passed by some constructors to add.edge/add.edges. This did not actually produce a problem under normal circumstances (which is why it was not caught), but more stringent checking implemented by the CRAN folks flagged it. add.edge(s) now validates that argument more carefully, defaulting as usual to FALSE.
- Loading branch information
1 parent
e269878
commit 2201513
Showing
5 changed files
with
18 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
Package: network | ||
Version: 1.19.0 | ||
Date: 2023-12-04 | ||
Date: 2024-12-04 | ||
Title: Classes for Relational Data | ||
Authors@R: c( | ||
person("Carter T.", "Butts", role=c("aut","cre"), email="[email protected]"), | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
# David Hunter <[email protected]> and Mark S. Handcock | ||
# <[email protected]>. | ||
# | ||
# Last Modified 06/06/21 | ||
# Last Modified 12/04/24 | ||
# Licensed under the GNU General Public License version 2 (June, 1991) | ||
# or greater | ||
# | ||
|
@@ -152,6 +152,8 @@ add.edge.network<-function(x, tail, head, names.eval=NULL, vals.eval=NULL, edge. | |
if(.validLHS(xn,parent.frame())){ #If x not anonymous, set in calling env | ||
on.exit(eval.parent(call('<-',xn,x))) | ||
} | ||
if(is.null(edge.check)||(length(edge.check)<1)||is.na(edge.check[1])) | ||
edge.check<-FALSE | ||
x<-.Call(addEdge_R,x,tail,head,names.eval,vals.eval,edge.check) | ||
invisible(x) | ||
} | ||
|
@@ -185,7 +187,7 @@ add.edges.network<-function(x, tail, head, names.eval=NULL, vals.eval=NULL, ...) | |
if(length(unique(c(length(tail),length(head),length(names.eval), length(vals.eval))))>1) | ||
stop("head, tail, names.eval and vals.eval lists passed to add.edges must be of the same length!\n") | ||
edge.check<-list(...)$edge.check | ||
if(is.null(edge.check)) | ||
if(is.null(edge.check)||(length(edge.check)<1)||is.na(edge.check[1])) | ||
edge.check<-FALSE | ||
#Pass the inputs to the C side | ||
xn<-substitute(x) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.