Skip to content

Commit

Permalink
version 1.6.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Philip Leifeld authored and cran-robot committed Apr 1, 2017
1 parent c0736e2 commit ee796cd
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 76 deletions.
21 changes: 9 additions & 12 deletions DESCRIPTION 100755 → 100644
@@ -1,23 +1,20 @@
Package: tnam
Version: 1.6.2
Date: 2016-06-21
Version: 1.6.5
Date: 2017-03-31
Title: Temporal Network Autocorrelation Models (TNAM)
Authors@R: c(person(given = "Philip", family = "Leifeld", email = "philip.leifeld@glasgow.ac.uk", 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).
URL: https://r-forge.r-project.org/projects/xergm/
Depends: R (>= 2.14.0), xergm.common (>= 1.7.4)
Description: Temporal and cross-sectional network autocorrelation models. These are models for variation in attributes of nodes nested in a network (e.g., drinking behavior of adolescents nested in a school class, or democracy versus autocracy of countries nested in the network of international relations). These models can be estimated for cross-sectional data or panel data, with complex network dependencies as predictors, multiple networks and covariates, arbitrary outcome distributions, and random effects or time trends. Basic references: Doreian, Teuter and Wang (1984) <doi:10.1177/0049124184013002001>; Hays, Kachi and Franzese (2010) <doi:10.1016/j.stamet.2009.11.005>; Leenders, Roger Th. A. J. (2002) <doi:10.1016/S0378-8733(01)00049-1>.
URL: http://github.com/leifeld/tnam
Depends: R (>= 2.14.0), xergm.common (>= 1.7.7)
Imports: methods, utils, stats, network, sna, igraph, vegan, lme4 (>=
1.0), Rcpp (>= 0.11.0)
Suggests: xergm, texreg, statnet
Suggests: texreg
License: GPL (>= 2)
LinkingTo: Rcpp
NeedsCompilation: yes
Packaged: 2017-03-31 21:21:08 UTC; philip
Author: Philip Leifeld [aut, cre],
Skyler J. Cranmer [ctb]
Maintainer: Philip Leifeld <philip.leifeld@glasgow.ac.uk>
Repository: CRAN
Repository/R-Forge/Project: xergm
Repository/R-Forge/Revision: 195
Repository/R-Forge/DateTimeStamp: 2016-06-20 23:03:50
Date/Publication: 2016-06-21 08:32:48
NeedsCompilation: yes
Packaged: 2016-06-20 23:05:41 UTC; rforge
Date/Publication: 2017-04-01 06:30:55 UTC
12 changes: 6 additions & 6 deletions MD5
@@ -1,12 +1,12 @@
b34e6291c0f6494bbbbdc2e801a8b9f1 *DESCRIPTION
ee6f94bce47ea5cb1fd5b0bad4beaf7b *NAMESPACE
66b78884ca62067e9a960c5a4cc65e10 *R/RcppExports.R
e629b9fb4d3627b76ff6f484f0bba246 *DESCRIPTION
7960c5a09f57fc707ae57b9ff3e21453 *NAMESPACE
789083108a3da3c038e91475bfa0daab *R/RcppExports.R
56480650882c16b0fcfcea0c4d8f81f5 *R/checkDataTypes.R
d174225ba89f0ee9eaa2e4314d11c486 *R/tnam-terms.R
e4926471b89b9eebd0be5bffc0b50c8a *R/tnam.R
728a2ab1bfe457105be882599f451521 *inst/CITATION
a4dfd44e8a39203434955dbcba513c12 *inst/CITATION
534f377da466d8f662b4cd208d542ac7 *man/tnam-package.Rd
9a4a942b3a2f7b3b10331600a0e7dba2 *man/tnam-terms.Rd
96768fbebac8baed3cc13d7b5bf4aba3 *man/tnam.Rd
e5c8de4e12abf9d6216c2eadfbb7653f *src/RcppExports.cpp
0d926b73742afd800e53b55cdc4f43cb *src/tnam.cpp
2ced53214fc5e17f9d0c75dbc8ea564f *src/RcppExports.cpp
73b0fec3da8b6d3ab7f4520eb14410ae *src/tnam.cpp
70 changes: 35 additions & 35 deletions NAMESPACE 100755 → 100644
@@ -1,35 +1,35 @@
useDynLib(tnam)
import("methods")
import("utils")
import("network")
importFrom("stats", "dist", "gaussian", "glm", "na.omit")
import("xergm.common")
importFrom("sna", "gden")
importFrom("sna", "sedist")
importFrom("sna", "geodist")
importFrom("sna", "evcent")
importFrom("sna", "degree")
importFrom("sna", "betweenness")
importFrom("sna", "flowbet")
importFrom("sna", "closeness")
importFrom("sna", "infocent")
importFrom("sna", "loadcent")
importFrom("sna", "bonpow")
importFrom("sna", "clique.census")
importFrom("lme4", "lmer")
importFrom("lme4", "glmer")
importFrom("vegan", "vegdist")
importFrom("igraph", "graph.adjacency")
importFrom("igraph", "transitivity")
importFrom("Rcpp", evalCpp)
export("netlag")
export("weightlag")
export("interact")
export("covariate")
export("structsim")
export("centrality")
export("degreedummy")
export("clustering")
export("cliquelag")
export("tnamdata")
export("tnam")
useDynLib(tnam, .registration = TRUE)
import("methods")
import("utils")
import("network")
importFrom("stats", "dist", "gaussian", "glm", "na.omit")
import("xergm.common")
importFrom("sna", "gden")
importFrom("sna", "sedist")
importFrom("sna", "geodist")
importFrom("sna", "evcent")
importFrom("sna", "degree")
importFrom("sna", "betweenness")
importFrom("sna", "flowbet")
importFrom("sna", "closeness")
importFrom("sna", "infocent")
importFrom("sna", "loadcent")
importFrom("sna", "bonpow")
importFrom("sna", "clique.census")
importFrom("lme4", "lmer")
importFrom("lme4", "glmer")
importFrom("vegan", "vegdist")
importFrom("igraph", "graph.adjacency")
importFrom("igraph", "transitivity")
importFrom("Rcpp", evalCpp)
export("netlag")
export("weightlag")
export("interact")
export("covariate")
export("structsim")
export("centrality")
export("degreedummy")
export("clustering")
export("cliquelag")
export("tnamdata")
export("tnam")
2 changes: 1 addition & 1 deletion R/RcppExports.R
@@ -1,4 +1,4 @@
# This file was generated by Rcpp::compileAttributes
# Generated by using Rcpp::compileAttributes() -> do not edit by hand
# Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393

netLagCppLoop <- function(mat, pdistmat, pathdist, decay, y, normalization, reciprocal) {
Expand Down
10 changes: 4 additions & 6 deletions inst/CITATION
@@ -1,17 +1,15 @@
citHeader("To cite package 'xergm' in publications use:")
citHeader("To cite package 'tnam' in publications use:")

year <- sub(".*(2[[:digit:]]{3})-.*", "\\1", meta$Date)
vers <- paste("R package version", meta$Version)

citEntry(entry="Manual",
title = "xergm: Extensions for Exponential Random Graph Models",
title = "tnam: Temporal Network Autocorrelation Models",
author = personList(as.person("Philip Leifeld"),
as.person("Skyler J. Cranmer"),
as.person("Bruce A. Desmarais")),
year = year,
note = vers,
textVersion = paste("Leifeld, Philip, Skyler J. Cranmer and Bruce A. ",
"Desmarais (", year, "). xergm. Extensions for Exponential Random ",
" Graph Models. ", vers, ".", sep = ""),
url = "http://CRAN.R-project.org/package=xergm"
textVersion = paste("Leifeld, Philip and Skyler J. Cranmer (", year, "). tnam. Temporal Network Autocorrelation Models. ", vers, ".", sep = ""),
url = "https://cran.r-project.org/package=tnam"
)
28 changes: 12 additions & 16 deletions src/RcppExports.cpp
@@ -1,4 +1,4 @@
// This file was generated by Rcpp::compileAttributes
// Generated by using Rcpp::compileAttributes() -> do not edit by hand
// Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393

#include <Rcpp.h>
Expand All @@ -9,20 +9,16 @@ using namespace Rcpp;
NumericVector netLagCppLoop(IntegerMatrix mat, IntegerMatrix pdistmat, IntegerVector pathdist, NumericVector decay, NumericVector y, std::string normalization, bool reciprocal);
RcppExport SEXP tnam_netLagCppLoop(SEXP matSEXP, SEXP pdistmatSEXP, SEXP pathdistSEXP, SEXP decaySEXP, SEXP ySEXP, SEXP normalizationSEXP, SEXP reciprocalSEXP) {
BEGIN_RCPP
SEXP __sexp_result;
{
Rcpp::RNGScope __rngScope;
Rcpp::traits::input_parameter< IntegerMatrix >::type mat(matSEXP );
Rcpp::traits::input_parameter< IntegerMatrix >::type pdistmat(pdistmatSEXP );
Rcpp::traits::input_parameter< IntegerVector >::type pathdist(pathdistSEXP );
Rcpp::traits::input_parameter< NumericVector >::type decay(decaySEXP );
Rcpp::traits::input_parameter< NumericVector >::type y(ySEXP );
Rcpp::traits::input_parameter< std::string >::type normalization(normalizationSEXP );
Rcpp::traits::input_parameter< bool >::type reciprocal(reciprocalSEXP );
NumericVector __result = netLagCppLoop(mat, pdistmat, pathdist, decay, y, normalization, reciprocal);
PROTECT(__sexp_result = Rcpp::wrap(__result));
}
UNPROTECT(1);
return __sexp_result;
Rcpp::RObject rcpp_result_gen;
Rcpp::RNGScope rcpp_rngScope_gen;
Rcpp::traits::input_parameter< IntegerMatrix >::type mat(matSEXP);
Rcpp::traits::input_parameter< IntegerMatrix >::type pdistmat(pdistmatSEXP);
Rcpp::traits::input_parameter< IntegerVector >::type pathdist(pathdistSEXP);
Rcpp::traits::input_parameter< NumericVector >::type decay(decaySEXP);
Rcpp::traits::input_parameter< NumericVector >::type y(ySEXP);
Rcpp::traits::input_parameter< std::string >::type normalization(normalizationSEXP);
Rcpp::traits::input_parameter< bool >::type reciprocal(reciprocalSEXP);
rcpp_result_gen = Rcpp::wrap(netLagCppLoop(mat, pdistmat, pathdist, decay, y, normalization, reciprocal));
return rcpp_result_gen;
END_RCPP
}
5 changes: 5 additions & 0 deletions src/tnam.cpp
Expand Up @@ -72,3 +72,8 @@ NumericVector netLagCppLoop(IntegerMatrix mat, IntegerMatrix pdistmat,

return resultVector;
}

void R_init_tnam(DllInfo* info) {
R_registerRoutines(info, NULL, NULL, NULL, NULL);
R_useDynamicSymbols(info, TRUE);
}

0 comments on commit ee796cd

Please sign in to comment.