version 1.6

cran · Dec 14, 2015 · a420ca4 · a420ca4
1 parent 360bedd
commit a420ca4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,22 +1,19 @@
 Package: tnam
-Version: 1.5.3
-Date: 2015-09-20
+Version: 1.6
+Date: 2015-12-09
 Title: Temporal Network Autocorrelation Models (TNAM)
 Authors@R: c(person(given = "Philip", family = "Leifeld", email = "philip.leifeld@eawag.ch", role = c("aut", "cre")), person(given = c("Skyler", "J."), family = "Cranmer", email = "cranmer.12@osu.edu", role = "ctb"))
 Description: Temporal and cross-sectional network autocorrelation models (TNAM).
-Depends: R (>= 2.14.0), xergm.common (>= 1.5.4)
+Depends: R (>= 2.14.0), xergm.common (>= 1.6)
 Imports: methods, utils, stats, network, sna, igraph, vegan, lme4 (>=
         1.0), Rcpp (>= 0.11.0)
 Suggests: xergm, texreg, statnet
 License: GPL (>= 2)
 LinkingTo: Rcpp
+NeedsCompilation: yes
+Packaged: 2015-12-08 23:27:18 UTC; philip
 Author: Philip Leifeld [aut, cre],
   Skyler J. Cranmer [ctb]
 Maintainer: Philip Leifeld <philip.leifeld@eawag.ch>
 Repository: CRAN
-Repository/R-Forge/Project: xergm
-Repository/R-Forge/Revision: 148
-Repository/R-Forge/DateTimeStamp: 2015-09-20 18:04:28
-Date/Publication: 2015-09-23 02:33:33
-NeedsCompilation: yes
-Packaged: 2015-09-20 18:25:35 UTC; rforge
+Date/Publication: 2015-12-14 18:02:24
diff --git a/MD5 b/MD5
@@ -1,7 +1,7 @@
-f2e219fe49e5e91ae5370596a1cbeffe *DESCRIPTION
+a804f253cd88a701efa358656b167ff4 *DESCRIPTION
 ee6f94bce47ea5cb1fd5b0bad4beaf7b *NAMESPACE
 66b78884ca62067e9a960c5a4cc65e10 *R/RcppExports.R
-915e6acdf8fcfd9a1037040a710611d7 *R/checkDataTypes.R
+7a6b9839d4f26e82f8d55771e428e1fd *R/checkDataTypes.R
 d174225ba89f0ee9eaa2e4314d11c486 *R/tnam-terms.R
 bfc750ae7891de3295a2831f5e23bab6 *R/tnam.R
 728a2ab1bfe457105be882599f451521 *inst/CITATION

diff --git a/R/checkDataTypes.R b/R/checkDataTypes.R
@@ -132,7 +132,7 @@ checkDataTypes <- function(y, networks = NULL, lag = 0) {
     for (i in 1:length(y)) {
       # compare dimensions; mutually adjust if necessary
       if (length(y[[i]]) != nrow(networks[[i]])) {
-        if (is.null(rownames(networks))) {
+        if (is.null(rownames(networks[[i]]))) {
           stop(paste0("The dimensions of 'y' and 'networks' differ at t=", 
               i, ", and the network (matrix) does not contain row names."))
         } else if (is.null(names(y[[i]]))) {