Skip to content

updates for compatibility with new network generics #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skyebend merged 9 commits into from
Jan 16, 2020
Merged

updates for compatibility with new network generics #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b639e69
tweak get/list.vertex.attribute(s).active R code
chad-klumb Oct 10, 2019
eefc307
tweak docs for get/list.vertex.attribute(s).active
chad-klumb Oct 10, 2019
8333964
add S3method lines for get/list.vertex.attribute(s).active
chad-klumb Oct 10, 2019
31ed7e8
point travis to new version of network
chad-klumb Oct 10, 2019
97b5667
bump date, version, and network version requirement
chad-klumb Oct 11, 2019
1e22138
Update ChangeLog
chad-klumb Oct 11, 2019
8ea3892
point to statnet/network@master
chad-klumb Dec 1, 2019
41f7267
default to CRAN network since that appears to be up now
chad-klumb Dec 1, 2019
d7c1452
require current CRAN network version
chad-klumb Dec 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Change Log:
v0.10.1
- update get.vertex.attribute.active and list.vertex.attributes.active to be compatible with new network generics
v0.10
- update to test failing on cran after network 1.14 release
- updates to network.edgecount.active, network.dyadcount.active and similar to be compatible
Expand Down
6 changes: 3 additions & 3 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Package: networkDynamic
Version: 0.10.0
Date: 2019-04-04
Version: 0.10.1
Date: 2019-10-11
Title: Dynamic Extensions for Network Objects
Type: Package
Depends: R (>= 3.0.0), network (>= 1.15)
Depends: R (>= 3.0.0), network (>= 1.16.0)
Imports: statnet.common, methods
Suggests: testthat
LinkingTo: network
Expand Down
3 changes: 2 additions & 1 deletion NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,6 @@ S3method(network.dyadcount,active)
S3method(network.edgecount,active)
S3method(network.naedgecount,active)
S3method(network.size,active)

S3method(get.vertex.attribute,active)
S3method(list.vertex.attributes,active)

4 changes: 2 additions & 2 deletions R/tea_utils.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ activate.edge.attribute <-function(x, prefix, value, onset=NULL, terminus=NULL,l
}


get.vertex.attribute.active <- function(x, prefix, onset=NULL, terminus=NULL,length=NULL, at=NULL, rule = c("any", "all","earliest","latest"), na.omit = FALSE, null.na = TRUE, active.default = TRUE, dynamic.only=FALSE, require.active=FALSE,return.tea=FALSE,unlist=TRUE){
get.vertex.attribute.active <- function(x, prefix, onset=NULL, terminus=NULL,length=NULL, at=NULL, rule = c("any", "all","earliest","latest"), na.omit = FALSE, null.na = TRUE, active.default = TRUE, dynamic.only=FALSE, require.active=FALSE,return.tea=FALSE,unlist=TRUE,...){

# validate inputs
if(!is.network(x))
Expand Down Expand Up @@ -1346,7 +1346,7 @@ deactivate.network.attribute <- function (x, prefix, onset=NULL, terminus=NULL,
#list.vertex.attributes.active
##########################################################################

list.vertex.attributes.active <-function(x, onset=NULL, terminus=NULL,length=NULL, at=NULL, na.omit=FALSE, rule = c("any", "all"), v=seq_len(network.size(x)), require.active=FALSE, active.default = TRUE, dynamic.only=FALSE){
list.vertex.attributes.active <-function(x, onset=NULL, terminus=NULL,length=NULL, at=NULL, na.omit=FALSE, rule = c("any", "all"), v=seq_len(network.size(x)), require.active=FALSE, active.default = TRUE, dynamic.only=FALSE,...){

if(!is.network(x)){
stop("list.vertex.attributes.active requires that the first argument be a network object")
Expand Down
13 changes: 8 additions & 5 deletions man/tea_functions.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ activate.edge.value(x, prefix, value, onset = NULL, terminus = NULL,
activate.network.attribute(x, prefix, value, onset = NULL, terminus = NULL,
length = NULL, at = NULL, dynamic.only = FALSE)

get.vertex.attribute.active(x, prefix, onset = NULL, terminus = NULL,
\method{get.vertex.attribute}{active}(x, prefix, onset = NULL, terminus = NULL,
length = NULL, at = NULL, rule = c("any", "all","earliest","latest"),
na.omit = FALSE, null.na = TRUE, active.default = TRUE,
dynamic.only = FALSE, require.active = FALSE,
return.tea = FALSE, unlist = TRUE)
return.tea = FALSE, unlist = TRUE,...)

get.edge.value.active(x, prefix, onset = NULL, terminus = NULL,
length = NULL, at = NULL, rule = c("any", "all","earliest","latest"),
Expand All @@ -67,10 +67,10 @@ deactivate.edge.attribute (x, prefix, onset = NULL, terminus = NULL,
deactivate.network.attribute(x, prefix, onset = NULL, terminus = NULL,
length = NULL, at = NULL, dynamic.only = FALSE)

list.vertex.attributes.active(x, onset = NULL, terminus = NULL,length = NULL,
\method{list.vertex.attributes}{active}(x, onset = NULL, terminus = NULL,length = NULL,
at = NULL, na.omit = FALSE, rule = c("any", "all"),
v = seq_len(network.size(x)), require.active = FALSE,
active.default = TRUE, dynamic.only = FALSE)
active.default = TRUE, dynamic.only = FALSE,...)

list.edge.attributes.active(x, onset = NULL, terminus = NULL,length = NULL,
at = NULL, na.omit = FALSE, rule = c("any", "all"),
Expand Down Expand Up @@ -152,7 +152,10 @@ optional, one or more IDs indicating which vertices should have the TEA attribut
\item{unlist}{
logical; should retrieved attributes be unlisted prior to being returned? Setting to FALSE is necessary to correctly fetch list objects stored as attributes.
}


\item{\dots}{
possible additional arguments
}

}
\details{
Expand Down