[Rcpp-commits] r1978 - in pkg/Rcpp/inst: include/Rcpp/stats include/Rcpp/stats/random unitTests
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Aug 10 22:58:39 CEST 2010
Author: romain
Date: 2010-08-10 22:58:37 +0200 (Tue, 10 Aug 2010)
New Revision: 1978
Modified:
pkg/Rcpp/inst/include/Rcpp/stats/beta.h
pkg/Rcpp/inst/include/Rcpp/stats/binom.h
pkg/Rcpp/inst/include/Rcpp/stats/cauchy.h
pkg/Rcpp/inst/include/Rcpp/stats/chisq.h
pkg/Rcpp/inst/include/Rcpp/stats/exp.h
pkg/Rcpp/inst/include/Rcpp/stats/f.h
pkg/Rcpp/inst/include/Rcpp/stats/gamma.h
pkg/Rcpp/inst/include/Rcpp/stats/geom.h
pkg/Rcpp/inst/include/Rcpp/stats/hyper.h
pkg/Rcpp/inst/include/Rcpp/stats/lnorm.h
pkg/Rcpp/inst/include/Rcpp/stats/logis.h
pkg/Rcpp/inst/include/Rcpp/stats/nbeta.h
pkg/Rcpp/inst/include/Rcpp/stats/nbinom.h
pkg/Rcpp/inst/include/Rcpp/stats/nbinom_mu.h
pkg/Rcpp/inst/include/Rcpp/stats/nchisq.h
pkg/Rcpp/inst/include/Rcpp/stats/nf.h
pkg/Rcpp/inst/include/Rcpp/stats/norm.h
pkg/Rcpp/inst/include/Rcpp/stats/nt.h
pkg/Rcpp/inst/include/Rcpp/stats/pois.h
pkg/Rcpp/inst/include/Rcpp/stats/random/rbeta.h
pkg/Rcpp/inst/include/Rcpp/stats/random/rcauchy.h
pkg/Rcpp/inst/include/Rcpp/stats/random/rchisq.h
pkg/Rcpp/inst/include/Rcpp/stats/random/rexp.h
pkg/Rcpp/inst/include/Rcpp/stats/random/rf.h
pkg/Rcpp/inst/include/Rcpp/stats/random/rnorm.h
pkg/Rcpp/inst/include/Rcpp/stats/random/runif.h
pkg/Rcpp/inst/include/Rcpp/stats/t.h
pkg/Rcpp/inst/include/Rcpp/stats/unif.h
pkg/Rcpp/inst/include/Rcpp/stats/weibull.h
pkg/Rcpp/inst/unitTests/runit.stats.R
Log:
remove the stats:: prefix from stats functions
Modified: pkg/Rcpp/inst/include/Rcpp/stats/beta.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/beta.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/beta.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -26,8 +26,8 @@
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DBeta : public Rcpp::VectorBase< REALSXP, NA, DBeta<NA,T> > {
public:
@@ -85,28 +85,27 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DBeta<NA,T> dbeta( const Rcpp::VectorBase<REALSXP,NA,T>& x, double a, double b, bool log = false ) {
- return impl::DBeta<NA,T>( x, a, b, log );
+inline stats::DBeta<NA,T> dbeta( const Rcpp::VectorBase<REALSXP,NA,T>& x, double a, double b, bool log = false ) {
+ return stats::DBeta<NA,T>( x, a, b, log );
}
template <bool NA, typename T>
-inline impl::PBeta<NA,T> pbeta( const Rcpp::VectorBase<REALSXP,NA,T>& x,
+inline stats::PBeta<NA,T> pbeta( const Rcpp::VectorBase<REALSXP,NA,T>& x,
double a, double b,
bool lowertail = true, bool log = false ) {
- return impl::PBeta<NA,T>( x, a, b, lowertail, log );
+ return stats::PBeta<NA,T>( x, a, b, lowertail, log );
}
template <bool NA, typename T>
-inline impl::QBeta<NA,T> qbeta( const Rcpp::VectorBase<REALSXP,NA,T>& x,
+inline stats::QBeta<NA,T> qbeta( const Rcpp::VectorBase<REALSXP,NA,T>& x,
double a, double b,
bool lowertail = true, bool log = false ) {
- return impl::QBeta<NA,T>( x, a, b, lowertail, log );
+ return stats::QBeta<NA,T>( x, a, b, lowertail, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/binom.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/binom.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/binom.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -24,8 +24,8 @@
namespace Rcpp{
namespace stats{
-namespace impl{
+
template <bool NA, typename T>
class DBinom : public Rcpp::VectorBase< REALSXP, NA, DBinom<NA,T> >{
public:
@@ -92,24 +92,23 @@
} ;
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DBinom<NA,T> dbinom( const Rcpp::VectorBase<INTSXP,NA,T>& x, int size, double prob, bool log = false ){
- return impl::DBinom<NA,T>( x, size, prob, log );
+inline stats::DBinom<NA,T> dbinom( const Rcpp::VectorBase<INTSXP,NA,T>& x, int size, double prob, bool log = false ){
+ return stats::DBinom<NA,T>( x, size, prob, log );
}
template <bool NA, typename T>
-inline impl::PBinom<NA,T> pbinom( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size, double prob, bool lower = true, bool log = false ){
- return impl::PBinom<NA,T>( x, size, prob, lower, log );
+inline stats::PBinom<NA,T> pbinom( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size, double prob, bool lower = true, bool log = false ){
+ return stats::PBinom<NA,T>( x, size, prob, lower, log );
}
template <bool NA, typename T>
-inline impl::QBinom<NA,T> qbinom( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size, double prob, bool lower = true, bool log = false ){
- return impl::QBinom<NA,T>( x, size, prob, lower, log );
+inline stats::QBinom<NA,T> qbinom( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size, double prob, bool lower = true, bool log = false ){
+ return stats::QBinom<NA,T>( x, size, prob, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/cauchy.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/cauchy.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/cauchy.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DCauchy : public Rcpp::VectorBase< REALSXP, NA, DCauchy<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DCauchy<NA,T> dcauchy( const Rcpp::VectorBase<REALSXP,NA,T>& x, double location_ = 0.0, double scale_ = 1.0, bool log = false ) {
- return impl::DCauchy<NA,T>( x, location_, scale_, log );
+inline stats::DCauchy<NA,T> dcauchy( const Rcpp::VectorBase<REALSXP,NA,T>& x, double location_ = 0.0, double scale_ = 1.0, bool log = false ) {
+ return stats::DCauchy<NA,T>( x, location_, scale_, log );
}
template <bool NA, typename T>
-inline impl::PCauchy<NA,T> pcauchy( const Rcpp::VectorBase<REALSXP,NA,T>& x, double location_ = 0.0, double scale_ = 1.0, bool lower = true, bool log = false ) {
- return impl::PCauchy<NA,T>( x, location_, scale_, lower, log );
+inline stats::PCauchy<NA,T> pcauchy( const Rcpp::VectorBase<REALSXP,NA,T>& x, double location_ = 0.0, double scale_ = 1.0, bool lower = true, bool log = false ) {
+ return stats::PCauchy<NA,T>( x, location_, scale_, lower, log );
}
template <bool NA, typename T>
-inline impl::QCauchy<NA,T> qcauchy( const Rcpp::VectorBase<REALSXP,NA,T>& x, double location_ = 0.0, double scale_ = 1.0, bool lower = true, bool log = false ) {
- return impl::QCauchy<NA,T>( x, location_, scale_, lower, log );
+inline stats::QCauchy<NA,T> qcauchy( const Rcpp::VectorBase<REALSXP,NA,T>& x, double location_ = 0.0, double scale_ = 1.0, bool lower = true, bool log = false ) {
+ return stats::QCauchy<NA,T>( x, location_, scale_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/chisq.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/chisq.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/chisq.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DChisq : public Rcpp::VectorBase< REALSXP, NA, DChisq<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DChisq<NA,T> dchisq( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, bool log = false ) {
- return impl::DChisq<NA,T>( x, df_, log );
+inline stats::DChisq<NA,T> dchisq( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, bool log = false ) {
+ return stats::DChisq<NA,T>( x, df_, log );
}
template <bool NA, typename T>
-inline impl::PChisq<NA,T> pchisq( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, bool lower = true, bool log = false ) {
- return impl::PChisq<NA,T>( x, df_, lower, log );
+inline stats::PChisq<NA,T> pchisq( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, bool lower = true, bool log = false ) {
+ return stats::PChisq<NA,T>( x, df_, lower, log );
}
template <bool NA, typename T>
-inline impl::QChisq<NA,T> qchisq( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, bool lower = true, bool log = false ) {
- return impl::QChisq<NA,T>( x, df_, lower, log );
+inline stats::QChisq<NA,T> qchisq( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, bool lower = true, bool log = false ) {
+ return stats::QChisq<NA,T>( x, df_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/exp.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/exp.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/exp.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DExp : public Rcpp::VectorBase< REALSXP, NA, DExp<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DExp<NA,T> dexp( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape = 1.0, bool log = false ) {
- return impl::DExp<NA,T>( x, 1.0/shape, log );
+inline stats::DExp<NA,T> dexp( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape = 1.0, bool log = false ) {
+ return stats::DExp<NA,T>( x, 1.0/shape, log );
}
template <bool NA, typename T>
-inline impl::PExp<NA,T> pexp( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape = 1.0, bool lower = true, bool log = false ) {
- return impl::PExp<NA,T>( x, 1.0/shape, lower, log );
+inline stats::PExp<NA,T> pexp( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape = 1.0, bool lower = true, bool log = false ) {
+ return stats::PExp<NA,T>( x, 1.0/shape, lower, log );
}
template <bool NA, typename T>
-inline impl::QExp<NA,T> qexp( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape = 1.0, bool lower = true, bool log = false ) {
- return impl::QExp<NA,T>( x, 1.0/shape, lower, log );
+inline stats::QExp<NA,T> qexp( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape = 1.0, bool lower = true, bool log = false ) {
+ return stats::QExp<NA,T>( x, 1.0/shape, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/f.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/f.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/f.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DF : public Rcpp::VectorBase< REALSXP, NA, DF<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DF<NA,T> df( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df1_, double df2_, bool log = false ) {
- return impl::DF<NA,T>( x, df1_, df2_, log );
+inline stats::DF<NA,T> df( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df1_, double df2_, bool log = false ) {
+ return stats::DF<NA,T>( x, df1_, df2_, log );
}
template <bool NA, typename T>
-inline impl::PF<NA,T> pf( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df1_, double df2_, bool lower = true, bool log = false ) {
- return impl::PF<NA,T>( x, df1_, df2_, lower, log );
+inline stats::PF<NA,T> pf( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df1_, double df2_, bool lower = true, bool log = false ) {
+ return stats::PF<NA,T>( x, df1_, df2_, lower, log );
}
template <bool NA, typename T>
-inline impl::QF<NA,T> qf( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df1_, double df2_, bool lower = true, bool log = false ) {
- return impl::QF<NA,T>( x, df1_, df2_, lower, log );
+inline stats::QF<NA,T> qf( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df1_, double df2_, bool lower = true, bool log = false ) {
+ return stats::QF<NA,T>( x, df1_, df2_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/gamma.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/gamma.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/gamma.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DGamma : public Rcpp::VectorBase< REALSXP, NA, DGamma<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DGamma<NA,T> dgamma( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape_, double scale_ = 1.0, bool log = false ) {
- return impl::DGamma<NA,T>( x, shape_, scale_, log );
+inline stats::DGamma<NA,T> dgamma( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape_, double scale_ = 1.0, bool log = false ) {
+ return stats::DGamma<NA,T>( x, shape_, scale_, log );
}
template <bool NA, typename T>
-inline impl::PGamma<NA,T> pgamma( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape_, double scale_ = 1.0, bool lower = true, bool log = false ) {
- return impl::PGamma<NA,T>( x, shape_, scale_, lower, log );
+inline stats::PGamma<NA,T> pgamma( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape_, double scale_ = 1.0, bool lower = true, bool log = false ) {
+ return stats::PGamma<NA,T>( x, shape_, scale_, lower, log );
}
template <bool NA, typename T>
-inline impl::QGamma<NA,T> qgamma( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape_, double scale_ = 1.0, bool lower = true, bool log = false ) {
- return impl::QGamma<NA,T>( x, shape_, scale_, lower, log );
+inline stats::QGamma<NA,T> qgamma( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape_, double scale_ = 1.0, bool lower = true, bool log = false ) {
+ return stats::QGamma<NA,T>( x, shape_, scale_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/geom.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/geom.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/geom.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DGeom : public Rcpp::VectorBase< REALSXP, NA, DGeom<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DGeom<NA,T> dgeom( const Rcpp::VectorBase<REALSXP,NA,T>& x, double prob_, bool log = false ) {
- return impl::DGeom<NA,T>( x, prob_, log );
+inline stats::DGeom<NA,T> dgeom( const Rcpp::VectorBase<REALSXP,NA,T>& x, double prob_, bool log = false ) {
+ return stats::DGeom<NA,T>( x, prob_, log );
}
template <bool NA, typename T>
-inline impl::PGeom<NA,T> pgeom( const Rcpp::VectorBase<REALSXP,NA,T>& x, double prob_, bool lower = true, bool log = false ) {
- return impl::PGeom<NA,T>( x, prob_, lower, log );
+inline stats::PGeom<NA,T> pgeom( const Rcpp::VectorBase<REALSXP,NA,T>& x, double prob_, bool lower = true, bool log = false ) {
+ return stats::PGeom<NA,T>( x, prob_, lower, log );
}
template <bool NA, typename T>
-inline impl::QGeom<NA,T> qgeom( const Rcpp::VectorBase<REALSXP,NA,T>& x, double prob_, bool lower = true, bool log = false ) {
- return impl::QGeom<NA,T>( x, prob_, lower, log );
+inline stats::QGeom<NA,T> qgeom( const Rcpp::VectorBase<REALSXP,NA,T>& x, double prob_, bool lower = true, bool log = false ) {
+ return stats::QGeom<NA,T>( x, prob_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/hyper.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/hyper.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/hyper.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DHyper : public Rcpp::VectorBase< REALSXP, NA, DHyper<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DHyper<NA,T> dhyper( const Rcpp::VectorBase<REALSXP,NA,T>& x, double mm_, double nn_, double kk_, bool log = false ) {
- return impl::DHyper<NA,T>( x, mm_, nn_, kk_, log );
+inline stats::DHyper<NA,T> dhyper( const Rcpp::VectorBase<REALSXP,NA,T>& x, double mm_, double nn_, double kk_, bool log = false ) {
+ return stats::DHyper<NA,T>( x, mm_, nn_, kk_, log );
}
template <bool NA, typename T>
-inline impl::PHyper<NA,T> phyper( const Rcpp::VectorBase<REALSXP,NA,T>& x, double mm_, double nn_, double kk_, bool lower = true, bool log = false ) {
- return impl::PHyper<NA,T>( x, mm_, nn_, kk_, lower, log );
+inline stats::PHyper<NA,T> phyper( const Rcpp::VectorBase<REALSXP,NA,T>& x, double mm_, double nn_, double kk_, bool lower = true, bool log = false ) {
+ return stats::PHyper<NA,T>( x, mm_, nn_, kk_, lower, log );
}
template <bool NA, typename T>
-inline impl::QHyper<NA,T> qhyper( const Rcpp::VectorBase<REALSXP,NA,T>& x, double mm_, double nn_, double kk_, bool lower = true, bool log = false ) {
- return impl::QHyper<NA,T>( x, mm_, nn_, kk_, lower, log );
+inline stats::QHyper<NA,T> qhyper( const Rcpp::VectorBase<REALSXP,NA,T>& x, double mm_, double nn_, double kk_, bool lower = true, bool log = false ) {
+ return stats::QHyper<NA,T>( x, mm_, nn_, kk_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/lnorm.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/lnorm.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/lnorm.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DLnorm : public Rcpp::VectorBase< REALSXP, NA, DLnorm<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DLnorm<NA,T> dlnorm( const Rcpp::VectorBase<REALSXP,NA,T>& x, double meanlog_ = 0.0, double sdlog_ = 1.0, bool log = false ) {
- return impl::DLnorm<NA,T>( x, meanlog_, sdlog_, log );
+inline stats::DLnorm<NA,T> dlnorm( const Rcpp::VectorBase<REALSXP,NA,T>& x, double meanlog_ = 0.0, double sdlog_ = 1.0, bool log = false ) {
+ return stats::DLnorm<NA,T>( x, meanlog_, sdlog_, log );
}
template <bool NA, typename T>
-inline impl::PLnorm<NA,T> plnorm( const Rcpp::VectorBase<REALSXP,NA,T>& x, double meanlog_ = 0.0, double sdlog_ = 1.0, bool lower = true, bool log = false ) {
- return impl::PLnorm<NA,T>( x, meanlog_, sdlog_, lower, log );
+inline stats::PLnorm<NA,T> plnorm( const Rcpp::VectorBase<REALSXP,NA,T>& x, double meanlog_ = 0.0, double sdlog_ = 1.0, bool lower = true, bool log = false ) {
+ return stats::PLnorm<NA,T>( x, meanlog_, sdlog_, lower, log );
}
template <bool NA, typename T>
-inline impl::QLnorm<NA,T> qlnorm( const Rcpp::VectorBase<REALSXP,NA,T>& x, double meanlog_ = 0.0, double sdlog_ = 1.0, bool lower = true, bool log = false ) {
- return impl::QLnorm<NA,T>( x, meanlog_, sdlog_, lower, log );
+inline stats::QLnorm<NA,T> qlnorm( const Rcpp::VectorBase<REALSXP,NA,T>& x, double meanlog_ = 0.0, double sdlog_ = 1.0, bool lower = true, bool log = false ) {
+ return stats::QLnorm<NA,T>( x, meanlog_, sdlog_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/logis.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/logis.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/logis.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DLogis : public Rcpp::VectorBase< REALSXP, NA, DLogis<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DLogis<NA,T> dlogis( const Rcpp::VectorBase<REALSXP,NA,T>& x, double location_ = 0.0, double scale_ = 1.0, bool log = false ) {
- return impl::DLogis<NA,T>( x, location_, scale_, log );
+inline stats::DLogis<NA,T> dlogis( const Rcpp::VectorBase<REALSXP,NA,T>& x, double location_ = 0.0, double scale_ = 1.0, bool log = false ) {
+ return stats::DLogis<NA,T>( x, location_, scale_, log );
}
template <bool NA, typename T>
-inline impl::PLogis<NA,T> plogis( const Rcpp::VectorBase<REALSXP,NA,T>& x, double location_ = 0.0, double scale_ = 1.0, bool lower = true, bool log = false ) {
- return impl::PLogis<NA,T>( x, location_, scale_, lower, log );
+inline stats::PLogis<NA,T> plogis( const Rcpp::VectorBase<REALSXP,NA,T>& x, double location_ = 0.0, double scale_ = 1.0, bool lower = true, bool log = false ) {
+ return stats::PLogis<NA,T>( x, location_, scale_, lower, log );
}
template <bool NA, typename T>
-inline impl::QLogis<NA,T> qlogis( const Rcpp::VectorBase<REALSXP,NA,T>& x, double location_ = 0.0, double scale_ = 1.0, bool lower = true, bool log = false ) {
- return impl::QLogis<NA,T>( x, location_, scale_, lower, log );
+inline stats::QLogis<NA,T> qlogis( const Rcpp::VectorBase<REALSXP,NA,T>& x, double location_ = 0.0, double scale_ = 1.0, bool lower = true, bool log = false ) {
+ return stats::QLogis<NA,T>( x, location_, scale_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/nbeta.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nbeta.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nbeta.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DNbeta : public Rcpp::VectorBase< REALSXP, NA, DNbeta<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DNbeta<NA,T> dnbeta( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape1_, double shape2_, double ncp_, bool log = false ) {
- return impl::DNbeta<NA,T>( x, shape1_, shape2_, ncp_, log );
+inline stats::DNbeta<NA,T> dnbeta( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape1_, double shape2_, double ncp_, bool log = false ) {
+ return stats::DNbeta<NA,T>( x, shape1_, shape2_, ncp_, log );
}
template <bool NA, typename T>
-inline impl::PNbeta<NA,T> pnbeta( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape1_, double shape2_, double ncp_, bool lower = true, bool log = false ) {
- return impl::PNbeta<NA,T>( x, shape1_, shape2_, ncp_, lower, log );
+inline stats::PNbeta<NA,T> pnbeta( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape1_, double shape2_, double ncp_, bool lower = true, bool log = false ) {
+ return stats::PNbeta<NA,T>( x, shape1_, shape2_, ncp_, lower, log );
}
template <bool NA, typename T>
-inline impl::QNbeta<NA,T> qnbeta( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape1_, double shape2_, double ncp_, bool lower = true, bool log = false ) {
- return impl::QNbeta<NA,T>( x, shape1_, shape2_, ncp_, lower, log );
+inline stats::QNbeta<NA,T> qnbeta( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape1_, double shape2_, double ncp_, bool lower = true, bool log = false ) {
+ return stats::QNbeta<NA,T>( x, shape1_, shape2_, ncp_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/nbinom.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nbinom.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nbinom.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DNbinom : public Rcpp::VectorBase< REALSXP, NA, DNbinom<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DNbinom<NA,T> dnbinom( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size_, double prob_, bool log = false ) {
- return impl::DNbinom<NA,T>( x, size_, prob_, log );
+inline stats::DNbinom<NA,T> dnbinom( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size_, double prob_, bool log = false ) {
+ return stats::DNbinom<NA,T>( x, size_, prob_, log );
}
template <bool NA, typename T>
-inline impl::PNbinom<NA,T> pnbinom( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size_, double prob_, bool lower = true, bool log = false ) {
- return impl::PNbinom<NA,T>( x, size_, prob_, lower, log );
+inline stats::PNbinom<NA,T> pnbinom( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size_, double prob_, bool lower = true, bool log = false ) {
+ return stats::PNbinom<NA,T>( x, size_, prob_, lower, log );
}
template <bool NA, typename T>
-inline impl::QNbinom<NA,T> qnbinom( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size_, double prob_, bool lower = true, bool log = false ) {
- return impl::QNbinom<NA,T>( x, size_, prob_, lower, log );
+inline stats::QNbinom<NA,T> qnbinom( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size_, double prob_, bool lower = true, bool log = false ) {
+ return stats::QNbinom<NA,T>( x, size_, prob_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/nbinom_mu.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nbinom_mu.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nbinom_mu.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DNbinom_mu : public Rcpp::VectorBase< REALSXP, NA, DNbinom_mu<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DNbinom_mu<NA,T> dnbinom_mu( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size_, double mu_, bool log = false ) {
- return impl::DNbinom_mu<NA,T>( x, size_, mu_, log );
+inline stats::DNbinom_mu<NA,T> dnbinom_mu( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size_, double mu_, bool log = false ) {
+ return stats::DNbinom_mu<NA,T>( x, size_, mu_, log );
}
template <bool NA, typename T>
-inline impl::PNbinom_mu<NA,T> pnbinom_mu( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size_, double mu_, bool lower = true, bool log = false ) {
- return impl::PNbinom_mu<NA,T>( x, size_, mu_, lower, log );
+inline stats::PNbinom_mu<NA,T> pnbinom_mu( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size_, double mu_, bool lower = true, bool log = false ) {
+ return stats::PNbinom_mu<NA,T>( x, size_, mu_, lower, log );
}
template <bool NA, typename T>
-inline impl::QNbinom_mu<NA,T> qnbinom_mu( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size_, double mu_, bool lower = true, bool log = false ) {
- return impl::QNbinom_mu<NA,T>( x, size_, mu_, lower, log );
+inline stats::QNbinom_mu<NA,T> qnbinom_mu( const Rcpp::VectorBase<REALSXP,NA,T>& x, int size_, double mu_, bool lower = true, bool log = false ) {
+ return stats::QNbinom_mu<NA,T>( x, size_, mu_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/nchisq.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nchisq.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nchisq.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DNchisq : public Rcpp::VectorBase< REALSXP, NA, DNchisq<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DNchisq<NA,T> dnchisq( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, double ncp_, bool log = false ) {
- return impl::DNchisq<NA,T>( x, df_, ncp_, log );
+inline stats::DNchisq<NA,T> dnchisq( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, double ncp_, bool log = false ) {
+ return stats::DNchisq<NA,T>( x, df_, ncp_, log );
}
template <bool NA, typename T>
-inline impl::PNchisq<NA,T> pnchisq( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, double ncp_, bool lower = true, bool log = false ) {
- return impl::PNchisq<NA,T>( x, df_, ncp_, lower, log );
+inline stats::PNchisq<NA,T> pnchisq( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, double ncp_, bool lower = true, bool log = false ) {
+ return stats::PNchisq<NA,T>( x, df_, ncp_, lower, log );
}
template <bool NA, typename T>
-inline impl::QNchisq<NA,T> qnchisq( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, double ncp_, bool lower = true, bool log = false ) {
- return impl::QNchisq<NA,T>( x, df_, ncp_, lower, log );
+inline stats::QNchisq<NA,T> qnchisq( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, double ncp_, bool lower = true, bool log = false ) {
+ return stats::QNchisq<NA,T>( x, df_, ncp_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/nf.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nf.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nf.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DNf : public Rcpp::VectorBase< REALSXP, NA, DNf<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DNf<NA,T> dnf( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df1_, double df2_, double ncp_, bool log = false ) {
- return impl::DNf<NA,T>( x, df1_, df2_, ncp_, log );
+inline stats::DNf<NA,T> dnf( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df1_, double df2_, double ncp_, bool log = false ) {
+ return stats::DNf<NA,T>( x, df1_, df2_, ncp_, log );
}
template <bool NA, typename T>
-inline impl::PNf<NA,T> pnf( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df1_, double df2_, double ncp_, bool lower = true, bool log = false ) {
- return impl::PNf<NA,T>( x, df1_, df2_, ncp_, lower, log );
+inline stats::PNf<NA,T> pnf( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df1_, double df2_, double ncp_, bool lower = true, bool log = false ) {
+ return stats::PNf<NA,T>( x, df1_, df2_, ncp_, lower, log );
}
template <bool NA, typename T>
-inline impl::QNf<NA,T> qnf( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df1_, double df2_, double ncp_, bool lower = true, bool log = false ) {
- return impl::QNf<NA,T>( x, df1_, df2_, ncp_, lower, log );
+inline stats::QNf<NA,T> qnf( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df1_, double df2_, double ncp_, bool lower = true, bool log = false ) {
+ return stats::QNf<NA,T>( x, df1_, df2_, ncp_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/norm.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/norm.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/norm.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -26,8 +26,8 @@
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DNorm : public Rcpp::VectorBase< REALSXP, NA, DNorm<NA,T> >{
public:
@@ -93,24 +93,23 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DNorm<NA,T> dnorm( const Rcpp::VectorBase<REALSXP,NA,T>& x, double mu, double sigma, bool log = false ) {
- return impl::DNorm<NA,T>( x, mu, sigma, log );
+inline stats::DNorm<NA,T> dnorm( const Rcpp::VectorBase<REALSXP,NA,T>& x, double mu, double sigma, bool log = false ) {
+ return stats::DNorm<NA,T>( x, mu, sigma, log );
}
template <bool NA, typename T>
-inline impl::PNorm<NA,T> pnorm( const Rcpp::VectorBase<REALSXP,NA,T>& x, double mu, double sigma, bool lower = true, bool log = false ) {
- return impl::PNorm<NA,T>( x, mu, sigma, lower, log );
+inline stats::PNorm<NA,T> pnorm( const Rcpp::VectorBase<REALSXP,NA,T>& x, double mu, double sigma, bool lower = true, bool log = false ) {
+ return stats::PNorm<NA,T>( x, mu, sigma, lower, log );
}
template <bool NA, typename T>
-inline impl::QNorm<NA,T> qnorm( const Rcpp::VectorBase<REALSXP,NA,T>& x, double mu, double sigma, bool lower = true, bool log = false ) {
- return impl::QNorm<NA,T>( x, mu, sigma, lower, log );
+inline stats::QNorm<NA,T> qnorm( const Rcpp::VectorBase<REALSXP,NA,T>& x, double mu, double sigma, bool lower = true, bool log = false ) {
+ return stats::QNorm<NA,T>( x, mu, sigma, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/nt.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nt.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nt.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -27,8 +27,8 @@
namespace Rcpp {
namespace stats {
-namespace impl {
+
template <bool NA, typename T>
class DNt : public Rcpp::VectorBase< REALSXP, NA, DNt<NA,T> >{
public:
@@ -94,25 +94,24 @@
};
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DNt<NA,T> dnt( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, double ncp_, bool log = false ) {
- return impl::DNt<NA,T>( x, df_, ncp_, log );
+inline stats::DNt<NA,T> dnt( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, double ncp_, bool log = false ) {
+ return stats::DNt<NA,T>( x, df_, ncp_, log );
}
template <bool NA, typename T>
-inline impl::PNt<NA,T> pnt( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, double ncp_, bool lower = true, bool log = false ) {
- return impl::PNt<NA,T>( x, df_, ncp_, lower, log );
+inline stats::PNt<NA,T> pnt( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, double ncp_, bool lower = true, bool log = false ) {
+ return stats::PNt<NA,T>( x, df_, ncp_, lower, log );
}
template <bool NA, typename T>
-inline impl::QNt<NA,T> qnt( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, double ncp_, bool lower = true, bool log = false ) {
- return impl::QNt<NA,T>( x, df_, ncp_, lower, log );
+inline stats::QNt<NA,T> qnt( const Rcpp::VectorBase<REALSXP,NA,T>& x, double df_, double ncp_, bool lower = true, bool log = false ) {
+ return stats::QNt<NA,T>( x, df_, ncp_, lower, log );
}
}
-}
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/stats/pois.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/pois.h 2010-08-10 15:12:11 UTC (rev 1977)
+++ pkg/Rcpp/inst/include/Rcpp/stats/pois.h 2010-08-10 20:58:37 UTC (rev 1978)
@@ -24,8 +24,8 @@
namespace Rcpp{
namespace stats{
-namespace impl{
+
template <bool NA, typename T>
class DPois : public Rcpp::VectorBase< REALSXP, NA, DPois<NA,T> >{
public:
@@ -89,26 +89,25 @@
} ;
-} // impl
+} // stats
template <bool NA, typename T>
-inline impl::DPois<NA,T> dpois( const Rcpp::VectorBase<INTSXP,NA,T>& x, double lambda, bool log = false ){
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/rcpp -r 1978
More information about the Rcpp-commits
mailing list