R: Rcpp vignettes

From noreply at r-forge.r-project.org Tue Sep 10 16:56:32 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 10 Sep 2013 16:56:32 +0200 (CEST) Subject: [Rcpp-commits] r4470 - in pkg/RcppGSL: . inst Message-ID: <20130910145632.630EB1848A0@r-forge.r-project.org> Author: edd Date: 2013-09-10 16:56:32 +0200 (Tue, 10 Sep 2013) New Revision: 4470 Modified: pkg/RcppGSL/ChangeLog pkg/RcppGSL/DESCRIPTION pkg/RcppGSL/inst/NEWS.Rd Log: Changed to 'Imports: Rcpp' rather than 'Depends: Rcpp' to make r-devel happy Modified: pkg/RcppGSL/ChangeLog =================================================================== --- pkg/RcppGSL/ChangeLog 2013-08-31 21:27:49 UTC (rev 4469) +++ pkg/RcppGSL/ChangeLog 2013-09-10 14:56:32 UTC (rev 4470) @@ -1,3 +1,8 @@ +2013-09-10 Dirk Eddelbuettel + + * DESCRIPTION (Imports): Now 'Imports: Rcpp' rather than Depends: to + satisfy R CMD check for the R version under development + 2013-08-24 Dirk Eddelbuettel * DESCRIPTION (Suggests): Added 'highlight' so that the package is Modified: pkg/RcppGSL/DESCRIPTION =================================================================== --- pkg/RcppGSL/DESCRIPTION 2013-08-31 21:27:49 UTC (rev 4469) +++ pkg/RcppGSL/DESCRIPTION 2013-09-10 14:56:32 UTC (rev 4470) @@ -1,7 +1,7 @@ Package: RcppGSL Type: Package Title: Rcpp integration for GNU GSL vectors and matrices -Version: 0.2.0.1 +Version: 0.2.0.2 Date: $Date$ Author: Romain Francois and Dirk Eddelbuettel Maintainer: Dirk Eddelbuettel @@ -27,7 +27,7 @@ write a similar package against another library. License: GPL (>= 2) LazyLoad: yes -Depends: Rcpp (>= 0.10.3) +Imports: Rcpp Suggests: RUnit, inline, highlight LinkingTo: Rcpp SystemRequirements: GNU GSL Modified: pkg/RcppGSL/inst/NEWS.Rd =================================================================== --- pkg/RcppGSL/inst/NEWS.Rd 2013-08-31 21:27:49 UTC (rev 4469) +++ pkg/RcppGSL/inst/NEWS.Rd 2013-09-10 14:56:32 UTC (rev 4470) @@ -15,6 +15,9 @@ also been added for command-line builds. \item Unit tests now use \code{sourceCpp()} instead of \code{cxxfunction()} from the \pkg{inline} package + \item The \code{DESCRIPTION} file now uses \code{Imports: Rcpp} + rather than \code{Depends: Rcpp} to satisfy \code{R CMD check} under + the R development version. } } From noreply at r-forge.r-project.org Wed Sep 11 14:39:36 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 11 Sep 2013 14:39:36 +0200 (CEST) Subject: [Rcpp-commits] r4471 - pkg/RcppGSL Message-ID: <20130911123936.6846C1850EF@r-forge.r-project.org> Author: edd Date: 2013-09-11 14:39:36 +0200 (Wed, 11 Sep 2013) New Revision: 4471 Modified: pkg/RcppGSL/DESCRIPTION Log: Restored versioned dependency in DESCRIPTION as Imports: can be versioned too Modified: pkg/RcppGSL/DESCRIPTION =================================================================== --- pkg/RcppGSL/DESCRIPTION 2013-09-10 14:56:32 UTC (rev 4470) +++ pkg/RcppGSL/DESCRIPTION 2013-09-11 12:39:36 UTC (rev 4471) @@ -27,7 +27,7 @@ write a similar package against another library. License: GPL (>= 2) LazyLoad: yes -Imports: Rcpp +Imports: Rcpp (>= 0.9.8) Suggests: RUnit, inline, highlight LinkingTo: Rcpp SystemRequirements: GNU GSL From noreply at r-forge.r-project.org Thu Sep 12 12:02:13 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 12:02:13 +0200 (CEST) Subject: [Rcpp-commits] r4472 - in pkg/Rcpp: . inst/include/Rcpp/platform Message-ID: <20130912100213.53CDE1813BB@r-forge.r-project.org> Author: romain Date: 2013-09-12 12:02:11 +0200 (Thu, 12 Sep 2013) New Revision: 4472 Modified: pkg/Rcpp/ChangeLog pkg/Rcpp/inst/include/Rcpp/platform/compiler.h Log: murray long long patch Modified: pkg/Rcpp/ChangeLog =================================================================== --- pkg/Rcpp/ChangeLog 2013-09-11 12:39:36 UTC (rev 4471) +++ pkg/Rcpp/ChangeLog 2013-09-12 10:02:11 UTC (rev 4472) @@ -1,3 +1,8 @@ +2013-09-12 Romain Francois + + * include/Rcpp/platform/compiler.h : patch submitted by Murray for better + support of long long type. + 2013-08-31 Dirk Eddelbuettel * inst/doc/*: Moved all vignettes to vignettes/* Modified: pkg/Rcpp/inst/include/Rcpp/platform/compiler.h =================================================================== --- pkg/Rcpp/inst/include/Rcpp/platform/compiler.h 2013-09-11 12:39:36 UTC (rev 4471) +++ pkg/Rcpp/inst/include/Rcpp/platform/compiler.h 2013-09-12 10:02:11 UTC (rev 4472) @@ -185,7 +185,7 @@ #endif #ifdef __GNUC__ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__LP64__) #ifdef __LONG_LONG_MAX__ __extension__ typedef long long int rcpp_long_long_type; __extension__ typedef unsigned long long int rcpp_ulong_long_type; From noreply at r-forge.r-project.org Thu Sep 12 15:26:43 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 15:26:43 +0200 (CEST) Subject: [Rcpp-commits] r4473 - in pkg/Rcpp: . inst/include/Rcpp/platform Message-ID: <20130912132643.3871B185D37@r-forge.r-project.org> Author: romain Date: 2013-09-12 15:26:42 +0200 (Thu, 12 Sep 2013) New Revision: 4473 Modified: pkg/Rcpp/ChangeLog pkg/Rcpp/inst/include/Rcpp/platform/compiler.h Log: gcc 4.2.1 has tr1 unordered maps and sets Modified: pkg/Rcpp/ChangeLog =================================================================== --- pkg/Rcpp/ChangeLog 2013-09-12 10:02:11 UTC (rev 4472) +++ pkg/Rcpp/ChangeLog 2013-09-12 13:26:42 UTC (rev 4473) @@ -2,6 +2,8 @@ * include/Rcpp/platform/compiler.h : patch submitted by Murray for better support of long long type. + * include/Rcpp/platform/compiler.h : gcc 4.2.1 has tr1/unordered_map + and tr1/unordered_set. Previous test was for gcc 4.4.0 for some reason 2013-08-31 Dirk Eddelbuettel Modified: pkg/Rcpp/inst/include/Rcpp/platform/compiler.h =================================================================== --- pkg/Rcpp/inst/include/Rcpp/platform/compiler.h 2013-09-12 10:02:11 UTC (rev 4472) +++ pkg/Rcpp/inst/include/Rcpp/platform/compiler.h 2013-09-12 13:26:42 UTC (rev 4473) @@ -116,7 +116,7 @@ // Check TR1 Headers #if defined(__INTEL_COMPILER) || (defined(__GNUC__) && !defined(__clang__)) #if defined(__GLIBCXX__) - #if GCC_VERSION >= 40400 + #if GCC_VERSION >= 40201 #define HAS_TR1_UNORDERED_MAP #define HAS_TR1_UNORDERED_SET #endif From noreply at r-forge.r-project.org Thu Sep 12 16:02:25 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 16:02:25 +0200 (CEST) Subject: [Rcpp-commits] r4474 - pkg/Rcpp/inst/include/Rcpp/platform Message-ID: <20130912140225.2BC8A185DBF@r-forge.r-project.org> Author: romain Date: 2013-09-12 16:02:24 +0200 (Thu, 12 Sep 2013) New Revision: 4474 Modified: pkg/Rcpp/inst/include/Rcpp/platform/compiler.h Log: more precise version that only fixes it for the mac Modified: pkg/Rcpp/inst/include/Rcpp/platform/compiler.h =================================================================== --- pkg/Rcpp/inst/include/Rcpp/platform/compiler.h 2013-09-12 13:26:42 UTC (rev 4473) +++ pkg/Rcpp/inst/include/Rcpp/platform/compiler.h 2013-09-12 14:02:24 UTC (rev 4474) @@ -116,7 +116,7 @@ // Check TR1 Headers #if defined(__INTEL_COMPILER) || (defined(__GNUC__) && !defined(__clang__)) #if defined(__GLIBCXX__) - #if GCC_VERSION >= 40201 + #if GCC_VERSION >= 40400 || ( GCC_VERSION >= 40201 && defined(__APPLE__) ) #define HAS_TR1_UNORDERED_MAP #define HAS_TR1_UNORDERED_SET #endif From noreply at r-forge.r-project.org Fri Sep 13 10:59:25 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 13 Sep 2013 10:59:25 +0200 (CEST) Subject: [Rcpp-commits] r4475 - in pkg/Rcpp: . src Message-ID: <20130913085925.A4BA7183B43@r-forge.r-project.org> Author: romain Date: 2013-09-13 10:59:25 +0200 (Fri, 13 Sep 2013) New Revision: 4475 Modified: pkg/Rcpp/ChangeLog pkg/Rcpp/src/api.cpp Log: capabilities now checks for the RCPP_HAS_LONG_LONG_TYPES macro Modified: pkg/Rcpp/ChangeLog =================================================================== --- pkg/Rcpp/ChangeLog 2013-09-12 14:02:24 UTC (rev 4474) +++ pkg/Rcpp/ChangeLog 2013-09-13 08:59:25 UTC (rev 4475) @@ -1,3 +1,7 @@ +2013-09-13 Romain Francois + + * src/api.cpp : added "long long" to the capabilities function. + 2013-09-12 Romain Francois * include/Rcpp/platform/compiler.h : patch submitted by Murray for better Modified: pkg/Rcpp/src/api.cpp =================================================================== --- pkg/Rcpp/src/api.cpp 2013-09-12 14:02:24 UTC (rev 4474) +++ pkg/Rcpp/src/api.cpp 2013-09-13 08:59:25 UTC (rev 4475) @@ -1329,8 +1329,8 @@ } SEXP rcpp_capabilities(){ - SEXP cap = PROTECT( Rf_allocVector( LGLSXP, 8) ) ; - SEXP names = PROTECT( Rf_allocVector( STRSXP, 8 ) ) ; + SEXP cap = PROTECT( Rf_allocVector( LGLSXP, 9) ) ; + SEXP names = PROTECT( Rf_allocVector( STRSXP, 9 ) ) ; #ifdef HAS_VARIADIC_TEMPLATES LOGICAL(cap)[0] = TRUE ; #else @@ -1365,6 +1365,12 @@ #endif LOGICAL(cap)[7] = FALSE ; + +#ifdef RCPP_HAS_LONG_LONG_TYPES + LOGICAL(cap)[8] = TRUE ; +#else + LOGICAL(cap)[8] = FALSE ; +#endif SET_STRING_ELT(names, 0, Rf_mkChar("variadic templates") ) ; SET_STRING_ELT(names, 1, Rf_mkChar("initializer lists") ) ; @@ -1374,6 +1380,7 @@ SET_STRING_ELT(names, 5, Rf_mkChar("Rcpp modules") ) ; SET_STRING_ELT(names, 6, Rf_mkChar("demangling") ) ; SET_STRING_ELT(names, 7, Rf_mkChar("classic api") ) ; + SET_STRING_ELT(names, 8, Rf_mkChar("long long") ) ; Rf_setAttrib( cap, R_NamesSymbol, names ) ; UNPROTECT(2) ; return cap ; From noreply at r-forge.r-project.org Fri Sep 13 11:11:05 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 13 Sep 2013 11:11:05 +0200 (CEST) Subject: [Rcpp-commits] r4476 - in pkg/Rcpp: . inst/include/Rcpp/platform Message-ID: <20130913091105.56F83185027@r-forge.r-project.org> Author: romain Date: 2013-09-13 11:11:04 +0200 (Fri, 13 Sep 2013) New Revision: 4476 Modified: pkg/Rcpp/ChangeLog pkg/Rcpp/inst/include/Rcpp/platform/compiler.h Log: reenable demangling on OSX >= 10.8, it was disabled on 10.8 for whatever reason Modified: pkg/Rcpp/ChangeLog =================================================================== --- pkg/Rcpp/ChangeLog 2013-09-13 08:59:25 UTC (rev 4475) +++ pkg/Rcpp/ChangeLog 2013-09-13 09:11:04 UTC (rev 4476) @@ -1,6 +1,8 @@ 2013-09-13 Romain Francois - * src/api.cpp : added "long long" to the capabilities function. + * src/api.cpp : added "long long" to the capabilities function. + * include/Rcpp/platform/compiler.h : demangling is definitely available + on all mac versions using gcc. No point is testing for OSX version. 2013-09-12 Romain Francois Modified: pkg/Rcpp/inst/include/Rcpp/platform/compiler.h =================================================================== --- pkg/Rcpp/inst/include/Rcpp/platform/compiler.h 2013-09-13 08:59:25 UTC (rev 4475) +++ pkg/Rcpp/inst/include/Rcpp/platform/compiler.h 2013-09-13 09:11:04 UTC (rev 4476) @@ -174,14 +174,7 @@ #endif #ifdef __GNUC__ - #ifdef __APPLE__ - #include - #ifndef __MAC_10_8 - #define RCPP_HAS_DEMANGLING - #endif - #else - #define RCPP_HAS_DEMANGLING - #endif + #define RCPP_HAS_DEMANGLING #endif #ifdef __GNUC__ From noreply at r-forge.r-project.org Fri Sep 13 17:22:51 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 13 Sep 2013 17:22:51 +0200 (CEST) Subject: [Rcpp-commits] r4477 - in pkg/Rcpp: . inst/include inst/include/Rcpp src Message-ID: <20130913152251.14E73185DBF@r-forge.r-project.org> Author: romain Date: 2013-09-13 17:22:50 +0200 (Fri, 13 Sep 2013) New Revision: 4477 Added: pkg/Rcpp/inst/include/Rcpp/InputParameter.h Modified: pkg/Rcpp/ChangeLog pkg/Rcpp/DESCRIPTION pkg/Rcpp/inst/include/RcppCommon.h pkg/Rcpp/src/attributes.cpp Log: added InputParameter for an extra layer of abstraction that we can use to define custom handling of references. For example this is used in RcppArmadillo Modified: pkg/Rcpp/ChangeLog =================================================================== --- pkg/Rcpp/ChangeLog 2013-09-13 09:11:04 UTC (rev 4476) +++ pkg/Rcpp/ChangeLog 2013-09-13 15:22:50 UTC (rev 4477) @@ -3,7 +3,11 @@ * src/api.cpp : added "long long" to the capabilities function. * include/Rcpp/platform/compiler.h : demangling is definitely available on all mac versions using gcc. No point is testing for OSX version. - + * include/Rcpp/InputParameter.h : extra layer of abstraction to allow for + custom handling of references etc ... used in RcppArmadillo + * src/attributes.cpp : using InputParameter + * DESCRIPTION: bump to 0.10.4.4 + 2013-09-12 Romain Francois * include/Rcpp/platform/compiler.h : patch submitted by Murray for better Modified: pkg/Rcpp/DESCRIPTION =================================================================== --- pkg/Rcpp/DESCRIPTION 2013-09-13 09:11:04 UTC (rev 4476) +++ pkg/Rcpp/DESCRIPTION 2013-09-13 15:22:50 UTC (rev 4477) @@ -1,6 +1,6 @@ Package: Rcpp Title: Seamless R and C++ Integration -Version: 0.10.4.3 +Version: 0.10.4.4 Date: $Date$ Author: Dirk Eddelbuettel and Romain Francois, with contributions by Douglas Bates, John Chambers and JJ Allaire Added: pkg/Rcpp/inst/include/Rcpp/InputParameter.h =================================================================== --- pkg/Rcpp/inst/include/Rcpp/InputParameter.h (rev 0) +++ pkg/Rcpp/inst/include/Rcpp/InputParameter.h 2013-09-13 15:22:50 UTC (rev 4477) @@ -0,0 +1,40 @@ +// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*- +// +// InputParameter.h: Rcpp R/C++ interface class library -- +// +// Copyright (C) 2013 Dirk Eddelbuettel and Romain Francois +// +// This file is part of Rcpp. +// +// Rcpp is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 2 of the License, or +// (at your option) any later version. +// +// Rcpp is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Rcpp. If not, see . + +#ifndef Rcpp__InputParameter__h +#define Rcpp__InputParameter__h + +namespace Rcpp { + + template + class InputParameter { + public: + InputParameter(SEXP x_) : x(x_){} + + inline operator T() { return as(x) ; } + + private: + SEXP x ; + } ; + +} + +#endif Modified: pkg/Rcpp/inst/include/RcppCommon.h =================================================================== --- pkg/Rcpp/inst/include/RcppCommon.h 2013-09-13 09:11:04 UTC (rev 4476) +++ pkg/Rcpp/inst/include/RcppCommon.h 2013-09-13 15:22:50 UTC (rev 4477) @@ -110,6 +110,7 @@ #include #include #include +#include #include #include Modified: pkg/Rcpp/src/attributes.cpp =================================================================== --- pkg/Rcpp/src/attributes.cpp 2013-09-13 09:11:04 UTC (rev 4476) +++ pkg/Rcpp/src/attributes.cpp 2013-09-13 15:22:50 UTC (rev 4477) @@ -2167,9 +2167,8 @@ for (size_t i = 0; i(" - << argument.name() << "SEXP);" << std::endl; + ostr << " Rcpp::InputParameter< " << argument.type().full_name() << "> " << argument.name() + << "(" << argument.name() << "SEXP );" << std::endl; } ostr << " "; From noreply at r-forge.r-project.org Fri Sep 13 17:26:28 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 13 Sep 2013 17:26:28 +0200 (CEST) Subject: [Rcpp-commits] r4478 - in pkg/RcppArmadillo: . inst/include Message-ID: <20130913152628.F3586185A12@r-forge.r-project.org> Author: romain Date: 2013-09-13 17:26:28 +0200 (Fri, 13 Sep 2013) New Revision: 4478 Modified: pkg/RcppArmadillo/ChangeLog pkg/RcppArmadillo/DESCRIPTION pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h Log: implementation of InputParameter for arma::Mat Modified: pkg/RcppArmadillo/ChangeLog =================================================================== --- pkg/RcppArmadillo/ChangeLog 2013-09-13 15:22:50 UTC (rev 4477) +++ pkg/RcppArmadillo/ChangeLog 2013-09-13 15:26:28 UTC (rev 4478) @@ -1,3 +1,10 @@ +2013-09-13 Romain Francois + + * DESCRIPTION : require Rcpp 0.10.4.4 + * include/RcppArmadilloForward.h : declaration of specializations of InputParameter + for references and const reference to arma::Mat + * include/RcppArmadilloAs.h : definitions of the above + 2013-08-24 Romain Francois * include/RcppArmadilloExtensions/sample.h: added include guard, made Modified: pkg/RcppArmadillo/DESCRIPTION =================================================================== --- pkg/RcppArmadillo/DESCRIPTION 2013-09-13 15:22:50 UTC (rev 4477) +++ pkg/RcppArmadillo/DESCRIPTION 2013-09-13 15:26:28 UTC (rev 4478) @@ -32,7 +32,7 @@ or later, as is the rest of Rcpp. License: GPL (>= 2) LazyLoad: yes -Depends: R (>= 2.14.0), Rcpp (>= 0.10.2) +Depends: R (>= 2.14.0), Rcpp (>= 0.10.4.4) LinkingTo: Rcpp Suggests: RUnit URL: http://arma.sourceforge.net/, http://dirk.eddelbuettel.com/code/rcpp.armadillo.html, http://romainfrancois.blog.free.fr/index.php?category/R-package/RcppArmadillo Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h =================================================================== --- pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h 2013-09-13 15:22:50 UTC (rev 4477) +++ pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h 2013-09-13 15:26:28 UTC (rev 4478) @@ -43,7 +43,21 @@ public: Exporter(SEXP x) : MatrixExporter< arma::Mat, T >(x){} }; + + template + class Exporter< const arma::Mat& > { + public: + typedef typename Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > MATRIX ; + Exporter(SEXP x) : mat(x) {} + + inline arma::Mat* get(){ + return new arma::Mat( mat.begin(), mat.nrow(), mat.ncol(), false ) ; + } + + private: + MATRIX mat ; + }; template class Exporter< arma::SpMat > { @@ -85,6 +99,49 @@ S4 mat ; } ; } + + template + class InputParameter< const arma::Mat& > { + public: + typedef const typename arma::Mat& const_reference ; + + InputParameter( SEXP x_ ) : mat(x_) { + ptr = new arma::Mat( mat.begin(), mat.nrow(), mat.ncol(), false ) ; + } + inline operator const_reference(){ + return const_cast( *ptr ) ; + } + + ~InputParameter(){ + delete ptr ; + } + + private: + Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > mat ; + arma::Mat* ptr ; + } ; + + template + class InputParameter< arma::Mat& > { + public: + typedef typename arma::Mat& reference ; + + InputParameter( SEXP x_ ) : mat(x_) { + ptr = new arma::Mat( mat.begin(), mat.nrow(), mat.ncol(), false ) ; + } + inline operator reference(){ + return *ptr ; + } + + ~InputParameter(){ + delete ptr ; + } + + private: + Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > mat ; + arma::Mat* ptr ; + } ; + } #endif Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h =================================================================== --- pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h 2013-09-13 15:22:50 UTC (rev 4477) +++ pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h 2013-09-13 15:26:28 UTC (rev 4478) @@ -90,11 +90,18 @@ template class Exporter< arma::Row > ; template class Exporter< arma::Col > ; template class Exporter< arma::SpMat > ; - // template class Exporter< arma::field > ; + + // template class Exporter< arma::field > ; // template class Exporter< arma::Cube > ; } // namespace traits + template + class InputParameter< const arma::Mat& > ; + + template + class InputParameter< arma::Mat& > ; + } #endif From noreply at r-forge.r-project.org Fri Sep 13 17:57:55 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 13 Sep 2013 17:57:55 +0200 (CEST) Subject: [Rcpp-commits] r4479 - pkg/RcppArmadillo/inst/include Message-ID: <20130913155755.A84C2185D16@r-forge.r-project.org> Author: romain Date: 2013-09-13 17:57:55 +0200 (Fri, 13 Sep 2013) New Revision: 4479 Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h Log: version that does not use pointers Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h =================================================================== --- pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h 2013-09-13 15:26:28 UTC (rev 4478) +++ pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h 2013-09-13 15:57:55 UTC (rev 4479) @@ -105,20 +105,15 @@ public: typedef const typename arma::Mat& const_reference ; - InputParameter( SEXP x_ ) : mat(x_) { - ptr = new arma::Mat( mat.begin(), mat.nrow(), mat.ncol(), false ) ; - } + InputParameter( SEXP x_ ) : m(x_), mat( m.begin(), m.nrow(), m.ncol(), false ){} + inline operator const_reference(){ - return const_cast( *ptr ) ; + return mat ; } - ~InputParameter(){ - delete ptr ; - } - private: - Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > mat ; - arma::Mat* ptr ; + Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > m ; + arma::Mat mat ; } ; template @@ -126,20 +121,15 @@ public: typedef typename arma::Mat& reference ; - InputParameter( SEXP x_ ) : mat(x_) { - ptr = new arma::Mat( mat.begin(), mat.nrow(), mat.ncol(), false ) ; - } + InputParameter( SEXP x_ ) : m(x_), mat( m.begin(), m.nrow(), m.ncol(), false ){} + inline operator reference(){ - return *ptr ; + return mat ; } - ~InputParameter(){ - delete ptr ; - } - private: - Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > mat ; - arma::Mat* ptr ; + Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > m ; + arma::Mat mat ; } ; } From noreply at r-forge.r-project.org Fri Sep 13 18:35:06 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 13 Sep 2013 18:35:06 +0200 (CEST) Subject: [Rcpp-commits] r4480 - pkg/RcppArmadillo/inst/include Message-ID: <20130913163506.13577185D9C@r-forge.r-project.org> Author: romain Date: 2013-09-13 18:35:05 +0200 (Fri, 13 Sep 2013) New Revision: 4480 Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h Log: reference passinhg for Row and Col Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h =================================================================== --- pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h 2013-09-13 15:57:55 UTC (rev 4479) +++ pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h 2013-09-13 16:35:05 UTC (rev 4480) @@ -132,6 +132,32 @@ arma::Mat mat ; } ; + template + class ArmaVec_InputParameter { + public: + ArmaVec_InputParameter( SEXP x_ ) : v(x_), vec( v.begin(), v.size(), false ){} + + inline operator REF(){ + return vec ; + } + + private: + Rcpp::Vector< Rcpp::traits::r_sexptype_traits::rtype > v ; + VEC vec ; + } ; + + #define MAKE_INPUT_PARAMETER(TYPE,REF) \ + template \ + class InputParameter : public ArmaVec_InputParameter{ \ + public: \ + InputParameter( SEXP x) : ArmaVec_InputParameter(x){} \ + } ; + + MAKE_INPUT_PARAMETER(arma::Col, const arma::Col& ) + MAKE_INPUT_PARAMETER(arma::Col, arma::Col& ) + MAKE_INPUT_PARAMETER(arma::Row, const arma::Row& ) + MAKE_INPUT_PARAMETER(arma::Row, arma::Row& ) + #undef MAKE_INPUT_PARAMETER } #endif Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h =================================================================== --- pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h 2013-09-13 15:57:55 UTC (rev 4479) +++ pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h 2013-09-13 16:35:05 UTC (rev 4480) @@ -96,12 +96,15 @@ } // namespace traits - template - class InputParameter< const arma::Mat& > ; + template class InputParameter< const arma::Mat& > ; + template class InputParameter< arma::Mat& > ; - template - class InputParameter< arma::Mat& > ; + template class InputParameter< const arma::Col& > ; + template class InputParameter< arma::Col& > ; + template class InputParameter< const arma::Row& > ; + template class InputParameter< arma::Row& > ; + } #endif From noreply at r-forge.r-project.org Sat Sep 14 13:57:22 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sat, 14 Sep 2013 13:57:22 +0200 (CEST) Subject: [Rcpp-commits] r4481 - in pkg/Rcpp: . inst/include/Rcpp/traits Message-ID: <20130914115722.AC910184D0D@r-forge.r-project.org> Author: edd Date: 2013-09-14 13:57:22 +0200 (Sat, 14 Sep 2013) New Revision: 4481 Modified: pkg/Rcpp/ChangeLog pkg/Rcpp/inst/include/Rcpp/traits/r_sexptype_traits.h pkg/Rcpp/inst/include/Rcpp/traits/r_type_traits.h Log: trivial fill-in-the-gap for const double emacs whitespace adjustment for changelog Modified: pkg/Rcpp/ChangeLog =================================================================== --- pkg/Rcpp/ChangeLog 2013-09-13 16:35:05 UTC (rev 4480) +++ pkg/Rcpp/ChangeLog 2013-09-14 11:57:22 UTC (rev 4481) @@ -1,26 +1,28 @@ -2013-09-13 Romain Francois +2013-09-13 Romain Francois - * src/api.cpp : added "long long" to the capabilities function. - * include/Rcpp/platform/compiler.h : demangling is definitely available - on all mac versions using gcc. No point is testing for OSX version. - * include/Rcpp/InputParameter.h : extra layer of abstraction to allow for - custom handling of references etc ... used in RcppArmadillo + * src/api.cpp : added "long long" to the capabilities function. + * include/Rcpp/platform/compiler.h : demangling is definitely + available on all mac versions using gcc. No point is testing for OSX + version. + * include/Rcpp/InputParameter.h : extra layer of abstraction to allow + for custom handling of references etc ... used in RcppArmadillo * src/attributes.cpp : using InputParameter * DESCRIPTION: bump to 0.10.4.4 - -2013-09-12 Romain Francois - * include/Rcpp/platform/compiler.h : patch submitted by Murray for better - support of long long type. - * include/Rcpp/platform/compiler.h : gcc 4.2.1 has tr1/unordered_map - and tr1/unordered_set. Previous test was for gcc 4.4.0 for some reason +2013-09-12 Romain Francois + * include/Rcpp/platform/compiler.h : patch submitted by Murray for + better support of long long type. + * include/Rcpp/platform/compiler.h : gcc 4.2.1 has tr1/unordered_map + and tr1/unordered_set. Previous test was for gcc 4.4.0 for some + reason + 2013-08-31 Dirk Eddelbuettel * inst/doc/*: Moved all vignettes to vignettes/* * vignettes/*: Minor updates to some vignettes -2013-08-22 Romain Francois +2013-08-22 Romain Francois * include/Rcpp/traits/is_primitive.h : new trait to identify if a type is primitive, this is a shortcut of using r_type_traits and @@ -42,7 +44,7 @@ where T is not a primitive * include/Rcpp/api/meat/export.h : implementation in meat because it needs as -2013-08-01 Romain Francois +2013-08-01 Romain Francois * unitTests/cpp/wstring.cpp: fix to re-enable wstring test suite. * unitTests/runit.wstring.R: re-enable the wstring test suite. Modified: pkg/Rcpp/inst/include/Rcpp/traits/r_sexptype_traits.h =================================================================== --- pkg/Rcpp/inst/include/Rcpp/traits/r_sexptype_traits.h 2013-09-13 16:35:05 UTC (rev 4480) +++ pkg/Rcpp/inst/include/Rcpp/traits/r_sexptype_traits.h 2013-09-14 11:57:22 UTC (rev 4481) @@ -34,6 +34,7 @@ template<> struct r_sexptype_traits{ enum{ rtype = INTSXP } ; } ; template<> struct r_sexptype_traits{ enum{ rtype = INTSXP } ; } ; template<> struct r_sexptype_traits{ enum{ rtype = REALSXP } ; } ; +template<> struct r_sexptype_traits{ enum{ rtype = REALSXP } ; } ; template<> struct r_sexptype_traits{ enum{ rtype = LGLSXP } ; } ; template<> struct r_sexptype_traits{ enum{ rtype = STRSXP } ; } ; template<> struct r_sexptype_traits{ enum{ rtype = CPLXSXP } ; } ; Modified: pkg/Rcpp/inst/include/Rcpp/traits/r_type_traits.h =================================================================== --- pkg/Rcpp/inst/include/Rcpp/traits/r_type_traits.h 2013-09-13 16:35:05 UTC (rev 4480) +++ pkg/Rcpp/inst/include/Rcpp/traits/r_type_traits.h 2013-09-14 11:57:22 UTC (rev 4481) @@ -136,6 +136,7 @@ template<> struct r_type_traits{ typedef r_type_primitive_tag r_category ; } ; template<> struct r_type_traits{ typedef r_type_primitive_tag r_category ; } ; template<> struct r_type_traits{ typedef r_type_primitive_tag r_category ; } ; +template<> struct r_type_traits{ typedef r_type_primitive_tag r_category ; } ; template<> struct r_type_traits{ typedef r_type_primitive_tag r_category ; } ; template<> struct r_type_traits{ typedef r_type_primitive_tag r_category ; } ; template<> struct r_type_traits{ typedef r_type_primitive_tag r_category ; } ; From noreply at r-forge.r-project.org Sat Sep 14 14:00:58 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sat, 14 Sep 2013 14:00:58 +0200 (CEST) Subject: [Rcpp-commits] r4482 - pkg/RcppArmadillo Message-ID: <20130914120058.2370C184D0D@r-forge.r-project.org> Author: edd Date: 2013-09-14 14:00:57 +0200 (Sat, 14 Sep 2013) New Revision: 4482 Modified: pkg/RcppArmadillo/ChangeLog Log: emacs whitespace adjustment for changelog Modified: pkg/RcppArmadillo/ChangeLog =================================================================== --- pkg/RcppArmadillo/ChangeLog 2013-09-14 11:57:22 UTC (rev 4481) +++ pkg/RcppArmadillo/ChangeLog 2013-09-14 12:00:57 UTC (rev 4482) @@ -1,27 +1,27 @@ -2013-09-13 Romain Francois +2013-09-13 Romain Francois * DESCRIPTION : require Rcpp 0.10.4.4 - * include/RcppArmadilloForward.h : declaration of specializations of InputParameter - for references and const reference to arma::Mat - * include/RcppArmadilloAs.h : definitions of the above - -2013-08-24 Romain Francois + * include/RcppArmadilloForward.h : declaration of specializations of + InputParameter for references and const reference to arma::Mat + * include/RcppArmadilloAs.h : definitions of the above - * include/RcppArmadilloExtensions/sample.h: added include guard, made - functions SampleReplace, etc ... templates to avoid the multiple definitions - problem +2013-08-24 Romain Francois -2013-08-21 Romain Francois + * include/RcppArmadilloExtensions/sample.h: added include guard, made + functions SampleReplace, etc ... templates to avoid the multiple + definitions problem +2013-08-21 Romain Francois + * include/RcppArmadilloWrap.h: Less data copies for wrap< SpMat > * include/RcppArmadilloAs.h: Less data copies for as< SpMat > -2013-08-20 Romain Francois +2013-08-20 Romain Francois * include/RcppArmadilloWrap.h: Handle wrap * include/RcppArmadilloWrap.h: cleaner implementation for wrap< SpMat > * include/RcppArmadilloAs.h: cleaner implementation for as< SpMat > - + 2013-08-17 Dirk Eddelbuettel * vignettes/RcppArmadillo-intro.Rnw: Converted from LaTeX minted From noreply at r-forge.r-project.org Sat Sep 14 14:06:17 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sat, 14 Sep 2013 14:06:17 +0200 (CEST) Subject: [Rcpp-commits] r4483 - pkg/RcppArmadillo/inst/include Message-ID: <20130914120617.A0893184D0D@r-forge.r-project.org> Author: edd Date: 2013-09-14 14:06:17 +0200 (Sat, 14 Sep 2013) New Revision: 4483 Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h Log: emacs untabify and reindent Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h =================================================================== --- pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h 2013-09-14 12:00:57 UTC (rev 4482) +++ pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h 2013-09-14 12:06:17 UTC (rev 4483) @@ -26,138 +26,138 @@ namespace Rcpp{ namespace traits { - template - class Exporter< arma::Col > : public IndexingExporter< arma::Col, T > { - public: - Exporter(SEXP x) : IndexingExporter< arma::Col, T >(x){} - }; + template + class Exporter< arma::Col > : public IndexingExporter< arma::Col, T > { + public: + Exporter(SEXP x) : IndexingExporter< arma::Col, T >(x){} + }; - template - class Exporter< arma::Row > : public IndexingExporter< arma::Row, T > { - public: - Exporter(SEXP x) : IndexingExporter< arma::Row, T >(x){} - }; + template + class Exporter< arma::Row > : public IndexingExporter< arma::Row, T > { + public: + Exporter(SEXP x) : IndexingExporter< arma::Row, T >(x){} + }; - template - class Exporter< arma::Mat > : public MatrixExporter< arma::Mat, T > { - public: - Exporter(SEXP x) : MatrixExporter< arma::Mat, T >(x){} - }; - - template - class Exporter< const arma::Mat& > { - public: - typedef typename Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > MATRIX ; - - Exporter(SEXP x) : mat(x) {} - - inline arma::Mat* get(){ - return new arma::Mat( mat.begin(), mat.nrow(), mat.ncol(), false ) ; - } - - private: - MATRIX mat ; - }; - - template - class Exporter< arma::SpMat > { - public: - Exporter( SEXP x ) : mat(x){} - - arma::SpMat get(){ - const int RTYPE = Rcpp::traits::r_sexptype_traits::rtype; + template + class Exporter< arma::Mat > : public MatrixExporter< arma::Mat, T > { + public: + Exporter(SEXP x) : MatrixExporter< arma::Mat, T >(x){} + }; + + template + class Exporter< const arma::Mat& > { + public: + typedef typename Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > MATRIX ; + + Exporter(SEXP x) : mat(x) {} + + inline arma::Mat* get(){ + return new arma::Mat( mat.begin(), mat.nrow(), mat.ncol(), false ) ; + } + + private: + MATRIX mat ; + }; + + template + class Exporter< arma::SpMat > { + public: + Exporter( SEXP x ) : mat(x){} + + arma::SpMat get(){ + const int RTYPE = Rcpp::traits::r_sexptype_traits::rtype; - IntegerVector dims = mat.slot("Dim"); - IntegerVector i = mat.slot("i") ; - IntegerVector p = mat.slot("p") ; - Vector x = mat.slot("x") ; - - arma::SpMat res(dims[0], dims[1]); - - // create space for values, and copy - arma::access::rw(res.values) = arma::memory::acquire_chunked(x.size() + 1); - arma::arrayops::copy(arma::access::rwp(res.values), x.begin(), x.size() + 1); - - // create space for row_indices, and copy - arma::access::rw(res.row_indices) = arma::memory::acquire_chunked(i.size() + 1); - std::copy( i.begin(), i.end(), arma::access::rwp(res.row_indices) ) ; - - // create space for col_ptrs, and copy - arma::access::rw(res.col_ptrs) = arma::memory::acquire(p.size() + 2); - std::copy(p.begin(), p.end(), arma::access::rwp(res.col_ptrs) ); - - // important: set the sentinel as well - arma::access::rwp(res.col_ptrs)[p.size()+1] = std::numeric_limits::max(); - - // set the number of non-zero elements - arma::access::rw(res.n_nonzero) = x.size(); - - return res; - } - - private: - S4 mat ; - } ; -} - - template + IntegerVector dims = mat.slot("Dim"); + IntegerVector i = mat.slot("i") ; + IntegerVector p = mat.slot("p") ; + Vector x = mat.slot("x") ; + + arma::SpMat res(dims[0], dims[1]); + + // create space for values, and copy + arma::access::rw(res.values) = arma::memory::acquire_chunked(x.size() + 1); + arma::arrayops::copy(arma::access::rwp(res.values), x.begin(), x.size() + 1); + + // create space for row_indices, and copy + arma::access::rw(res.row_indices) = arma::memory::acquire_chunked(i.size() + 1); + std::copy( i.begin(), i.end(), arma::access::rwp(res.row_indices) ) ; + + // create space for col_ptrs, and copy + arma::access::rw(res.col_ptrs) = arma::memory::acquire(p.size() + 2); + std::copy(p.begin(), p.end(), arma::access::rwp(res.col_ptrs) ); + + // important: set the sentinel as well + arma::access::rwp(res.col_ptrs)[p.size()+1] = std::numeric_limits::max(); + + // set the number of non-zero elements + arma::access::rw(res.n_nonzero) = x.size(); + + return res; + } + + private: + S4 mat ; + } ; +} + + template class InputParameter< const arma::Mat& > { - public: - typedef const typename arma::Mat& const_reference ; - - InputParameter( SEXP x_ ) : m(x_), mat( m.begin(), m.nrow(), m.ncol(), false ){} - - inline operator const_reference(){ - return mat ; - } - - private: - Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > m ; - arma::Mat mat ; + public: + typedef const typename arma::Mat& const_reference ; + + InputParameter( SEXP x_ ) : m(x_), mat( m.begin(), m.nrow(), m.ncol(), false ){} + + inline operator const_reference(){ + return mat ; + } + + private: + Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > m ; + arma::Mat mat ; } ; template class InputParameter< arma::Mat& > { - public: - typedef typename arma::Mat& reference ; - - InputParameter( SEXP x_ ) : m(x_), mat( m.begin(), m.nrow(), m.ncol(), false ){} - - inline operator reference(){ - return mat ; - } - - private: - Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > m ; - arma::Mat mat ; + public: + typedef typename arma::Mat& reference ; + + InputParameter( SEXP x_ ) : m(x_), mat( m.begin(), m.nrow(), m.ncol(), false ){} + + inline operator reference(){ + return mat ; + } + + private: + Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > m ; + arma::Mat mat ; } ; template class ArmaVec_InputParameter { - public: - ArmaVec_InputParameter( SEXP x_ ) : v(x_), vec( v.begin(), v.size(), false ){} - - inline operator REF(){ - return vec ; - } - - private: - Rcpp::Vector< Rcpp::traits::r_sexptype_traits::rtype > v ; - VEC vec ; + public: + ArmaVec_InputParameter( SEXP x_ ) : v(x_), vec( v.begin(), v.size(), false ){} + + inline operator REF(){ + return vec ; + } + + private: + Rcpp::Vector< Rcpp::traits::r_sexptype_traits::rtype > v ; + VEC vec ; } ; - #define MAKE_INPUT_PARAMETER(TYPE,REF) \ - template \ - class InputParameter : public ArmaVec_InputParameter{ \ - public: \ - InputParameter( SEXP x) : ArmaVec_InputParameter(x){} \ - } ; +#define MAKE_INPUT_PARAMETER(TYPE,REF) \ + template \ + class InputParameter : public ArmaVec_InputParameter{ \ + public: \ + InputParameter( SEXP x) : ArmaVec_InputParameter(x){} \ + } ; - MAKE_INPUT_PARAMETER(arma::Col, const arma::Col& ) - MAKE_INPUT_PARAMETER(arma::Col, arma::Col& ) - MAKE_INPUT_PARAMETER(arma::Row, const arma::Row& ) - MAKE_INPUT_PARAMETER(arma::Row, arma::Row& ) - #undef MAKE_INPUT_PARAMETER + MAKE_INPUT_PARAMETER(arma::Col, const arma::Col& ) + MAKE_INPUT_PARAMETER(arma::Col, arma::Col& ) + MAKE_INPUT_PARAMETER(arma::Row, const arma::Row& ) + MAKE_INPUT_PARAMETER(arma::Row, arma::Row& ) +#undef MAKE_INPUT_PARAMETER } #endif From noreply at r-forge.r-project.org Sat Sep 14 14:27:14 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sat, 14 Sep 2013 14:27:14 +0200 (CEST) Subject: [Rcpp-commits] r4484 - in pkg/Rcpp: . src Message-ID: <20130914122714.56BFC185D31@r-forge.r-project.org> Author: edd Date: 2013-09-14 14:27:14 +0200 (Sat, 14 Sep 2013) New Revision: 4484 Modified: pkg/Rcpp/ChangeLog pkg/Rcpp/src/attributes.cpp Log: need an extra space before closing '>' to avoid getting '>>' on (templated) arguments already ending in '>' Modified: pkg/Rcpp/ChangeLog =================================================================== --- pkg/Rcpp/ChangeLog 2013-09-14 12:06:17 UTC (rev 4483) +++ pkg/Rcpp/ChangeLog 2013-09-14 12:27:14 UTC (rev 4484) @@ -1,3 +1,7 @@ +2013-09-14 Dirk Eddelbuettel + + * src/attributes.cpp (Rcpp): Precede closing '>' by space to avoid '>>' + 2013-09-13 Romain Francois * src/api.cpp : added "long long" to the capabilities function. Modified: pkg/Rcpp/src/attributes.cpp =================================================================== --- pkg/Rcpp/src/attributes.cpp 2013-09-14 12:06:17 UTC (rev 4483) +++ pkg/Rcpp/src/attributes.cpp 2013-09-14 12:27:14 UTC (rev 4484) @@ -2167,7 +2167,8 @@ for (size_t i = 0; i " << argument.name() + ostr << " Rcpp::InputParameter< " + << argument.type().full_name() << " > " << argument.name() << "(" << argument.name() << "SEXP );" << std::endl; } From noreply at r-forge.r-project.org Sat Sep 14 22:24:07 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sat, 14 Sep 2013 22:24:07 +0200 (CEST) Subject: [Rcpp-commits] r4485 - in pkg/Rcpp: . inst/include/Rcpp/platform Message-ID: <20130914202407.277E2181299@r-forge.r-project.org> Author: edd Date: 2013-09-14 22:24:06 +0200 (Sat, 14 Sep 2013) New Revision: 4485 Modified: pkg/Rcpp/ChangeLog pkg/Rcpp/inst/include/Rcpp/platform/compiler.h Log: Further refine #if test for 'long long' by conditioning __LP64__ on also using clang/llvm Modified: pkg/Rcpp/ChangeLog =================================================================== --- pkg/Rcpp/ChangeLog 2013-09-14 12:27:14 UTC (rev 4484) +++ pkg/Rcpp/ChangeLog 2013-09-14 20:24:06 UTC (rev 4485) @@ -1,5 +1,8 @@ 2013-09-14 Dirk Eddelbuettel + * inst/include/Rcpp/platform/compiler.h: Further refine #if test for + 'long long' by conditioning __LP64__ on also using clang/llvm + * src/attributes.cpp (Rcpp): Precede closing '>' by space to avoid '>>' 2013-09-13 Romain Francois Modified: pkg/Rcpp/inst/include/Rcpp/platform/compiler.h =================================================================== --- pkg/Rcpp/inst/include/Rcpp/platform/compiler.h 2013-09-14 12:27:14 UTC (rev 4484) +++ pkg/Rcpp/inst/include/Rcpp/platform/compiler.h 2013-09-14 20:24:06 UTC (rev 4485) @@ -178,7 +178,7 @@ #endif #ifdef __GNUC__ -#if defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__LP64__) +#if defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined (__clang__) && defined(__LP64__)) #ifdef __LONG_LONG_MAX__ __extension__ typedef long long int rcpp_long_long_type; __extension__ typedef unsigned long long int rcpp_ulong_long_type; From noreply at r-forge.r-project.org Sun Sep 15 14:59:41 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 15 Sep 2013 14:59:41 +0200 (CEST) Subject: [Rcpp-commits] r4486 - in pkg/Rcpp: . inst/include/Rcpp inst/include/Rcpp/macros src Message-ID: <20130915125941.BA8AC185065@r-forge.r-project.org> Author: romain Date: 2013-09-15 14:59:41 +0200 (Sun, 15 Sep 2013) New Revision: 4486 Modified: pkg/Rcpp/ChangeLog pkg/Rcpp/inst/include/Rcpp/InputParameter.h pkg/Rcpp/inst/include/Rcpp/macros/module.h pkg/Rcpp/src/attributes.cpp Log: introduce traits::input_parameter so that we can have std::vector& again Modified: pkg/Rcpp/ChangeLog =================================================================== --- pkg/Rcpp/ChangeLog 2013-09-14 20:24:06 UTC (rev 4485) +++ pkg/Rcpp/ChangeLog 2013-09-15 12:59:41 UTC (rev 4486) @@ -1,9 +1,19 @@ +2013-09-15 Romain Francois + + * include/Rcpp/InputParameter.h : added the traits::input_parameter trait + to add another layer of abstration. + * include/Rcpp/macros/module.h : taking advantage of input_parameter to + specialize how to work with module objects + * src/attributes.cpp : using traits::input_parameter instead of + InputParameter + 2013-09-14 Dirk Eddelbuettel + * src/attributes.cpp : Precede closing '>' by space to avoid '>>' * inst/include/Rcpp/platform/compiler.h: Further refine #if test for 'long long' by conditioning __LP64__ on also using clang/llvm - * src/attributes.cpp (Rcpp): Precede closing '>' by space to avoid '>>' + * src/attributes.cpp : Precede closing '>' by space to avoid '>>' 2013-09-13 Romain Francois Modified: pkg/Rcpp/inst/include/Rcpp/InputParameter.h =================================================================== --- pkg/Rcpp/inst/include/Rcpp/InputParameter.h 2013-09-14 20:24:06 UTC (rev 4485) +++ pkg/Rcpp/inst/include/Rcpp/InputParameter.h 2013-09-15 12:59:41 UTC (rev 4486) @@ -22,8 +22,10 @@ #ifndef Rcpp__InputParameter__h #define Rcpp__InputParameter__h -namespace Rcpp { +namespace Rcpp { + // default implementation used for pass by value and modules objects + // as<> is called on the conversion operator template class InputParameter { public: @@ -35,6 +37,48 @@ SEXP x ; } ; + // impl for references. It holds an object at the constructor and then + // returns a reference in the reference operator + template + class ReferenceInputParameter { + public: + typedef T& reference ; + ReferenceInputParameter(SEXP x_) : obj( as(x_) ){} + + inline operator reference() { return obj ; } + + private: + T obj ; + } ; + + // same for const references + template + class ConstReferenceInputParameter { + public: + typedef const T& const_reference ; + ConstReferenceInputParameter(SEXP x_) : obj( as(x_) ){} + + inline operator const_reference() { return obj ; } + + private: + T obj ; + } ; + + namespace traits{ + template + struct input_parameter { + typedef typename Rcpp::InputParameter type ; + } ; + template + struct input_parameter { + typedef typename Rcpp::ReferenceInputParameter type ; + } ; + template + struct input_parameter { + typedef typename Rcpp::ConstReferenceInputParameter type ; + } ; + } + } #endif Modified: pkg/Rcpp/inst/include/Rcpp/macros/module.h =================================================================== --- pkg/Rcpp/inst/include/Rcpp/macros/module.h 2013-09-14 20:24:06 UTC (rev 4485) +++ pkg/Rcpp/inst/include/Rcpp/macros/module.h 2013-09-15 12:59:41 UTC (rev 4486) @@ -44,6 +44,21 @@ template<> struct r_type_traits< const CLASS& >{ \ typedef r_type_module_object_const_reference_tag r_category ; \ } ; \ + template<> struct input_parameter< CLASS* >{ \ + typedef Rcpp::InputParameter type ; \ + } ; \ + template<> struct input_parameter< const CLASS* >{ \ + typedef Rcpp::InputParameter type ; \ + } ; \ + template<> struct input_parameter< CLASS >{ \ + typedef Rcpp::InputParameter type ; \ + } ; \ + template<> struct input_parameter< CLASS& >{ \ + typedef Rcpp::InputParameter type ; \ + } ; \ + template<> struct input_parameter< const CLASS& >{ \ + typedef Rcpp::InputParameter type ; \ + } ; \ }} #define RCPP_EXPOSED_WRAP(CLASS) namespace Rcpp{ namespace traits{ template<> struct wrap_type_traits< CLASS >{typedef wrap_type_module_object_tag wrap_category ; } ; }} Modified: pkg/Rcpp/src/attributes.cpp =================================================================== --- pkg/Rcpp/src/attributes.cpp 2013-09-14 20:24:06 UTC (rev 4485) +++ pkg/Rcpp/src/attributes.cpp 2013-09-15 12:59:41 UTC (rev 4486) @@ -2167,8 +2167,8 @@ for (size_t i = 0; i " << argument.name() + ostr << " Rcpp::traits::input_parameter< " + << argument.type().full_name() << " >::type " << argument.name() << "(" << argument.name() << "SEXP );" << std::endl; } From noreply at r-forge.r-project.org Sun Sep 15 15:01:18 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 15 Sep 2013 15:01:18 +0200 (CEST) Subject: [Rcpp-commits] r4487 - in pkg/RcppArmadillo: . inst/include Message-ID: <20130915130118.E436118600F@r-forge.r-project.org> Author: romain Date: 2013-09-15 15:01:18 +0200 (Sun, 15 Sep 2013) New Revision: 4487 Modified: pkg/RcppArmadillo/ChangeLog pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h Log: adapt to Rcpp changes Modified: pkg/RcppArmadillo/ChangeLog =================================================================== --- pkg/RcppArmadillo/ChangeLog 2013-09-15 12:59:41 UTC (rev 4486) +++ pkg/RcppArmadillo/ChangeLog 2013-09-15 13:01:18 UTC (rev 4487) @@ -1,3 +1,9 @@ +2013-09-15 Romain Francois + + * include/RcppArmadilloForward.h : declaration of specializations of + ConstReferenceInputParameter and ReferenceInputParameter + * include/RcppArmadilloAs.h : definitions of the above + 2013-09-13 Romain Francois * DESCRIPTION : require Rcpp 0.10.4.4 Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h =================================================================== --- pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h 2013-09-15 12:59:41 UTC (rev 4486) +++ pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h 2013-09-15 13:01:18 UTC (rev 4487) @@ -101,14 +101,14 @@ } template - class InputParameter< const arma::Mat& > { + class ConstReferenceInputParameter< arma::Mat > { public: typedef const typename arma::Mat& const_reference ; - InputParameter( SEXP x_ ) : m(x_), mat( m.begin(), m.nrow(), m.ncol(), false ){} + ConstReferenceInputParameter( SEXP x_ ) : m(x_), mat( m.begin(), m.nrow(), m.ncol(), false ){} inline operator const_reference(){ - return mat ; + return mat ; } private: @@ -117,11 +117,11 @@ } ; template - class InputParameter< arma::Mat& > { + class ReferenceInputParameter< arma::Mat > { public: typedef typename arma::Mat& reference ; - InputParameter( SEXP x_ ) : m(x_), mat( m.begin(), m.nrow(), m.ncol(), false ){} + ReferenceInputParameter( SEXP x_ ) : m(x_), mat( m.begin(), m.nrow(), m.ncol(), false ){} inline operator reference(){ return mat ; @@ -146,17 +146,17 @@ VEC vec ; } ; -#define MAKE_INPUT_PARAMETER(TYPE,REF) \ +#define MAKE_INPUT_PARAMETER(INPUT_TYPE,TYPE,REF) \ template \ - class InputParameter : public ArmaVec_InputParameter{ \ + class INPUT_TYPE : public ArmaVec_InputParameter{ \ public: \ - InputParameter( SEXP x) : ArmaVec_InputParameter(x){} \ + INPUT_TYPE( SEXP x) : ArmaVec_InputParameter(x){} \ } ; - MAKE_INPUT_PARAMETER(arma::Col, const arma::Col& ) - MAKE_INPUT_PARAMETER(arma::Col, arma::Col& ) - MAKE_INPUT_PARAMETER(arma::Row, const arma::Row& ) - MAKE_INPUT_PARAMETER(arma::Row, arma::Row& ) + MAKE_INPUT_PARAMETER(ConstReferenceInputParameter, arma::Col, const arma::Col& ) + MAKE_INPUT_PARAMETER(ReferenceInputParameter , arma::Col, arma::Col& ) + MAKE_INPUT_PARAMETER(ConstReferenceInputParameter, arma::Row, const arma::Row& ) + MAKE_INPUT_PARAMETER(ReferenceInputParameter , arma::Row, arma::Row& ) #undef MAKE_INPUT_PARAMETER } Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h =================================================================== --- pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h 2013-09-15 12:59:41 UTC (rev 4486) +++ pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h 2013-09-15 13:01:18 UTC (rev 4487) @@ -96,14 +96,14 @@ } // namespace traits - template class InputParameter< const arma::Mat& > ; - template class InputParameter< arma::Mat& > ; + template class ConstReferenceInputParameter< arma::Mat > ; + template class ReferenceInputParameter< arma::Mat > ; - template class InputParameter< const arma::Col& > ; - template class InputParameter< arma::Col& > ; + template class ConstReferenceInputParameter< arma::Col > ; + template class ReferenceInputParameter< arma::Col > ; - template class InputParameter< const arma::Row& > ; - template class InputParameter< arma::Row& > ; + template class ConstReferenceInputParameter< arma::Row > ; + template class ReferenceInputParameter< arma::Row > ; } From noreply at r-forge.r-project.org Sun Sep 15 21:42:23 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 15 Sep 2013 21:42:23 +0200 (CEST) Subject: [Rcpp-commits] r4488 - in pkg/Rcpp: . inst/unitTests inst/unitTests/cpp Message-ID: <20130915194223.933B8184ECD@r-forge.r-project.org> Author: edd Date: 2013-09-15 21:42:23 +0200 (Sun, 15 Sep 2013) New Revision: 4488 Modified: pkg/Rcpp/ChangeLog pkg/Rcpp/inst/unitTests/cpp/Vector.cpp pkg/Rcpp/inst/unitTests/runit.Vector.R Log: new tests for std::vector and std::vector conversions Modified: pkg/Rcpp/ChangeLog =================================================================== --- pkg/Rcpp/ChangeLog 2013-09-15 13:01:18 UTC (rev 4487) +++ pkg/Rcpp/ChangeLog 2013-09-15 19:42:23 UTC (rev 4488) @@ -1,12 +1,18 @@ -2013-09-15 Romain Francois - - * include/Rcpp/InputParameter.h : added the traits::input_parameter trait - to add another layer of abstration. - * include/Rcpp/macros/module.h : taking advantage of input_parameter to - specialize how to work with module objects - * src/attributes.cpp : using traits::input_parameter instead of +2013-09-15 Dirk Eddelbuettel + + * inst/unitTests/cpp/Vector.cpp: New unit tests for std::vector + conversions, using both int and double arguments + * inst/unitTests/runit.Vector.R: R complement of these tests + +2013-09-15 Romain Francois + + * include/Rcpp/InputParameter.h : added the traits::input_parameter + trait to add another layer of abstration. + * include/Rcpp/macros/module.h : taking advantage of input_parameter + to specialize how to work with module objects + * src/attributes.cpp : using traits::input_parameter instead of InputParameter - + 2013-09-14 Dirk Eddelbuettel * src/attributes.cpp : Precede closing '>' by space to avoid '>>' Modified: pkg/Rcpp/inst/unitTests/cpp/Vector.cpp =================================================================== --- pkg/Rcpp/inst/unitTests/cpp/Vector.cpp 2013-09-15 13:01:18 UTC (rev 4487) +++ pkg/Rcpp/inst/unitTests/cpp/Vector.cpp 2013-09-15 19:42:23 UTC (rev 4488) @@ -729,3 +729,42 @@ } #endif +// [[Rcpp::export]] +int stdVectorDouble(std::vector x) { + return x.size(); +} + +// [[Rcpp::export]] +int stdVectorDoubleConst(const std::vector x) { + return x.size(); +} + +// [[Rcpp::export]] +int stdVectorDoubleRef(std::vector & x) { + return x.size(); +} + +// [[Rcpp::export]] +int stdVectorDoubleConstRef(const std::vector & x) { + return x.size(); +} + +// [[Rcpp::export]] +int stdVectorInt(std::vector x) { + return x.size(); +} + +// [[Rcpp::export]] +int stdVectorIntConst(const std::vector x) { + return x.size(); +} + +// [[Rcpp::export]] +int stdVectorIntRef(std::vector & x) { + return x.size(); +} + +// [[Rcpp::export]] +int stdVectorIntConstRef(const std::vector & x) { + return x.size(); +} Modified: pkg/Rcpp/inst/unitTests/runit.Vector.R =================================================================== --- pkg/Rcpp/inst/unitTests/runit.Vector.R 2013-09-15 13:01:18 UTC (rev 4487) +++ pkg/Rcpp/inst/unitTests/runit.Vector.R 2013-09-15 19:42:23 UTC (rev 4488) @@ -589,9 +589,9 @@ test.CharacterVector.equality.operator <- function(){ res <- CharacterVectorEqualityOperator( letters, letters ) - checkEquals( res, - list( rep( TRUE, 26L ), rep( FALSE, 26L) ), - msg = 'CharacterVector element equality operator' ) + checkEquals( res, + list( rep( TRUE, 26L ), rep( FALSE, 26L) ), + msg = 'CharacterVector element equality operator' ) } test.List.rep.ctor <- function(){ @@ -640,3 +640,53 @@ } } + +test.std.vector.double <- function() { + fun <- stdVectorDouble + x <- seq(1.0, 5.0, by=1.0) + checkEquals(fun(x), 5, msg = "automatic conversion of stdVectorDouble") +} + +test.std.vector.double.const <- function() { + fun <- stdVectorDoubleConst + x <- seq(1.0, 5.0, by=1.0) + checkEquals(fun(x), 5, msg = "automatic conversion of stdVectorDoubleConst") +} + +test.std.vector.double.ref <- function() { + fun <- stdVectorDoubleRef + x <- seq(1.0, 5.0, by=1.0) + checkEquals(fun(x), 5, msg = "automatic conversion of stdVectorDoubleRef") +} + +test.std.vector.double.const.ref <- function() { + fun <- stdVectorDoubleConstRef + x <- seq(1.0, 5.0, by=1.0) + checkEquals(fun(x), 5, msg = "automatic conversion of stdVectorDoubleConstRef") +} + +test.std.vector.int <- function() { + fun <- stdVectorInt + x <- seq(1L, 5L, by=1L) + checkEquals(fun(x), 5, msg = "automatic conversion of stdVectorInt") +} + +test.std.vector.int.const <- function() { + fun <- stdVectorIntConst + x <- seq(1L, 5L, by=1L) + checkEquals(fun(x), 5, msg = "automatic conversion of stdVectorIntConst") +} + +test.std.vector.int.ref <- function() { + fun <- stdVectorIntRef + x <- seq(1L, 5L, by=1L) + checkEquals(fun(x), 5, msg = "automatic conversion of stdVectorIntRef") +} + +test.std.vector.int.const.ref <- function() { + fun <- stdVectorIntConstRef + x <- seq(1L, 5L, by=1L) + checkEquals(fun(x), 5, msg = "automatic conversion of stdVectorIntConstRef") +} + + From noreply at r-forge.r-project.org Sun Sep 15 22:18:34 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 15 Sep 2013 22:18:34 +0200 (CEST) Subject: [Rcpp-commits] r4489 - in pkg/Rcpp: . inst/include/Rcpp Message-ID: <20130915201834.AA25A186046@r-forge.r-project.org> Author: edd Date: 2013-09-15 22:18:34 +0200 (Sun, 15 Sep 2013) New Revision: 4489 Modified: pkg/Rcpp/ChangeLog pkg/Rcpp/inst/include/Rcpp/InputParameter.h Log: Add 'const' case to complement 'plain', 'reference' and 'const reference' Modified: pkg/Rcpp/ChangeLog =================================================================== --- pkg/Rcpp/ChangeLog 2013-09-15 19:42:23 UTC (rev 4488) +++ pkg/Rcpp/ChangeLog 2013-09-15 20:18:34 UTC (rev 4489) @@ -1,5 +1,7 @@ 2013-09-15 Dirk Eddelbuettel + * inst/include/Rcpp/InputParameter.h (Rcpp): Add 'const' case + * inst/unitTests/cpp/Vector.cpp: New unit tests for std::vector conversions, using both int and double arguments * inst/unitTests/runit.Vector.R: R complement of these tests Modified: pkg/Rcpp/inst/include/Rcpp/InputParameter.h =================================================================== --- pkg/Rcpp/inst/include/Rcpp/InputParameter.h 2013-09-15 19:42:23 UTC (rev 4488) +++ pkg/Rcpp/inst/include/Rcpp/InputParameter.h 2013-09-15 20:18:34 UTC (rev 4489) @@ -50,6 +50,19 @@ private: T obj ; } ; + + // same for const + template + class ConstInputParameter { + public: + typedef const T const_nonref ; + ConstInputParameter(SEXP x_) : obj( as(x_) ){} + + inline operator const_nonref() { return obj ; } + + private: + T obj ; + } ; // same for const references template @@ -74,6 +87,10 @@ typedef typename Rcpp::ReferenceInputParameter type ; } ; template + struct input_parameter { + typedef typename Rcpp::ConstInputParameter type ; + } ; + template struct input_parameter { typedef typename Rcpp::ConstReferenceInputParameter type ; } ; From noreply at r-forge.r-project.org Sun Sep 15 23:17:02 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 15 Sep 2013 23:17:02 +0200 (CEST) Subject: [Rcpp-commits] r4490 - in pkg/RcppArmadillo: . inst/include inst/unitTests inst/unitTests/cpp vignettes Message-ID: <20130915211702.B5651186099@r-forge.r-project.org> Author: edd Date: 2013-09-15 23:17:02 +0200 (Sun, 15 Sep 2013) New Revision: 4490 Modified: pkg/RcppArmadillo/ChangeLog pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h pkg/RcppArmadillo/inst/unitTests/cpp/armadillo.cpp pkg/RcppArmadillo/inst/unitTests/runit.RcppArmadillo.R pkg/RcppArmadillo/vignettes/RcppArmadillo-unitTests.Rnw Log: also add const case following Romain's commits for const ref and ref added unit tests for all three for both matrices and vectors Modified: pkg/RcppArmadillo/ChangeLog =================================================================== --- pkg/RcppArmadillo/ChangeLog 2013-09-15 20:18:34 UTC (rev 4489) +++ pkg/RcppArmadillo/ChangeLog 2013-09-15 21:17:02 UTC (rev 4490) @@ -1,5 +1,12 @@ -2013-09-15 Romain Francois - +2013-09-15 Dirk Eddelbuettel + + * inst/include/RcppArmadilloAs.h: Also define ConstInputParameter + * inst/include/RcppArmadilloForward.h: Ditto for declaration + * inst/unitTests/runit.RcppArmadillo.R: New unit tests for these + * inst/unitTests/cpp/armadillo.cpp: C++ code for new unit tests + +2013-09-15 Romain Francois + * include/RcppArmadilloForward.h : declaration of specializations of ConstReferenceInputParameter and ReferenceInputParameter * include/RcppArmadilloAs.h : definitions of the above Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h =================================================================== --- pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h 2013-09-15 20:18:34 UTC (rev 4489) +++ pkg/RcppArmadillo/inst/include/RcppArmadilloAs.h 2013-09-15 21:17:02 UTC (rev 4490) @@ -131,6 +131,18 @@ Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > m ; arma::Mat mat ; } ; + + template + class ConstInputParameter< arma::Mat > { + public: + typedef const typename arma::Mat const_nonref; + ConstInputParameter(SEXP x_) : m(x_), mat(m.begin(), m.nrow(), m.ncol(), false){} + inline operator const_nonref() { return mat ; } + private: + Rcpp::Matrix< Rcpp::traits::r_sexptype_traits::rtype > m ; + arma::Mat mat ; + }; + template class ArmaVec_InputParameter { @@ -155,8 +167,10 @@ MAKE_INPUT_PARAMETER(ConstReferenceInputParameter, arma::Col, const arma::Col& ) MAKE_INPUT_PARAMETER(ReferenceInputParameter , arma::Col, arma::Col& ) + MAKE_INPUT_PARAMETER(ConstInputParameter , arma::Col, const arma::Col ) MAKE_INPUT_PARAMETER(ConstReferenceInputParameter, arma::Row, const arma::Row& ) MAKE_INPUT_PARAMETER(ReferenceInputParameter , arma::Row, arma::Row& ) + MAKE_INPUT_PARAMETER(ConstInputParameter , arma::Row, const arma::Row ) #undef MAKE_INPUT_PARAMETER } Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h =================================================================== --- pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h 2013-09-15 20:18:34 UTC (rev 4489) +++ pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h 2013-09-15 21:17:02 UTC (rev 4490) @@ -98,12 +98,15 @@ template class ConstReferenceInputParameter< arma::Mat > ; template class ReferenceInputParameter< arma::Mat > ; + template class ConstInputParameter< arma::Mat > ; template class ConstReferenceInputParameter< arma::Col > ; template class ReferenceInputParameter< arma::Col > ; + template class ConstInputParameter< arma::Col > ; template class ConstReferenceInputParameter< arma::Row > ; template class ReferenceInputParameter< arma::Row > ; + template class ConstInputParameter< arma::Row > ; } Modified: pkg/RcppArmadillo/inst/unitTests/cpp/armadillo.cpp =================================================================== --- pkg/RcppArmadillo/inst/unitTests/cpp/armadillo.cpp 2013-09-15 20:18:34 UTC (rev 4489) +++ pkg/RcppArmadillo/inst/unitTests/cpp/armadillo.cpp 2013-09-15 21:17:02 UTC (rev 4490) @@ -210,3 +210,45 @@ // checkException(fun(), msg="RTTI check on matrix constructor exception") // } + + +// [[Rcpp::export]] +int mat_plain(arma::mat x) { + return x.n_elem; +} + +// [[Rcpp::export]] +int mat_const(const arma::mat x) { + return x.n_elem; +} + +// [[Rcpp::export]] +int mat_ref(arma::mat & x) { + return x.n_elem; +} + +// [[Rcpp::export]] +int mat_const_ref(const arma::mat & x) { + return x.n_elem; +} + +// [[Rcpp::export]] +int vec_plain(arma::vec x) { + return x.n_elem; +} + +// [[Rcpp::export]] +int vec_const(const arma::vec x) { + return x.n_elem; +} + +// [[Rcpp::export]] +int vec_ref(arma::vec & x) { + return x.n_elem; +} + +// [[Rcpp::export]] +int vec_const_ref(const arma::vec & x) { + return x.n_elem; +} + Modified: pkg/RcppArmadillo/inst/unitTests/runit.RcppArmadillo.R =================================================================== --- pkg/RcppArmadillo/inst/unitTests/runit.RcppArmadillo.R 2013-09-15 20:18:34 UTC (rev 4489) +++ pkg/RcppArmadillo/inst/unitTests/runit.RcppArmadillo.R 2013-09-15 21:17:02 UTC (rev 4490) @@ -160,3 +160,52 @@ ## checkException(fun(), msg="RTTI check on matrix constructor exception") ## } + +test.armadillo.mat.plain <- function() { + fx <- mat_plain + m <- matrix(1:9, 3, 3) + checkEquals(fx(m), 9, msg = "Plain Matrix function signature" ) +} + +test.armadillo.mat.const <- function() { + fx <- mat_const + m <- matrix(1:9, 3, 3) + checkEquals(fx(m), 9, msg = "Const Matrix function signature" ) +} + +test.armadillo.mat.ref <- function() { + fx <- mat_ref + m <- matrix(1:9, 3, 3) + checkEquals(fx(m), 9, msg = "Reference Matrix function signature" ) +} + +test.armadillo.mat.const.ref <- function() { + fx <- mat_const_ref + m <- matrix(1:9, 3, 3) + checkEquals(fx(m), 9, msg = "Const Reference Matrix function signature" ) +} + +test.armadillo.vec.plain <- function() { + fx <- vec_plain + m <- 1:9 + checkEquals(fx(m), 9, msg = "Plain Vector function signature" ) +} + +test.armadillo.vec.const <- function() { + fx <- vec_const + m <- 1:9 + checkEquals(fx(m), 9, msg = "Const Vector function signature" ) +} + +test.armadillo.vec.ref <- function() { + fx <- vec_ref + m <- 1:9 + checkEquals(fx(m), 9, msg = "Reference Vector function signature" ) +} + +test.armadillo.vec.const.ref <- function() { + fx <- vec_const_ref + m <- 1:9 + checkEquals(fx(m), 9, msg = "Const Reference Vector function signature" ) +} + Modified: pkg/RcppArmadillo/vignettes/RcppArmadillo-unitTests.Rnw =================================================================== --- pkg/RcppArmadillo/vignettes/RcppArmadillo-unitTests.Rnw 2013-09-15 20:18:34 UTC (rev 4489) +++ pkg/RcppArmadillo/vignettes/RcppArmadillo-unitTests.Rnw 2013-09-15 21:17:02 UTC (rev 4490) @@ -18,8 +18,8 @@ \usepackage[colorlinks]{hyperref} \author{Dirk Eddelbuettel, Romain Fran\c{c}ois and Douglas Bates} -\title{RcppArmadillo : Unit testing results} -\date{\texttt{RcppArmadillo} version \Sexpr{prettyVersion} as of \Sexpr{prettyDate}} +\title{\textbf{RcppArmadillo}: Unit testing results} +\date{\textbf{RcppArmadillo} version \Sexpr{prettyVersion} as of \Sexpr{prettyDate}} \begin{document} \maketitle From noreply at r-forge.r-project.org Mon Sep 16 02:50:05 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 16 Sep 2013 02:50:05 +0200 (CEST) Subject: [Rcpp-commits] r4491 - pkg/Rcpp Message-ID: <20130916005005.C32291860D2@r-forge.r-project.org> Author: edd Date: 2013-09-16 02:50:05 +0200 (Mon, 16 Sep 2013) New Revision: 4491 Modified: pkg/Rcpp/.Rbuildignore Log: do not install vignettes/jss.bst Modified: pkg/Rcpp/.Rbuildignore =================================================================== --- pkg/Rcpp/.Rbuildignore 2013-09-15 21:17:02 UTC (rev 4490) +++ pkg/Rcpp/.Rbuildignore 2013-09-16 00:50:05 UTC (rev 4491) @@ -4,6 +4,7 @@ inst/doc/man build inst/doc/jss.bst +vignettes/jss.bst ^.*\.Rproj$ ^\.Rproj\.user$ inst/include/Rcpp/preprocessor From noreply at r-forge.r-project.org Mon Sep 16 02:50:39 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 16 Sep 2013 02:50:39 +0200 (CEST) Subject: [Rcpp-commits] r4492 - pkg/Rcpp/R Message-ID: <20130916005039.CC10A184AFD@r-forge.r-project.org> Author: edd Date: 2013-09-16 02:50:39 +0200 (Mon, 16 Sep 2013) New Revision: 4492 Modified: pkg/Rcpp/R/RcppLdpath.R Log: two base R functions we can access via :: instead of ::: Modified: pkg/Rcpp/R/RcppLdpath.R =================================================================== --- pkg/Rcpp/R/RcppLdpath.R 2013-09-16 00:50:05 UTC (rev 4491) +++ pkg/Rcpp/R/RcppLdpath.R 2013-09-16 00:50:39 UTC (rev 4492) @@ -17,7 +17,7 @@ ## make sure system.file returns an absolute path Rcpp.system.file <- function(...){ - tools:::file_path_as_absolute( base:::system.file( ..., package = "Rcpp" ) ) + tools::file_path_as_absolute( base::system.file( ..., package = "Rcpp" ) ) } ## identifies if the default linking on the platform should be static From noreply at r-forge.r-project.org Mon Sep 16 11:54:18 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 16 Sep 2013 11:54:18 +0200 (CEST) Subject: [Rcpp-commits] r4493 - in pkg/Rcpp: . inst/include/Rcpp/api/meat inst/include/Rcpp/internal Message-ID: <20130916095419.09DBA184671@r-forge.r-project.org> Author: romain Date: 2013-09-16 11:54:18 +0200 (Mon, 16 Sep 2013) New Revision: 4493 Modified: pkg/Rcpp/ChangeLog pkg/Rcpp/inst/include/Rcpp/api/meat/export.h pkg/Rcpp/inst/include/Rcpp/internal/Exporter.h Log: faster as< std::vector > Modified: pkg/Rcpp/ChangeLog =================================================================== --- pkg/Rcpp/ChangeLog 2013-09-16 00:50:39 UTC (rev 4492) +++ pkg/Rcpp/ChangeLog 2013-09-16 09:54:18 UTC (rev 4493) @@ -1,3 +1,10 @@ +2013-09-16 Romain Francois + + * include/Rcpp/internal/Exporter.h : Specific handling of containers (std::vector, + std::deque, and std::list so that we use their faster range constructor when + we can, and so let the STL optimize how data is copied + * include/Rcpp/api/meat/export.h : Implementation of the above + 2013-09-15 Dirk Eddelbuettel * inst/include/Rcpp/InputParameter.h (Rcpp): Add 'const' case Modified: pkg/Rcpp/inst/include/Rcpp/api/meat/export.h =================================================================== --- pkg/Rcpp/inst/include/Rcpp/api/meat/export.h 2013-09-16 00:50:39 UTC (rev 4492) +++ pkg/Rcpp/inst/include/Rcpp/api/meat/export.h 2013-09-16 09:54:18 UTC (rev 4493) @@ -35,6 +35,38 @@ } // namespace internal + + namespace traits{ + + template < template

Rcpp Vignettes

Rcpp Online Documentation

Rcpp Development

Related packages

Rcpp Vignettes

Rcpp Online Documentation

Rcpp Development

Related packages