Skip to content

Commit 7552f30

Browse files
skyebendskyebend
committed
changed argument order for get_*.active functions to align with generics and updated docs and tests
1 parent 85b27e1 commit 7552f30

8 files changed

Lines changed: 89 additions & 82 deletions

File tree

‎.Rbuildignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ appveyor.yml
88
^cran-comments\.md$
99
^CODE_OF_CONDUCT\.md$
1010
^\.github$
11+
^CRAN-SUBMISSION$

‎ChangeLog‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Change Log:
2-
v0.11.6
2+
v0.12.0
3+
-change order of named arguments to all *.active functions to comply with inheritance semantics
34
-changes to the usage statement for the network.extensions.Rd file, which uses the \method{} tag to help R into thinking that the *.active functions are S3 methods.
45
v0.11.5
56
- update links to .paj example files and fix some documentation warnings

‎DESCRIPTION‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: networkDynamic
2-
Version: 0.11.6
3-
Date: 2026-03-29
2+
Version: 0.12.0
3+
Date: 2026-04-02
44
Title: Dynamic Extensions for Network Objects
55
Type: Package
66
Depends: R (>= 3.0.0), network (>= 1.20.0)

‎R/access.R‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,10 @@ get.change.times <- function (x, vertex.activity=TRUE,edge.activity=TRUE, ignore
471471

472472

473473
#Variant of get.edgeIDs with dynamic query support
474-
get.edgeIDs.active<-function(x,v,onset=NULL,terminus=NULL,length=NULL, at=NULL,
475-
alter=NULL,neighborhood=c("out", "in", "combined"),
476-
rule=c("any","all","earliest","latest"),na.omit=TRUE,active.default=TRUE){
474+
get.edgeIDs.active<-function(x,v,alter=NULL,neighborhood=c("out", "in", "combined"),
475+
rule=c("any","all","earliest","latest"),na.omit=TRUE,
476+
onset=NULL,terminus=NULL,length=NULL, at=NULL,
477+
active.default=TRUE,...){
477478

478479
if(missing(v)){
479480
stop("'v' parameter must be specified with a vertex id to indicate which vertex to search for incident edges")
@@ -493,9 +494,9 @@ get.edgeIDs.active<-function(x,v,onset=NULL,terminus=NULL,length=NULL, at=NULL,
493494

494495
#Variant of get.edges with dynamic query support. (Note: not safe in the long
495496
#run...)
496-
get.edges.active<-function(x,v,onset=NULL,terminus=NULL,length=NULL, at=NULL,
497-
alter=NULL,neighborhood=c("out", "in", "combined"),
498-
rule=c("any","all","earliest","latest"),na.omit=TRUE,active.default=TRUE){
497+
get.edges.active<-function(x,v,alter=NULL,neighborhood=c("out", "in", "combined"),
498+
onset=NULL,terminus=NULL,length=NULL, at=NULL,
499+
rule=c("any","all","earliest","latest"),na.omit=TRUE,active.default=TRUE,...){
499500
if(missing(v)){
500501
stop("'v' parameter must be specified with vertex id to indicate which vertex to search for incident edges")
501502
}
@@ -513,8 +514,8 @@ get.edges.active<-function(x,v,onset=NULL,terminus=NULL,length=NULL, at=NULL,
513514

514515

515516
#Variant of get.neighborhood with dynamic query support. Slow, most likely.
516-
get.neighborhood.active<-function(x,v,onset=NULL,terminus=NULL,length=NULL, at=NULL,
517-
type=c("out", "in", "combined"),rule=c("any","all","earliest","latest"),na.omit=TRUE,active.default=TRUE){
517+
get.neighborhood.active<-function(x,v, type=c("out", "in", "combined"),rule=c("any","all","earliest","latest"),
518+
na.omit=TRUE,onset=NULL,terminus=NULL,length=NULL, at=NULL,active.default=TRUE,...){
518519
rule<-match.arg(rule)
519520
# get active edges and assemble neighborhood in questions
520521
if(!is.directed(x)){
@@ -664,8 +665,8 @@ is.active<-function(x,onset=NULL,terminus=NULL,length=NULL, at=NULL, e=NULL,v=NU
664665

665666
#Variant of is.adjacent for networks with dynamic extensions. Slow, but will
666667
#get the job done.
667-
is.adjacent.active<-function(x,vi,vj,onset=NULL,terminus=NULL,length=NULL, at=NULL,
668-
rule=c("any","all","earliest","latest"),na.omit=FALSE,active.default=TRUE){
668+
is.adjacent.active<-function(x,vi,vj,na.omit=FALSE,onset=NULL,terminus=NULL,length=NULL, at=NULL,
669+
rule=c("any","all","earliest","latest"),active.default=TRUE,...){
669670
rule<-match.arg(rule)
670671
#Initially, get edge IDs from vi to vj
671672
eid<-get.edgeIDs(x=x,v=vi,alter=vj,neighborhood="out",na.omit=na.omit)

‎inst/doc/networkDynamic.pdf‎

-446 KB
Binary file not shown.

‎man/network.extensions.Rd‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,22 @@
2323
Various core functions from the \link[network]{network} package, with specialized extensions for handling dynamic data.
2424
}
2525
\usage{
26-
\method{get.edgeIDs}{active}(x, v, onset = NULL, terminus = NULL, length = NULL, at = NULL,
27-
alter = NULL, neighborhood = c("out", "in", "combined"),
28-
rule = c("any", "all", "earliest", "latest"), na.omit = TRUE, active.default = TRUE)
29-
\method{get.edges}{active}(x, v, onset = NULL, terminus = NULL, length = NULL, at = NULL,
30-
alter = NULL, neighborhood = c("out", "in", "combined"),
31-
rule = c("any", "all", "earliest", "latest"), na.omit = TRUE, active.default = TRUE)
32-
\method{get.neighborhood}{active}(x, v, onset = NULL, terminus = NULL, length = NULL, at = NULL,
33-
type = c("out", "in", "combined"), rule = c("any", "all", "earliest", "latest"),
34-
na.omit = TRUE, active.default = TRUE)
26+
\method{get.edgeIDs}{active}(x, v, alter = NULL, neighborhood = c("out", "in",
27+
"combined"), rule = c("any", "all", "earliest",
28+
"latest"), na.omit = TRUE, onset = NULL, terminus =
29+
NULL, length = NULL, at = NULL, active.default = TRUE, ...)
30+
\method{get.edges}{active}(x, v, alter = NULL, neighborhood = c("out", "in",
31+
"combined"), onset = NULL, terminus = NULL, length =
32+
NULL, at = NULL, rule = c("any", "all", "earliest",
33+
"latest"), na.omit = TRUE, active.default = TRUE, ...)
34+
\method{get.neighborhood}{active}(x, v, type = c("out", "in", "combined"), rule =
35+
c("any", "all", "earliest", "latest"), na.omit = TRUE,
36+
onset = NULL, terminus = NULL, length = NULL, at =
37+
NULL, active.default = TRUE, ...)
3538

36-
\method{is.adjacent}{active}(x, vi, vj, onset = NULL, terminus = NULL, length = NULL, at = NULL,
37-
rule = c("any", "all", "earliest", "latest"), na.omit = FALSE, active.default = TRUE)
39+
\method{is.adjacent}{active}(x, vi, vj, na.omit = FALSE, onset = NULL, terminus =
40+
NULL, length = NULL, at = NULL, rule = c("any", "all",
41+
"earliest", "latest"), active.default = TRUE, ...)
3842

3943
\method{network.dyadcount}{active}(x, onset = NULL, terminus = NULL, length = NULL, at = NULL,
4044
rule = c("any", "all", "earliest", "latest"),

‎tests/get_tests.R‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -164,27 +164,27 @@ b7 = get.edgeIDs.active(anet, iov[5,1], at=10, active.default=F)==5 # at a
164164
b8 = get.edgeIDs.active(anet, iov[7,1], at=30, active.default=F)==7 # at b
165165

166166
# interval queries that should return empty vectors
167-
b9 = length(get.edgeIDs.active(anet, iov[3,1], Inf, Inf, active.default=F))==0 # over (Inf,Inf)
168-
b10 = length(get.edgeIDs.active(anet, iov[8,1], -Inf, Inf, active.default=F))==0 # over (-Inf,Inf)
169-
b11 = length(get.edgeIDs.active(anet, iov[3,1], 30, Inf, active.default=F))==0 # over (H,Inf)
170-
b12 = length(get.edgeIDs.active(anet, iov[4,1], -Inf, 0, active.default=F))==0 # over (-Inf, L)
171-
b13 = length(get.edgeIDs.active(anet, iov[5,1], 0, 5, active.default=F))==0 # over (L1,L2)
172-
b14 = length(get.edgeIDs.active(anet, iov[5,1], 0, 15, active.default=F, rule="all"))==0 # over (L,M)
173-
b15 = length(get.edgeIDs.active(anet, iov[7,1], 0, 60, active.default=F, rule="all"))==0 # over (L,H)
174-
b16 = length(get.edgeIDs.active(anet, iov[7,1], 45, 55, active.default=F, rule="all"))==0 # over (M, H)
175-
b17 = length(get.edgeIDs.active(anet, iov[6,1], 15, 20, active.default=F))==0 # over (H1, H2)
167+
b9 = length(get.edgeIDs.active(anet, iov[3,1], onset=Inf, terminus=Inf, active.default=F))==0 # over (Inf,Inf)
168+
b10 = length(get.edgeIDs.active(anet, iov[8,1], onset=-Inf, terminus=Inf, active.default=F))==0 # over (-Inf,Inf)
169+
b11 = length(get.edgeIDs.active(anet, iov[3,1], onset=30, terminus=Inf, active.default=F))==0 # over (H,Inf)
170+
b12 = length(get.edgeIDs.active(anet, iov[4,1], onset=-Inf, terminus=0, active.default=F))==0 # over (-Inf, L)
171+
b13 = length(get.edgeIDs.active(anet, iov[5,1], onset=0, terminus=5, active.default=F))==0 # over (L1,L2)
172+
b14 = length(get.edgeIDs.active(anet, iov[5,1], onset=0, terminus=15, active.default=F, rule="all"))==0 # over (L,M)
173+
b15 = length(get.edgeIDs.active(anet, iov[7,1], onset=0, terminus=60, active.default=F, rule="all"))==0 # over (L,H)
174+
b16 = length(get.edgeIDs.active(anet, iov[7,1], onset=45, terminus=55, active.default=F, rule="all"))==0 # over (M, H)
175+
b17 = length(get.edgeIDs.active(anet, iov[6,1], onset=15, terminus=20, active.default=F))==0 # over (H1, H2)
176176

177177
# interval queries that should return non-empty vectors
178-
b18 = min(get.edgeIDs.active(anet, iov[1,1], -Inf, Inf, active.default=T))==1 # over null
179-
b19 = get.edgeIDs.active(anet, iov[2,1], -Inf, Inf, active.default=F)==2 # over (-Inf,Inf)
180-
b20 = get.edgeIDs.active(anet, iov[4,1], 10, Inf, active.default=F)==4 # over (a,Inf)
181-
b21 = get.edgeIDs.active(anet, iov[3,1], -Inf, 20, active.default=F)==3 # over (-Inf, b)
182-
b22 = get.edgeIDs.active(anet, iov[5,1], 10, 20, active.default=F)==5 # over (a,b)
183-
b23 = get.edgeIDs.active(anet, iov[6,1], 10, 10, active.default=F)==6 # over (a,a)
184-
b24 = get.edgeIDs.active(anet, iov[4,1], 0, 15, active.default=F)==4 # over (L,M)
185-
b25 = get.edgeIDs.active(anet, iov[7,1], 0, 60, active.default=F)==7 # over (L,H)
186-
b26 = get.edgeIDs.active(anet, iov[5,1], 15, 18, active.default=F)==5 # over (M1, M2)
187-
b27 = get.edgeIDs.active(anet, iov[7,1], 45, 60, active.default=F)==7 # over (M, H)
178+
b18 = min(get.edgeIDs.active(anet, iov[1,1], onset=-Inf, terminus=Inf, active.default=T))==1 # over null
179+
b19 = get.edgeIDs.active(anet, iov[2,1], onset=-Inf, terminus=Inf, active.default=F)==2 # over (-Inf,Inf)
180+
b20 = get.edgeIDs.active(anet, iov[4,1], onset=10, terminus=Inf, active.default=F)==4 # over (a,Inf)
181+
b21 = get.edgeIDs.active(anet, iov[3,1], onset=-Inf, terminus=20, active.default=F)==3 # over (-Inf, b)
182+
b22 = get.edgeIDs.active(anet, iov[5,1], onset=10, terminus=20, active.default=F)==5 # over (a,b)
183+
b23 = get.edgeIDs.active(anet, iov[6,1], onset=10, terminus=10, active.default=F)==6 # over (a,a)
184+
b24 = get.edgeIDs.active(anet, iov[4,1], onset=0, terminus=15, active.default=F)==4 # over (L,M)
185+
b25 = get.edgeIDs.active(anet, iov[7,1], onset=0, terminus=60, active.default=F)==7 # over (L,H)
186+
b26 = get.edgeIDs.active(anet, iov[5,1], onset=15, terminus=18, active.default=F)==5 # over (M1, M2)
187+
b27 = get.edgeIDs.active(anet, iov[7,1], onset=45, terminus=60, active.default=F)==7 # over (M, H)
188188

189189
b.tests = paste("b", seq(1,27), sep="")
190190
b.results= sapply(b.tests, function(x){eval(parse(text=x))})
@@ -278,7 +278,7 @@ net1 <- network(flo, directed=FALSE)
278278
el1 <- as.matrix(net1, matrix.type="edgelist")
279279
activate.edges(net1, 10, 20, e=seq(2,20,2))
280280
activate.edges(net1, 10, 10, e=seq(1,19,2))
281-
n1 = get.neighborhood.active(net1, v=9, 10, 20, rule="all")
281+
n1 = get.neighborhood.active(net1, v=9, onset=10, terminus=20, rule="all")
282282
n2 = get.neighborhood.active(net1, v=9, at=10)
283283
b1 = all(n1==c(2,3,13,16))
284284
b2 = all(n2==c(1,2,3,13,14,16))
@@ -295,37 +295,37 @@ net2 <- network(flo)
295295
el2 <- as.matrix(net2, matrix.type="edgelist")
296296
activate.edges(net2, -Inf, 20, e=seq(2,40,2))
297297
activate.edges(net2, 20, 20, e=seq(1,39,2))
298-
n4 = get.neighborhood.active(net2, v=15, 10, 20, type="out")
298+
n4 = get.neighborhood.active(net2, v=15, onset=10, terminus=20, type="out")
299299
n5 = get.neighborhood.active(net2, v=15, at=20, type="out")
300300
b4 = all(n4==c(5,11,13))
301301
b5 = (n5==4)
302302

303303
# branch 5: directed network, no out neighborhood
304-
n6 = get.neighborhood.active(net2, v=1, 10, 20, type="out")
305-
n7 = get.neighborhood.active(net2, v=15, 30, 40, type="out")
304+
n6 = get.neighborhood.active(net2, v=1, onset=10, terminus=20, type="out")
305+
n7 = get.neighborhood.active(net2, v=15, onset=30, terminus=40, type="out")
306306
b6 = length(n6)==0
307307
b7 = length(n7)==0
308308

309309
# branch 6: directed network, in neighborhood
310310
net3 <- network(flo)
311311
activate.edges(net3, 10, Inf, e=seq(2,40,2))
312312
activate.edges(net3, 10, 20, e=seq(1,39,2))
313-
n8 = get.neighborhood.active(net3, v=9, 10, 20, type="in")
314-
n9 = get.neighborhood.active(net3, v=9, 10, 30, type="in", rule="all")
313+
n8 = get.neighborhood.active(net3, v=9, onset=10, terminus=20, type="in")
314+
n9 = get.neighborhood.active(net3, v=9, onset=10, terminus=30, type="in", rule="all")
315315
b8 = all(n8==c(1,2,3,13,14,16))
316316
b9 = all(n9==c(2,13,16))
317317

318318
# branch 7: directed network, no in neighborhood
319-
n10 = get.neighborhood.active(net3, v=12, 10, 20, type="in")
320-
n11 = get.neighborhood.active(net3, v=9, -10, -5, type="in")
319+
n10 = get.neighborhood.active(net3, v=12, onset=10, terminus=20, type="in")
320+
n11 = get.neighborhood.active(net3, v=9, onset=-10, terminus=-5, type="in")
321321
b10 = length(n10)==0
322322
b11 = length(n11)==0
323323

324324
# branch 8: directed network, combined neighborhood, having in and out ties
325325
net4 <- network(flo)
326326
activate.edges(net4, at=10, e=seq(2,40,2))
327327
activate.edges(net4, at=20, e=seq(1,39,2))
328-
n12 = get.neighborhood.active(net4, v=7, 10, 30, type="combined")
328+
n12 = get.neighborhood.active(net4, v=7, onset=10, terminus=30, type="combined")
329329
n13 = get.neighborhood.active(net4, v=7, at=20, type="combined")
330330
b12 = all(n12==c(2,4,8,16))
331331
b13 = all(n13==c(2,4,16))
@@ -335,8 +335,8 @@ net5 <- network(flo)
335335
net5[15,] = 0 # remove all out edges from node 15
336336
el5 <- as.matrix(net5, matrix.type="edgelist")
337337
activate.edges(net5, e=seq(2,36,2))
338-
n14 = get.neighborhood.active(net5, v=15, -Inf, Inf, type="combined")
339-
n15 = get.neighborhood.active(net5, v=15, -Inf, Inf, type="combined", active.default=F)
338+
n14 = get.neighborhood.active(net5, v=15, onset=-Inf, terminus=Inf, type="combined")
339+
n15 = get.neighborhood.active(net5, v=15, onset=-Inf, terminus=Inf, type="combined", active.default=F)
340340
b14 = all(n14==c(4,5,11,13))
341341
b15 = all(n15==c(4,11))
342342

‎tests/query_tests.R‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -390,38 +390,38 @@ if(any(!b.results)){
390390

391391

392392
# tests that should return true for interval queries
393-
c1 = is.adjacent.active(anet, iov[1,1], iov[1,2], -Inf, Inf) # over (-Inf,Inf)
394-
c2 = is.adjacent.active(anet, iov[2,1], iov[2,2], -Inf, Inf) # over (-Inf,Inf)
395-
c3 = is.adjacent.active(anet, iov[3,1], iov[3,2], -Inf, 20) # over (-Inf, b)
396-
c4 = is.adjacent.active(anet, iov[3,1], iov[3,2], -Inf, 30) # over (-Inf, H)
397-
c5 = is.adjacent.active(anet, iov[4,1], iov[4,2], 0, Inf) # over (L, Inf)
398-
c6 = is.adjacent.active(anet, iov[4,1], iov[4,2], 10, Inf) # over (a, Inf)
399-
c7 = is.adjacent.active(anet, iov[5,1], iov[5,2], 10,20) # over (a, b)
400-
c8 = is.adjacent.active(anet, iov[7,1], iov[7,2], 10,30) # over (a, b)
401-
c9 = is.adjacent.active(anet, iov[6,1], iov[6,2], 10,10) # over (a, a)
402-
c10 = is.adjacent.active(anet, iov[7,1], iov[7,2], 0, 40) # over (L, H)
393+
c1 = is.adjacent.active(anet, iov[1,1], iov[1,2], onset=-Inf, terminus=Inf) # over (-Inf,Inf)
394+
c2 = is.adjacent.active(anet, iov[2,1], iov[2,2], onset=-Inf, terminus=Inf) # over (-Inf,Inf)
395+
c3 = is.adjacent.active(anet, iov[3,1], iov[3,2], onset=-Inf, terminus=20) # over (-Inf, b)
396+
c4 = is.adjacent.active(anet, iov[3,1], iov[3,2], onset=-Inf, terminus=30) # over (-Inf, H)
397+
c5 = is.adjacent.active(anet, iov[4,1], iov[4,2], onset=0, terminus=Inf) # over (L, Inf)
398+
c6 = is.adjacent.active(anet, iov[4,1], iov[4,2], onset=10, terminus=Inf) # over (a, Inf)
399+
c7 = is.adjacent.active(anet, iov[5,1], iov[5,2], onset=10,terminus=20) # over (a, b)
400+
c8 = is.adjacent.active(anet, iov[7,1], iov[7,2], onset=10,terminus=30) # over (a, b)
401+
c9 = is.adjacent.active(anet, iov[6,1], iov[6,2], onset=10,terminus=10) # over (a, a)
402+
c10 = is.adjacent.active(anet, iov[7,1], iov[7,2], onset=0, terminus=40) # over (L, H)
403403

404404
# tests that should return false for interval queries b/c of non-adjacency
405-
c11 = !is.adjacent.active(anet, iov[1,2], iov[1,1], -Inf, Inf) # over (-Inf,Inf)
406-
c12 = !is.adjacent.active(anet, iov[2,2], iov[2,1], -Inf, Inf) # over (-Inf,Inf)
407-
c13 = !is.adjacent.active(anet, iov[3,2], iov[3,1], -Inf, 20) # over (-Inf, b)
408-
c14 = !is.adjacent.active(anet, iov[3,2], iov[3,1], -Inf, 30) # over (-Inf, H)
409-
c15 = !is.adjacent.active(anet, iov[4,2], iov[4,1], 0, Inf) # over (L, Inf)
410-
c16 = !is.adjacent.active(anet, iov[4,2], iov[4,1], 10, Inf) # over (a, Inf)
411-
c17 = !is.adjacent.active(anet, iov[5,2], iov[5,1], 10,20) # over (a, b)
412-
c18 = !is.adjacent.active(anet, iov[7,2], iov[7,1], 10,30) # over (a, b)
413-
c19 = !is.adjacent.active(anet, iov[6,2], iov[6,1], 10,10) # over (a, a)
414-
c20 = !is.adjacent.active(anet, iov[7,2], iov[7,1], 0, 40) # over (L, H)
405+
c11 = !is.adjacent.active(anet, iov[1,2], iov[1,1], onset=-Inf, terminus=Inf) # over (-Inf,Inf)
406+
c12 = !is.adjacent.active(anet, iov[2,2], iov[2,1], onset=-Inf, terminus=Inf) # over (-Inf,Inf)
407+
c13 = !is.adjacent.active(anet, iov[3,2], iov[3,1], onset=-Inf, terminus=20) # over (-Inf, b)
408+
c14 = !is.adjacent.active(anet, iov[3,2], iov[3,1], onset=-Inf, terminus=30) # over (-Inf, H)
409+
c15 = !is.adjacent.active(anet, iov[4,2], iov[4,1], onset=0, terminus=Inf) # over (L, Inf)
410+
c16 = !is.adjacent.active(anet, iov[4,2], iov[4,1], onset=10, terminus=Inf) # over (a, Inf)
411+
c17 = !is.adjacent.active(anet, iov[5,2], iov[5,1], onset=10,terminus=20) # over (a, b)
412+
c18 = !is.adjacent.active(anet, iov[7,2], iov[7,1], onset=10,terminus=30) # over (a, b)
413+
c19 = !is.adjacent.active(anet, iov[6,2], iov[6,1], onset=10,terminus=10) # over (a, a)
414+
c20 = !is.adjacent.active(anet, iov[7,2], iov[7,1], onset=0, terminus=40) # over (L, H)
415415

416416
# tests that should return false for interval queries b/c of non-activity
417-
c21 = !is.adjacent.active(anet, iov[1,1], iov[1,2], -Inf, Inf, active.default=F) # over (-Inf,Inf)
418-
c22 = !is.adjacent.active(anet, iov[8,1], iov[8,2], -Inf, Inf, active.default=F) # over (-Inf,Inf)
419-
c23 = !is.adjacent.active(anet, iov[3,1], iov[3,2], -Inf, 30, rule="all", active.default=F) # over (-Inf, H)
420-
c24 = !is.adjacent.active(anet, iov[4,1], iov[4,2], 0, Inf, rule="all", active.default=F) # over (L, Inf)
421-
c25 = !is.adjacent.active(anet, iov[5,1], iov[5,2], 10, Inf, rule="all", active.default=F) # over (a, Inf)
422-
c26 = !is.adjacent.active(anet, iov[5,1], iov[5,2], 20,20, active.default=F) # over (b, b)
423-
c27 = !is.adjacent.active(anet, iov[5,1], iov[5,2], 0, 5, active.default=F) # over (L, L)
424-
c28 = !is.adjacent.active(anet, iov[7,1], iov[7,2], 0,35, rule="all", active.default=F) # over (L, H)
417+
c21 = !is.adjacent.active(anet, iov[1,1], iov[1,2], onset=-Inf, terminus=Inf, active.default=F) # over (-Inf,Inf)
418+
c22 = !is.adjacent.active(anet, iov[8,1], iov[8,2], onset=-Inf, terminus=Inf, active.default=F) # over (-Inf,Inf)
419+
c23 = !is.adjacent.active(anet, iov[3,1], iov[3,2], onset=-Inf, terminus=30, rule="all", active.default=F) # over (-Inf, H)
420+
c24 = !is.adjacent.active(anet, iov[4,1], iov[4,2], onset=0, terminus=Inf, rule="all", active.default=F) # over (L, Inf)
421+
c25 = !is.adjacent.active(anet, iov[5,1], iov[5,2], onset=10, terminus=Inf, rule="all", active.default=F) # over (a, Inf)
422+
c26 = !is.adjacent.active(anet, iov[5,1], iov[5,2], onset=20,terminus=20, active.default=F) # over (b, b)
423+
c27 = !is.adjacent.active(anet, iov[5,1], iov[5,2], onset=0, terminus=5, active.default=F) # over (L, L)
424+
c28 = !is.adjacent.active(anet, iov[7,1], iov[7,2], onset=0,terminus=35, rule="all", active.default=F) # over (L, H)
425425

426426
c.tests = paste("c", seq(1,28), sep="")
427427
c.results= sapply(c.tests, function(x){eval(parse(text=x))})

0 commit comments

Comments
 (0)