From 02b253b188e009a3f7639f0f9dff8160054b472a Mon Sep 17 00:00:00 2001 From: Yiqing Xu Date: Sat, 25 Feb 2017 18:29:49 -0800 Subject: [PATCH] CRAN Version Updated --- .gitignore | 2 ++ DESCRIPTION | 34 +++++++++++++++------------------- NAMESPACE | 2 +- R/RcppExports.R | 0 R/interflex.R | 0 README.md | 2 +- man/.Rapp.history | 0 man/inter.binning.Rd | 0 man/inter.gam.Rd | 0 man/inter.kernel.Rd | 0 man/inter.raw.Rd | 0 man/interflex-package.Rd | 0 man/s1.Rd | 0 man/s2.Rd | 0 man/s3.Rd | 0 man/s4.Rd | 0 src/RcppExports.cpp | 0 src/fastplm.cpp | 12 ++++++------ src/interflex_init.c | 21 +++++++++++++++++++++ src/symbols.rds | Bin 5186 -> 0 bytes 20 files changed, 46 insertions(+), 27 deletions(-) mode change 100755 => 100644 DESCRIPTION mode change 100755 => 100644 NAMESPACE mode change 100755 => 100644 R/RcppExports.R mode change 100755 => 100644 R/interflex.R mode change 100755 => 100644 README.md delete mode 100644 man/.Rapp.history mode change 100755 => 100644 man/inter.binning.Rd mode change 100755 => 100644 man/inter.gam.Rd mode change 100755 => 100644 man/inter.kernel.Rd mode change 100755 => 100644 man/inter.raw.Rd mode change 100755 => 100644 man/interflex-package.Rd mode change 100755 => 100644 man/s1.Rd mode change 100755 => 100644 man/s2.Rd mode change 100755 => 100644 man/s3.Rd mode change 100755 => 100644 man/s4.Rd mode change 100755 => 100644 src/RcppExports.cpp mode change 100755 => 100644 src/fastplm.cpp create mode 100644 src/interflex_init.c delete mode 100755 src/symbols.rds diff --git a/.gitignore b/.gitignore index 77cc18b..b51d6b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ man/.Rhistory + +man/.Rapp.history diff --git a/DESCRIPTION b/DESCRIPTION old mode 100755 new mode 100644 index f9d8cd8..62a8165 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,19 +1,15 @@ -Package: interflex -Type: Package -Title: Multiplicative Interaction Models Diagnostics and Visualization -Version: 1.0.2 -Date: 2017-1-25 -Author: Jens Hainmueller, Jonathan Mummolo and Yiqing Xu -Maintainer: Yiqing Xu -Description: Performs diagnostic tests of multiplicative interaction models and plots non-linear marginal effects of a treatment on an outcome across different values of a moderator. -License: GPL-2 -Imports: Rcpp (>= 0.12.3), - ggplot2 (>= 2.1.0), - sandwich (>= 2.3-4), - pcse (>= 1.9), - lmtest (>= 0.9-34), - Lmoments (>= 1.2-3), - doParallel (>= 1.0.10), - foreach (>= 1.4.3), - mgcv(>= 1.8-16) -LinkingTo: Rcpp, RcppArmadillo +Package: interflex +Type: Package +Title: Multiplicative Interaction Models Diagnostics and Visualization +Version: 1.0.2 +Date: 2017-1-25 +Author: Jens Hainmueller, Jonathan Mummolo and Yiqing Xu +Maintainer: Yiqing Xu +Description: Performs diagnostic tests of multiplicative interaction models and plots non-linear marginal effects of a treatment on an outcome across different values of a moderator. +License: GPL-2 +Imports: Rcpp (>= 0.12.3), ggplot2 (>= 2.1.0), sandwich (>= 2.3-4), + pcse (>= 1.9), lmtest (>= 0.9-34), Lmoments (>= 1.2-3), + doParallel (>= 1.0.10), foreach (>= 1.4.3), mgcv(>= 1.8-16) +LinkingTo: Rcpp, RcppArmadillo +NeedsCompilation: yes +Packaged: 2017-02-25 16:02:46 UTC; lenovo diff --git a/NAMESPACE b/NAMESPACE old mode 100755 new mode 100644 index 62eab70..4dc146f --- a/NAMESPACE +++ b/NAMESPACE @@ -1,4 +1,4 @@ -useDynLib(interflex) +useDynLib(interflex, .registration=TRUE) importFrom(Rcpp, evalCpp) importFrom("grDevices", "col2rgb", "graphics.off", "pdf", "rgb") importFrom("parallel", "detectCores", "stopCluster", "makeCluster") diff --git a/R/RcppExports.R b/R/RcppExports.R old mode 100755 new mode 100644 diff --git a/R/interflex.R b/R/interflex.R old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 index 786c6bd..8d63515 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ **Maintainer:** Yiqing Xu [] -**How to Uses:** [Examples](http://yiqingxu.org/software/interplot/RGuide.html) +**How to Uses:** [Examples](http://yiqingxu.org/software/interaction/RGuide.html) **Reference:** "How Much Should We Trust Estimates from Multiplicative Interaction Models? Simple Tools to Improve Empirical Practice." Available at SSRN: https://papers.ssrn.com/sol3/papers.cfm?abstract_id=2739221 diff --git a/man/.Rapp.history b/man/.Rapp.history deleted file mode 100644 index e69de29..0000000 diff --git a/man/inter.binning.Rd b/man/inter.binning.Rd old mode 100755 new mode 100644 diff --git a/man/inter.gam.Rd b/man/inter.gam.Rd old mode 100755 new mode 100644 diff --git a/man/inter.kernel.Rd b/man/inter.kernel.Rd old mode 100755 new mode 100644 diff --git a/man/inter.raw.Rd b/man/inter.raw.Rd old mode 100755 new mode 100644 diff --git a/man/interflex-package.Rd b/man/interflex-package.Rd old mode 100755 new mode 100644 diff --git a/man/s1.Rd b/man/s1.Rd old mode 100755 new mode 100644 diff --git a/man/s2.Rd b/man/s2.Rd old mode 100755 new mode 100644 diff --git a/man/s3.Rd b/man/s3.Rd old mode 100755 new mode 100644 diff --git a/man/s4.Rd b/man/s4.Rd old mode 100755 new mode 100644 diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp old mode 100755 new mode 100644 diff --git a/src/fastplm.cpp b/src/fastplm.cpp old mode 100755 new mode 100644 index 87ed08e..debe74c --- a/src/fastplm.cpp +++ b/src/fastplm.cpp @@ -7,7 +7,7 @@ using namespace Rcpp; List fastplm(arma::mat data, arma::mat FE, arma::colvec weight, - int FEcoefs = 0 + int FEcoefs = 0L ){ // parse data @@ -33,9 +33,9 @@ List fastplm(arma::mat data, //arma::colvec se; // SE (full) arma::colvec coef; // coefficient //arma::colvec stderror; // SE - int df; // degrees of freedom - double sig2; // sigma2 - double mu; // grand mean + //int df; // degrees of freedom + //double sig2; // sigma2 + double mu = 0; // grand mean arma::colvec LHS; // group means arma::mat W; // big weighting matrix to calculate fixed effects arma::colvec alphas; // fixed effect coefficients @@ -146,8 +146,8 @@ List fastplm(arma::mat data, // std.err. - df = n - gtot - p; - sig2 = arma::as_scalar(resid.t()*resid/df); + // df = n - gtot - p; + //sig2 = arma::as_scalar(resid.t()*resid/df); // if (p>0) { // stderror = arma::sqrt(sig2 * arma::diagvec(arma::inv(arma::trans(X)*X))); // } diff --git a/src/interflex_init.c b/src/interflex_init.c new file mode 100644 index 0000000..3fc0628 --- /dev/null +++ b/src/interflex_init.c @@ -0,0 +1,21 @@ +// This file was automatically generated by 'Kmisc::registerFunctions()' + +#include +#include + +#include + +SEXP interflex_fastplm(SEXP dataSEXP, SEXP FESEXP, SEXP weightSEXP, SEXP FEcoefsSEXP); +SEXP interflex_fastplm_predict(SEXP muSEXP, SEXP FEvaluesSEXP, SEXP FESEXP, SEXP newxSEXP, SEXP betaSEXP); + +R_CallMethodDef callMethods[] = { + {"C_interflex_fastplm", (DL_FUNC) &interflex_fastplm, 4}, + {"C_interflex_fastplm_predict", (DL_FUNC) &interflex_fastplm_predict, 5}, + {NULL, NULL, 0} +}; + +void R_init_interflex(DllInfo *info) { + R_registerRoutines(info, NULL, callMethods, NULL, NULL); + R_useDynamicSymbols(info, FALSE); +} + diff --git a/src/symbols.rds b/src/symbols.rds deleted file mode 100755 index c382061203f18205eba69993456bf2ba8f639465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5186 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