[r-cran-mcmcpack] 30/90: Imported Upstream version 0.9-4
Andreas Tille
tille at debian.org
Fri Dec 16 09:07:37 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 c47f73a1b0d9858d1799c7964d172f1bccf44bb9
Author: Andreas Tille <tille at debian.org>
Date: Fri Dec 16 08:07:12 2016 +0100
Imported Upstream version 0.9-4
---
DESCRIPTION | 8 ++++----
HISTORY | 6 +++++-
NAMESPACE | 1 +
R/MCMCmetrop1R.R | 1 +
man/MCMCirtKd.Rd | 4 ++--
man/MCMCpoissonChangepoint.Rd | 0
man/plotChangepoint.Rd | 0
man/plotState.Rd | 0
src/ide.h | 16 ++++++++--------
src/la.h | 4 ++--
src/matrix.h | 4 ++--
11 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 1cdc59d..527a495 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,12 +1,12 @@
Package: MCMCpack
-Version: 0.9-3
-Date: 2007-10-16
+Version: 0.9-4
+Date: 2008-3-3
Title: Markov chain Monte Carlo (MCMC) Package
Author: Andrew D. Martin <admartin at wustl.edu>,
Kevin M. Quinn <kevin_quinn at harvard.edu>,
Jong Hee Park <jhp at uchicago.edu>
Maintainer: Andrew D. Martin <admartin at wustl.edu>
-Depends: R (>= 2.5.0), coda (>= 0.11-3), MASS, stats
+Depends: R (>= 2.6.0), coda (>= 0.11-3), MASS, stats
Description: This package contains functions to perform Bayesian
inference using posterior simulation for a number of statistical
models. Most simulation is done in compiled C++ written in the Scythe
@@ -19,4 +19,4 @@ Description: This package contains functions to perform Bayesian
License: GPL version 2
SystemRequirements: gcc (>= 4.0)
URL: http://mcmcpack.wustl.edu
-Packaged: Tue Oct 16 20:11:20 2007; adm
+Packaged: Mon Mar 3 11:38:07 2008; adm
diff --git a/HISTORY b/HISTORY
index 7775a53..8de0702 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,6 +2,10 @@
// Changes and Bug Fixes
//
+0.9-3 to 0.9-4
+ * fixed issue with MCMCmetrop1R.R [thanks to Jim Albert]
+ * fixed Linux compilation issue [thanks to Chris Lawrence]
+
0.9-2 to 0.9-3
* added gcc 4.0 check in configure.ac and SystemRequirements
* added verbose option to plotChangepoint()
@@ -26,7 +30,7 @@
* fixed bug in how models with marginal likelihood calculations check for
prior propriety [thanks to Gary Rosner for spotting this]
* fixed bug in how MCMCmetrop1R handled a singular Hessian
- [thanks to Piers Dunstan for spotting this]
+ [thanks to Piers Dunstan for spotting this]
0.7-4 to 0.8-1
* added MCMCPoissonChangepoint() model (authored by Jong Hee Park)
diff --git a/NAMESPACE b/NAMESPACE
index 67c7087..aecee80 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -17,6 +17,7 @@ export(
MCnormalnormal,
MCmultinomdirichlet,
MCMCdynamicEI,
+## MCMCdynamicIRT1d,
MCMCfactanal,
MCMChierEI,
MCMCirt1d,
diff --git a/R/MCMCmetrop1R.R b/R/MCMCmetrop1R.R
index 41ba0f3..7106227 100644
--- a/R/MCMCmetrop1R.R
+++ b/R/MCMCmetrop1R.R
@@ -113,6 +113,7 @@
stop("Check V and call MCMCmetrop1R() again. \n",
call.=FALSE)
}
+ V <- tune %*% V %*% tune
}
## Call the C++ function to do the MCMC sampling
diff --git a/man/MCMCirtKd.Rd b/man/MCMCirtKd.Rd
index 8b27852..2325fce 100644
--- a/man/MCMCirtKd.Rd
+++ b/man/MCMCirtKd.Rd
@@ -110,7 +110,7 @@ MCMCirtKd(datamatrix, dimensions, item.constraints=list(),
\item{drop.constant.items}{A switch that determines whether or not
items that have no variation
- should be deleted before fitting the model. Default = TRUE.}
+ should be deleted before fitting the model. Default = TRUE.}
\item{...}{further arguments to be passed}
}
@@ -150,7 +150,7 @@ MCMCirtKd(datamatrix, dimensions, item.constraints=list(),
\eqn{j}{j} on item \eqn{i}{i} is the observed data matrix which
is \eqn{(I \times J)}{(I * J)}. We assume that the choice is
dictated by an unobserved utility: \deqn{z_{i,j} = - \alpha_i +
- \beta_i' \theta_j + \varepsilon_{i,j}}{z_ij = alpha_i +
+ \beta_i' \theta_j + \varepsilon_{i,j}}{z_ij = - alpha_i +
beta_i'*theta_j + epsilon_ij} Where the
\eqn{\varepsilon_{i,j}}{epsilon_ij}s are assumed to be
distributed standard normal. The parameters of interest are
diff --git a/man/MCMCpoissonChangepoint.Rd b/man/MCMCpoissonChangepoint.Rd
old mode 100755
new mode 100644
diff --git a/man/plotChangepoint.Rd b/man/plotChangepoint.Rd
old mode 100755
new mode 100644
diff --git a/man/plotState.Rd b/man/plotState.Rd
old mode 100755
new mode 100644
diff --git a/src/ide.h b/src/ide.h
index c2f32b8..2302882 100644
--- a/src/ide.h
+++ b/src/ide.h
@@ -919,7 +919,7 @@ namespace scythe {
#ifdef SCYTHE_LAPACK
template<>
- Matrix<>
+ inline Matrix<>
cholesky (const Matrix<>& A)
{
SCYTHE_DEBUG_MSG("Using lapack/blas for cholesky");
@@ -953,7 +953,7 @@ namespace scythe {
}
template<>
- Matrix<>
+ inline Matrix<>
chol_solve (const Matrix<>& A, const Matrix<>& b, const Matrix<>& M)
{
SCYTHE_DEBUG_MSG("Using lapack/blas for chol_solve");
@@ -989,7 +989,7 @@ namespace scythe {
}
template<>
- Matrix<>
+ inline Matrix<>
chol_solve (const Matrix<>& A, const Matrix<>& b)
{
SCYTHE_DEBUG_MSG("Using lapack/blas for chol_solve");
@@ -1138,7 +1138,7 @@ namespace scythe {
* \throw scythe_null_error (Level 1)
* \throw scythe_lapack_internal_error (Level 1)
*/
- QRdecomp
+ inline QRdecomp
qr_decomp (const Matrix<>& A)
{
SCYTHE_DEBUG_MSG("Using lapack/blas for qr_decomp");
@@ -1275,7 +1275,7 @@ namespace scythe {
Matrix<> result(A.cols(), b.cols(), false);
for (uint i = 0; i < QR.pivot.size(); ++i)
- result(i, _) = bb(QR.pivot(i), _);
+ result(i, _) = bb((uint) QR.pivot(i), _);
return result;
}
@@ -1396,7 +1396,7 @@ namespace scythe {
}
template<>
- Matrix<>
+ inline Matrix<>
invpd (const Matrix<>& A)
{
SCYTHE_DEBUG_MSG("Using lapack/blas for invpd");
@@ -1434,7 +1434,7 @@ namespace scythe {
}
template<>
- Matrix<>
+ inline Matrix<>
invpd (const Matrix<>& A, const Matrix<>& M)
{
SCYTHE_DEBUG_MSG("Using lapack/blas for invpd");
@@ -1467,7 +1467,7 @@ namespace scythe {
}
template <>
- Matrix<>
+ inline Matrix<>
inv(const Matrix<>& A)
{
SCYTHE_DEBUG_MSG("Using lapack/blas for inv");
diff --git a/src/la.h b/src/la.h
index 579ea14..c8bb351 100644
--- a/src/la.h
+++ b/src/la.h
@@ -924,7 +924,7 @@ namespace scythe {
*/
template<>
- Matrix<>
+ inline Matrix<>
gaxpy<Col,Concrete,double,Col,Concrete,Col,Concrete,Col,Concrete>
(const Matrix<>& A, const Matrix<>& B, const Matrix<>& C)
{
@@ -960,7 +960,7 @@ namespace scythe {
}
template<>
- Matrix<>
+ inline Matrix<>
crossprod(const Matrix<>& A)
{
SCYTHE_DEBUG_MSG("Using lapack/blas for crossprod");
diff --git a/src/matrix.h b/src/matrix.h
index ea4437b..0432a17 100644
--- a/src/matrix.h
+++ b/src/matrix.h
@@ -44,7 +44,7 @@
#ifndef SCYTHE_MATRIX_H
#define SCYTHE_MATRIX_H
-//#include <climits>
+#include <climits>
#include <iostream>
#include <iomanip>
#include <string>
@@ -5052,7 +5052,7 @@ namespace scythe {
*/
template<>
- Matrix<>
+ inline Matrix<>
operator*<double,Col,Concrete,Col,Concrete>
(const Matrix<>& lhs, const Matrix<>& rhs)
{
--
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