[Rcpp-commits] r1976 - pkg/Rcpp/inst/include/Rcpp/stats

[noreply at r-forge.r-project.org]

Author: dmbates
Date: 2010-08-10 17:11:25 +0200 (Tue, 10 Aug 2010)
New Revision: 1976

Modified:
   pkg/Rcpp/inst/include/Rcpp/stats/nbinom.h
   pkg/Rcpp/inst/include/Rcpp/stats/nbinom_mu.h
Log:
Replace conflicting data member name size by siz

Modified: pkg/Rcpp/inst/include/Rcpp/stats/nbinom.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nbinom.h	2010-08-10 09:18:28 UTC (rev 1975)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nbinom.h	2010-08-10 15:11:25 UTC (rev 1976)
@@ -35,17 +35,17 @@
 		typedef typename Rcpp::VectorBase<REALSXP,NA,T> VEC_TYPE;
 	
 		DNbinom( const VEC_TYPE& vec_, int size_, double prob_ , bool log_ = false ) : 
-			vec(vec_), size(size_), prob(prob_) , log(log_) {}
+			vec(vec_), siz(size_), prob(prob_) , log(log_) {}
 		
 		inline double operator[]( int i) const {
-			return ::dnbinom( vec[i], size, prob , log );
+			return ::dnbinom( vec[i], siz, prob , log );
 		}
 		
 		inline int size() const { return vec.size(); }
 		
 	private:
 		const VEC_TYPE& vec;
-		int size; double prob; 
+		int siz; double prob; 
 		int log;
 	
 	};
@@ -57,17 +57,17 @@
 	
 		PNbinom( const VEC_TYPE& vec_, int size_, double prob_ ,
 			   bool lower_tail = true, bool log_ = false ) : 
-			vec(vec_), size(size_), prob(prob_) , lower(lower_tail), log(log_) {}
+			vec(vec_), siz(size_), prob(prob_) , lower(lower_tail), log(log_) {}
 		
 		inline double operator[]( int i) const {
-			return ::pnbinom( vec[i], size, prob, lower, log );
+			return ::pnbinom( vec[i], siz, prob, lower, log );
 		}
 		
 		inline int size() const { return vec.size(); }
 		
 	private:
 		const VEC_TYPE& vec;
-		int size; double prob; 
+		int siz; double prob; 
 		int lower, log;
 	
 	};
@@ -79,17 +79,17 @@
 	
 		QNbinom( const VEC_TYPE& vec_, int size_, double prob_ ,
 			   bool lower_tail = true, bool log_ = false ) : 
-			vec(vec_), size(size_), prob(prob_), lower(lower_tail), log(log_) {}
+			vec(vec_), siz(size_), prob(prob_), lower(lower_tail), log(log_) {}
 		
 		inline double operator[]( int i) const {
-			return ::qnbinom( vec[i], size, prob, lower, log );
+			return ::qnbinom( vec[i], siz, prob, lower, log );
 		}
 		
 		inline int size() const { return vec.size(); }
 		
 	private:
 		const VEC_TYPE& vec;
-		int size; double prob; 
+		int siz; double prob; 
 		int lower, log;
 	
 	};

Modified: pkg/Rcpp/inst/include/Rcpp/stats/nbinom_mu.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nbinom_mu.h	2010-08-10 09:18:28 UTC (rev 1975)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nbinom_mu.h	2010-08-10 15:11:25 UTC (rev 1976)
@@ -35,17 +35,17 @@
 		typedef typename Rcpp::VectorBase<REALSXP,NA,T> VEC_TYPE;
 	
 		DNbinom_mu( const VEC_TYPE& vec_, int size_, double mu_ , bool log_ = false ) : 
-			vec(vec_), size(size_), mu(mu_) , log(log_) {}
+			vec(vec_), siz(size_), mu(mu_) , log(log_) {}
 		
 		inline double operator[]( int i) const {
-			return ::dnbinom_mu( vec[i], size, mu , log );
+			return ::dnbinom_mu( vec[i], siz, mu , log );
 		}
 		
 		inline int size() const { return vec.size(); }
 		
 	private:
 		const VEC_TYPE& vec;
-		int size; double mu; 
+		int siz; double mu; 
 		int log;
 	
 	};
@@ -57,17 +57,17 @@
 	
 		PNbinom_mu( const VEC_TYPE& vec_, int size_, double mu_ ,
 			   bool lower_tail = true, bool log_ = false ) : 
-			vec(vec_), size(size_), mu(mu_) , lower(lower_tail), log(log_) {}
+			vec(vec_), siz(size_), mu(mu_) , lower(lower_tail), log(log_) {}
 		
 		inline double operator[]( int i) const {
-			return ::pnbinom_mu( vec[i], size, mu, lower, log );
+			return ::pnbinom_mu( vec[i], siz, mu, lower, log );
 		}
 		
 		inline int size() const { return vec.size(); }
 		
 	private:
 		const VEC_TYPE& vec;
-		int size; double mu; 
+		int siz; double mu; 
 		int lower, log;
 	
 	};
@@ -79,17 +79,17 @@
 	
 		QNbinom_mu( const VEC_TYPE& vec_, int size_, double mu_ ,
 			   bool lower_tail = true, bool log_ = false ) : 
-			vec(vec_), size(size_), mu(mu_), lower(lower_tail), log(log_) {}
+			vec(vec_), siz(size_), mu(mu_), lower(lower_tail), log(log_) {}
 		
 		inline double operator[]( int i) const {
-			return ::qnbinom_mu( vec[i], size, mu, lower, log );
+			return ::qnbinom_mu( vec[i], siz, mu, lower, log );
 		}
 		
 		inline int size() const { return vec.size(); }
 		
 	private:
 		const VEC_TYPE& vec;
-		int size; double mu; 
+		int siz; double mu; 
 		int lower, log;
 	
 	};