[r-cran-mcmcpack] 69/90: Imported Upstream version 1.2-4.1
Andreas Tille
tille at debian.org
Fri Dec 16 09:07:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-mcmcpack.
commit 2d1d1079335dfc206e82b788cc1affddd20cc9f9
Author: Andreas Tille <tille at debian.org>
Date: Fri Dec 16 08:07:23 2016 +0100
Imported Upstream version 1.2-4.1
---
DESCRIPTION | 7 ++++---
LICENSE => LICENSE.note | 0
MD5 | 14 +++++++-------
src/distributions.h | 2 +-
src/matrix.h | 6 +++---
src/rng.h | 8 ++++----
src/smath.h | 34 +++++++++++++++++-----------------
src/stat.h | 2 +-
8 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 31eeda4..547507e 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,5 +1,5 @@
Package: MCMCpack
-Version: 1.2-4
+Version: 1.2-4.1
Date: 2012-6-13
Title: Markov chain Monte Carlo (MCMC) Package
Author: Andrew D. Martin, Kevin M. Quinn, and Jong Hee Park
@@ -18,6 +18,7 @@ Description: This package contains functions to perform Bayesian
License: GPL-3
SystemRequirements: gcc (>= 4.0)
URL: http://mcmcpack.wustl.edu
-Packaged: 2012-06-13 17:57:53 UTC; adm
+Packaged: 2013-04-06 17:27:35 UTC; ripley
Repository: CRAN
-Date/Publication: 2012-06-14 10:36:54
+Date/Publication: 2013-04-07 00:05:40
+NeedsCompilation: yes
diff --git a/LICENSE b/LICENSE.note
similarity index 100%
rename from LICENSE
rename to LICENSE.note
diff --git a/MD5 b/MD5
index bbc940a..69341c3 100644
--- a/MD5
+++ b/MD5
@@ -1,6 +1,6 @@
-0d23be7acb26db856561bc9908da3a39 *DESCRIPTION
+98e2f9cc509c381facf4e84506abde9c *DESCRIPTION
15bdf8ae0bbca2e2fb31ab9a8f202a0e *HISTORY
-45b74f9b9cce80e9215266776a1be85c *LICENSE
+45b74f9b9cce80e9215266776a1be85c *LICENSE.note
4851e0ecf23d44b58fcd53e597210689 *NAMESPACE
1eaf24e8d468ac0b624a9aa90cded306 *R/BayesFactors.R
9c52f72ee21a71bfbfd312cb56233125 *R/HMMpanelFE.R
@@ -172,21 +172,21 @@ b3e224bb1a8452c3da347348b8e510cc *src/Makevars
5362ed41a42ce34cf7817f6bfd988935 *src/algorithm.h
80eab6b8072ae34de6c192af41324093 *src/datablock.h
5da8702c23b61c037f61dccebec10838 *src/defs.h
-2acfadfc5d2ac2a532dc37e9c1f694b1 *src/distributions.h
+457857685244c7b4993075b5a8e776eb *src/distributions.h
b3e55dce9080169d7161c8a182f0c70a *src/error.h
0b1465cd303a39f5bd6ccb327e1e4b1f *src/ide.h
822c244edb53be2f4f8b1e831abe16fb *src/la.h
41a6caea698666bf78dda6d4d8b923e8 *src/lapack.h
cfc7f8d03a981a3453f81f2bd67d02c5 *src/lecuyer.cc
53cd167ad58abffbb0f155da45e6385a *src/lecuyer.h
-41fec997312cdc497e0baf2f4b7934ff *src/matrix.h
+45d0ce718fa5b6071a8abd2e9d97958b *src/matrix.h
7ab16dbb6757a5de37dc7de9867a3c10 *src/matrix_bidirectional_iterator.h
f924b218cd6eaed80846ed0cba534b03 *src/matrix_forward_iterator.h
3dc8b8e303daa7ffdf3e2d29b2fa43d9 *src/matrix_random_access_iterator.h
b0f0c5a5c5197df32d18b77af2b85957 *src/mersenne.h
a111bb9e9e66be7cb044ad27ea675124 *src/optimize.h
-b234f6c66a84b4ea78e36cc6a3ea8d81 *src/rng.h
+72aba83ca5fb6450350a439fd18f139d *src/rng.h
b48baf77b93da895a04154ef15c8683f *src/rtmvnorm.h
-8aa95ee02342c8863d2d03b0e722aa4a *src/smath.h
-6f0c8e88a1aa10a5198551f9856ad516 *src/stat.h
+9a1656760820e50605248198302c308c *src/smath.h
+012f34388c3a3b9f51b23462e51d2dd0 *src/stat.h
ca47c74890139220fcf9dddd01d33c3c *src/wrapped_generator.h
diff --git a/src/distributions.h b/src/distributions.h
index d2a2571..3cd4af2 100644
--- a/src/distributions.h
+++ b/src/distributions.h
@@ -589,7 +589,7 @@ namespace scythe {
double
pnorm1 (double x, bool lower_tail, bool log_p)
{
- SCYTHE_CHECK_10(! finite(x), scythe_invalid_arg,
+ SCYTHE_CHECK_10(! R_finite(x), scythe_invalid_arg,
"Quantile x is inifinte (+/-Inf) or NaN");
double p, cp;
diff --git a/src/matrix.h b/src/matrix.h
index 5a3728f..1602f50 100644
--- a/src/matrix.h
+++ b/src/matrix.h
@@ -2176,13 +2176,13 @@ namespace scythe {
if (Base::size() == 1) { // 1x1 += nXm
T_type tmp = (*this)(0);
resize2Match(M);
- std::transform(M.begin_f<ORDER>(), M.end_f<ORDER>(),
+ std::transform(M.template begin_f<ORDER>(), M.template end_f<ORDER>(),
begin_f(), std::bind1st(op, tmp));
} else if (M.size() == 1) { // nXm += 1x1
std::transform(begin_f(), end_f(), begin_f(),
std::bind2nd(op, M(0)));
} else { // nXm += nXm
- std::transform(begin_f(), end_f(), M.begin_f<ORDER>(),
+ std::transform(begin_f(), end_f(), M.template begin_f<ORDER>(),
begin_f(), op);
}
@@ -3745,7 +3745,7 @@ namespace scythe {
const_matrix_bidirectional_iterator<T_type, I_ORDER, ORDER, STYLE>
end_bd () const
{
- return (begin_bd<I_ORDER>.set_end());
+ return (begin_bd<I_ORDER>().set_end());
}
/*! \brief Get a reverse iterator pointing to the end of a Matrix.
diff --git a/src/rng.h b/src/rng.h
index 2b38817..ce3a218 100644
--- a/src/rng.h
+++ b/src/rng.h
@@ -1039,7 +1039,7 @@ namespace scythe {
((mean + std::sqrt(-2*variance*std::log(z))) - below) + below;
}
- if (! finite(x)) {
+ if (! R_finite(x)) {
SCYTHE_WARN("Mean extremely far from truncation point. "
<< "Returning truncation point");
return below;
@@ -1095,7 +1095,7 @@ namespace scythe {
*( (newmu + std::sqrt(-2*variance*std::log(z))) - below)
+ below;
}
- if (! finite(x)) {
+ if (! R_finite(x)) {
SCYTHE_WARN("Mean extremely far from truncation point. "
<< "Returning truncation point");
return above;
@@ -1164,7 +1164,7 @@ namespace scythe {
* ((mean + std::sqrt(-2 * variance * std::log(z)))
- below) + below;
}
- if (! finite(x)) {
+ if (! R_finite(x)) {
SCYTHE_WARN("Mean extremely far from truncation point. "
<< "Returning truncation point");
return below;
@@ -1234,7 +1234,7 @@ namespace scythe {
* ((newmu + std::sqrt(-2 * variance * std::log(z)))
- below) + below;
}
- if (! finite(x)) {
+ if (! R_finite(x)) {
SCYTHE_WARN("Mean extremely far from truncation point. "
<< "Returning truncation point");
return above;
diff --git a/src/smath.h b/src/smath.h
index 3669358..052787b 100644
--- a/src/smath.h
+++ b/src/smath.h
@@ -66,7 +66,7 @@ namespace scythe {
NAME (const Matrix<T,PO,PS>& A) \
{ \
Matrix<T,RO,RS> res(A.rows(), A.cols(), false); \
- std::transform(A.begin_f(), A.end_f(), res.begin_f(), OP); \
+ std::transform(A.begin_f(), A.end_f(), res.begin_f(), (T (*) (T))OP); \
return res; \
} \
\
@@ -96,15 +96,15 @@ namespace scythe {
if (A.size() == 1) { \
res.resize2Match(B); \
std::transform(B.template begin_f<RO>(), B.template end_f<RO>(),\
- res.begin_f(), std::bind1st(OP, A(0))); \
+ res.begin_f(), std::bind1st(std::ptr_fun((T (*) (T, S))OP), A(0))); \
} else if (B.size() == 1) { \
res.resize2Match(A); \
std::transform(A.template begin_f<RO>(), A.template end_f<RO>(),\
- res.begin_f(), std::bind2nd(OP, B(0))); \
+ res.begin_f(), std::bind2nd(std::ptr_fun((T (*) (T, S))OP), B(0))); \
} else { \
res.resize2Match(A); \
std::transform(A.template begin_f<RO>(), A.template end_f<RO>(),\
- B.template begin_f<RO>(), res.begin_f(), OP); \
+ B.template begin_f<RO>(), res.begin_f(), (T (*) (T, S))OP); \
} \
\
return res; \
@@ -329,7 +329,7 @@ namespace scythe {
* \see atanh()
*/
- SCYTHE_MATH_OP_2ARG(atan2, std::ptr_fun(::atan2))
+ SCYTHE_MATH_OP_2ARG(atan2, ::atan2)
/* calc the cube root of each element of a Matrix */
/*!
@@ -373,7 +373,7 @@ namespace scythe {
* \param B The matrix whose signs will comprise the resultant matrix
*/
- SCYTHE_MATH_OP_2ARG(copysign, std::ptr_fun(::copysign))
+ SCYTHE_MATH_OP_2ARG(copysign, ::copysign)
/* calc the cosine of each element of a Matrix */
@@ -488,7 +488,7 @@ namespace scythe {
* \param A The matrix whose absolute values are to be taken.
*/
- SCYTHE_MATH_OP(fabs, ::fabs)
+ SCYTHE_MATH_OP(fabs, (T (*) (T))::fabs)
/* calc the floor of each element of a Matrix */
/*!
@@ -515,7 +515,7 @@ namespace scythe {
* \param B the matrix to serve as divisor
*/
- SCYTHE_MATH_OP_2ARG(fmod, std::ptr_fun(::fmod))
+ SCYTHE_MATH_OP_2ARG(fmod, ::fmod)
/* calc the fractional val of input and return exponents in int
* matrix reference
@@ -565,7 +565,7 @@ namespace scythe {
* \param B Input matrix
*/
- SCYTHE_MATH_OP_2ARG(hypot, std::ptr_fun(::hypot))
+ SCYTHE_MATH_OP_2ARG(hypot, ::hypot)
/* return (int) logb */
SCYTHE_MATH_OP(ilogb, ::ilogb)
@@ -626,7 +626,7 @@ namespace scythe {
* \see yn()
*/
- SCYTHE_MATH_OP_2ARG(jn, std::ptr_fun(::jn))
+ SCYTHE_MATH_OP_2ARG(jn, ::jn)
/* calc x * 2 ^ex */
/*!
@@ -638,7 +638,7 @@ namespace scythe {
* \param A Matrix whose elements are to be multiplied
* \param ex Matrix of powers to which 2 will be raised.
*/
- SCYTHE_MATH_OP_2ARG(ldexp, std::ptr_fun(::ldexp))
+ SCYTHE_MATH_OP_2ARG(ldexp, ::ldexp)
/* compute the natural log of the absval of gamma function */
@@ -668,7 +668,7 @@ namespace scythe {
* \see logb()
*/
- SCYTHE_MATH_OP(log, ::log)
+ SCYTHE_MATH_OP(log, (T (*)(T))::log)
/* calc the base-10 log of each element of a Matrix */
/*!
@@ -759,10 +759,10 @@ namespace scythe {
* \param A Matrix to be exponentiated
* \param ex Desired exponent
*/
- SCYTHE_MATH_OP_2ARG(pow, std::ptr_fun(::pow))
+ SCYTHE_MATH_OP_2ARG(pow, ::pow)
/* calc rem == x - n * y */
- SCYTHE_MATH_OP_2ARG(remainder, std::ptr_fun(::remainder))
+ SCYTHE_MATH_OP_2ARG(remainder, ::remainder)
/* return x rounded to nearest int */
@@ -778,7 +778,7 @@ namespace scythe {
SCYTHE_MATH_OP(rint, ::rint)
/* returns x * FLT_RADIX^ex */
- SCYTHE_MATH_OP_2ARG(scalbn, std::ptr_fun(::scalbn))
+ SCYTHE_MATH_OP_2ARG(scalbn, ::scalbn)
/* calc the sine of x */
@@ -841,7 +841,7 @@ namespace scythe {
*/
- SCYTHE_MATH_OP(sqrt, ::sqrt)
+ SCYTHE_MATH_OP(sqrt, (T (*)(T))::sqrt)
/* calc the tangent of x */
@@ -948,7 +948,7 @@ namespace scythe {
* \see y1()
*/
- SCYTHE_MATH_OP_2ARG(yn, std::ptr_fun(::yn))
+ SCYTHE_MATH_OP_2ARG(yn, ::yn)
} // end namespace scythe
diff --git a/src/stat.h b/src/stat.h
index 8160073..cec48a7 100644
--- a/src/stat.h
+++ b/src/stat.h
@@ -231,7 +231,7 @@ namespace scythe {
if (n % 2 == 0)
return ((temp[n / 2] + temp[n / 2 - 1]) / 2);
else
- return temp[(uint) ::floor(n / 2)];
+ return temp[n / 2];
}
/* Calculate the median of each column of a matrix */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-mcmcpack.git
More information about the debian-science-commits
mailing list