[Rcpp-commits] r1951 - pkg/Rcpp pkg/Rcpp/inst/include/Rcpp/stats scripts

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Mon Aug 9 08:22:22 CEST 2010


Author: romain
Date: 2010-08-09 08:22:21 +0200 (Mon, 09 Aug 2010)
New Revision: 1951

Added:
   pkg/Rcpp/inst/include/Rcpp/stats/lnorm.h
Modified:
   pkg/Rcpp/NEWS
   pkg/Rcpp/TODO
   pkg/Rcpp/inst/include/Rcpp/stats/stats.h
   scripts/stats.R
Log:
(dpq)lnorm (no tests yet)

Modified: pkg/Rcpp/NEWS
===================================================================
--- pkg/Rcpp/NEWS	2010-08-06 17:04:49 UTC (rev 1950)
+++ pkg/Rcpp/NEWS	2010-08-09 06:22:21 UTC (rev 1951)
@@ -1,6 +1,6 @@
 0.8.6   (future)
 
-	o	new sugar functions (dpq)(unif|norm|gamma|chisq|pois|binom|t|beta)
+	o	new sugar functions (dpq)(unif|norm|gamma|chisq|lnorm|pois|binom|t|beta)
 
 	o	new vignette Rcpp-quickref : quick reference guide of Rcpp API
 

Modified: pkg/Rcpp/TODO
===================================================================
--- pkg/Rcpp/TODO	2010-08-06 17:04:49 UTC (rev 1950)
+++ pkg/Rcpp/TODO	2010-08-09 06:22:21 UTC (rev 1951)
@@ -65,7 +65,7 @@
     
     o   Compound operators: ++,--,+=, -=, ...
     
-    o	other statistical distribution functions : lnorm, nchisq, f, 
+    o	other statistical distribution functions : nchisq, f, 
     	multinom, cauchy, exp, geom, hyper, nbinom, nbinom_mu, weibull,
     	logis, nbeta, nf, nt, tukey, wilcox, signrank
     

Added: pkg/Rcpp/inst/include/Rcpp/stats/lnorm.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/lnorm.h	                        (rev 0)
+++ pkg/Rcpp/inst/include/Rcpp/stats/lnorm.h	2010-08-09 06:22:21 UTC (rev 1951)
@@ -0,0 +1,118 @@
+
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 4 -*-
+//
+// auto generated file (from script/stats.R) 
+//
+// lnorm.h: Rcpp R/C++ interface class library -- 
+//
+// Copyright (C) 2010 Douglas Bates, 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 <http://www.gnu.org/licenses/>.
+
+#ifndef Rcpp__stats__lnorm_h
+#define Rcpp__stats__lnorm_h
+
+namespace Rcpp {
+namespace stats {
+namespace impl {
+
+	template <bool NA, typename T>
+	class DLnorm : public Rcpp::VectorBase< REALSXP, NA, DLnorm<NA,T> >{
+	public:
+		typedef typename Rcpp::VectorBase<REALSXP,NA,T> VEC_TYPE;
+	
+		DLnorm( const VEC_TYPE& vec_, double meanlog_ = 0.0, double sdlog_ = 1.0 , bool log_ = false ) : 
+			vec(vec_), meanlog(meanlog_), sdlog(sdlog_) , log(log_) {}
+		
+		inline double operator[]( int i) const {
+			return ::dlnorm( vec[i], meanlog, sdlog , log );
+		}
+		
+		inline int size() const { return vec.size(); }
+		
+	private:
+		const VEC_TYPE& vec;
+		double meanlog; double sdlog; 
+		int log;
+	
+	};
+
+	template <bool NA, typename T>
+	class PLnorm : public Rcpp::VectorBase< REALSXP, NA, PLnorm<NA,T> >{
+	public:
+		typedef typename Rcpp::VectorBase<REALSXP,NA,T> VEC_TYPE;
+	
+		PLnorm( const VEC_TYPE& vec_, double meanlog_ = 0.0, double sdlog_ = 1.0 ,
+			   bool lower_tail = true, bool log_ = false ) : 
+			vec(vec_), meanlog(meanlog_), sdlog(sdlog_) , lower(lower_tail), log(log_) {}
+		
+		inline double operator[]( int i) const {
+			return ::plnorm( vec[i], meanlog, sdlog, lower, log );
+		}
+		
+		inline int size() const { return vec.size(); }
+		
+	private:
+		const VEC_TYPE& vec;
+		double meanlog; double sdlog; 
+		int lower, log;
+	
+	};
+
+	template <bool NA, typename T>
+	class QLnorm : public Rcpp::VectorBase< REALSXP, NA, QLnorm<NA,T> >{
+	public:
+		typedef typename Rcpp::VectorBase<REALSXP,NA,T> VEC_TYPE;
+	
+		QLnorm( const VEC_TYPE& vec_, double meanlog_ = 0.0, double sdlog_ = 1.0 ,
+			   bool lower_tail = true, bool log_ = false ) : 
+			vec(vec_), meanlog(meanlog_), sdlog(sdlog_), lower(lower_tail), log(log_) {}
+		
+		inline double operator[]( int i) const {
+			return ::qlnorm( vec[i], meanlog, sdlog, lower, log );
+		}
+		
+		inline int size() const { return vec.size(); }
+		
+	private:
+		const VEC_TYPE& vec;
+		double meanlog; double sdlog; 
+		int lower, log;
+	
+	};
+	
+} // impl
+
+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 ); 
+}
+
+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 ); 
+}
+
+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 ); 
+}
+	
+}
+}
+
+#endif
+

Modified: pkg/Rcpp/inst/include/Rcpp/stats/stats.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/stats.h	2010-08-06 17:04:49 UTC (rev 1950)
+++ pkg/Rcpp/inst/include/Rcpp/stats/stats.h	2010-08-09 06:22:21 UTC (rev 1951)
@@ -28,6 +28,7 @@
 #include <Rcpp/stats/chisq.h>
 #include <Rcpp/stats/beta.h>
 #include <Rcpp/stats/t.h>
+#include <Rcpp/stats/lnorm.h>
 
 #include <Rcpp/stats/binom.h>
 #include <Rcpp/stats/pois.h>

Modified: scripts/stats.R
===================================================================
--- scripts/stats.R	2010-08-06 17:04:49 UTC (rev 1950)
+++ scripts/stats.R	2010-08-09 06:22:21 UTC (rev 1951)
@@ -167,5 +167,18 @@
 # 	"min" = list( type = "double", default = "0.0" ), 
 # 	"max" = list( type = "double", default = "1.0" )
 # 	) )
+# 
+# cook( "gamma", params = list( 
+# 	"shape" = list( type = "double" ), 
+# 	"scale" = list( type = "double", default = "1.0" )
+# 	) )
+# 
+# cook( "chisq", params = list( 
+# 	"df" = list( type = "double" ) 
+# 	) )
 
-
+cook( "lnorm", params = list( 
+	"meanlog" = list( type = "double", default = "0.0" ), 
+	"sdlog" = list( type = "double", default = "1.0" )
+	) )
+	



More information about the Rcpp-commits mailing list