Fixed up tests to work with latest 'ergm'.

Author: krivit

tests/sim_gf_sum.R

@@ -14,12 +14,10 @@ logit<-function(p)log(p/(1-p))
 coef.form.f<-function(coef.diss,density) -log(((1+exp(coef.diss))/(density/(1-density)))-1)
 
 simtest <- function(S, edges, dur, n, dir=FALSE, bip=0){
-  m <- if(bip) bip else n
-  
   target.stats<-edges
   coef.diss<-logit(1-1/dur)
 
-  dc <- matrix(rnorm(n*m),n,m)
+  dc <- suppressWarnings(matrix(rnorm(n*n),if(bip) bip else n, if(bip) n-bip else n))
   if(!dir && !bip) dc <- dc+t(dc)
   # Note that if nw1!=nw2, then
   # summary(nw1~edgecov(dc)+edgecov.ages(dc))!=summary(nw2~edgecov(dc)+edgecov.ages(dc))

tests/testthat/test-term-EdgeAges.R

@@ -30,7 +30,7 @@ test_that("the EdgeAges term behaves consistently with some existing durational
       nw1 %n% "time" <- 0
 
       for(nw in list(nw0, nw1)) {
-        mat <- matrix(runif(net_size*net_size), net_size, net_size)
+        mat <- suppressWarnings(matrix(runif(net_size*net_size), if(bipartite) bipartite else net_size, net_size - bipartite))
         if(!directed && !bipartite) mat <- (mat + t(mat))/2
 
         set.seed(seed)
@@ -110,7 +110,7 @@ test_that("the EdgeAges term behaves appropriately for general submodels", {
       nw1 %n% "time" <- 0
 
       for(nw in list(nw0, nw1)) {
-        mat <- matrix(runif(net_size*net_size), net_size, net_size)
+        mat <- suppressWarnings(matrix(runif(net_size*net_size), if(bipartite) bipartite else net_size, net_size - bipartite))
         if(!directed && !bipartite) mat <- (mat + t(mat))/2
 
         set.seed(seed)