[r-cran-bayesm] 17/44: Import Upstream version 2.0-5
Andreas Tille
tille at debian.org
Thu Sep 7 11:16:21 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-bayesm.
commit e4a3e1dad509101b89797196342501097fae117c
Author: Andreas Tille <tille at debian.org>
Date: Thu Sep 7 13:08:58 2017 +0200
Import Upstream version 2.0-5
---
DESCRIPTION | 6 +--
R/WS_FTP.LOG | 106 +++++++++++++++++++++++------------------------
R/lndIWishart.R | 12 +++---
R/lndMvn.R | 7 +++-
R/lndMvst.R | 11 ++++-
R/rhierMnlRwMixture.R | 21 ++++++----
man/lndIWishart.Rd | 7 ++--
man/lndMvn.Rd | 3 +-
man/lndMvst.Rd | 4 +-
man/rhierMnlRwMixture.Rd | 2 +-
10 files changed, 96 insertions(+), 83 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 6e8f3be..4c00574 100755
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
Package: bayesm
-Version: 2.0-3
-Date: 2005-11-29
+Version: 2.0-5
+Date: 2005-12-26
Title:Bayesian Inference for Marketing/Micro-econometrics
Author: Peter Rossi <peter.rossi at ChicagoGsb.edu>,
Rob McCulloch <robert.mcculloch at ChicagoGsb.edu>.
@@ -28,4 +28,4 @@ Description: bayesm covers many important models used
Marketing by Rossi, Allenby and McCulloch.
License: GPL (version 2 or later)
URL: http://gsbwww.uchicago.edu/fac/peter.rossi/research/bsm.html
-Packaged: Tue Nov 29 14:26:39 2005; per
+Packaged: Mon Dec 26 12:50:05 2005; per
diff --git a/R/WS_FTP.LOG b/R/WS_FTP.LOG
index d7c7d5d..ee38173 100755
--- a/R/WS_FTP.LOG
+++ b/R/WS_FTP.LOG
@@ -1,53 +1,53 @@
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\breg.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code breg.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\cgetC.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code cgetC.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\clusterMix.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code clusterMix.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\condMom.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code condMom.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\createX.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code createX.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\eMixMargDen.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code eMixMargDen.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\fsh.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code fsh.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\ghkvec.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code ghkvec.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\init.rmultiregfp.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code init.rmultiregfp.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\llmnl.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code llmnl.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\llmnp.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code llmnp.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\llnhlogit.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code llnhlogit.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\lndIChisq.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code lndIChisq.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\lndIWishart.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code lndIWishart.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\lndMvn.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code lndMvn.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\lndMvst.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code lndMvst.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\logMargDenNR.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code logMargDenNR.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\mixDen.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code mixDen.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\mixDenBi.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code mixDenBi.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\mnlHess.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code mnlHess.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\mnpProb.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code mnpProb.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\momMix.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code momMix.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\nmat.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code nmat.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\numEff.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code numEff.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rbiNormGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rbiNormGibbs.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rbprobitGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rbprobitGibbs.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rdirichlet.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rdirichlet.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rhierBinLogit.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rhierBinLogit.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rhierLinearModel.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rhierLinearModel.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rhierMnlRwMixture.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rhierMnlRwMixture.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rhierNegbinRw.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rhierNegbinRw.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rivGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rivGibbs.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rmixGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmixGibbs.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rmixture.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmixture.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rmnlIndepMetrop.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmnlIndepMetrop.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rmnpGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmnpGibbs.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rmultireg.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmultireg.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rmultiregfp.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmultiregfp.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rmvpGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmvpGibbs.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rmvst.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmvst.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rnegbinRw.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rnegbinRw.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rnmixGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rnmixGibbs.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rscaleUsage.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rscaleUsage.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rsurGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rsurGibbs.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rtrun.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rtrun.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\runireg.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code runireg.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\runiregGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code runiregGibbs.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\rwishart.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rwishart.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\simmnl.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code simmnl.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\simmnlwX.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code simmnlwX.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\simmnp.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code simmnp.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\simmvp.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code simmvp.R
-2005.09.30 11:28 B C:\userdata\per\res\R_package\bayesm\v201\bayesm\R\simnhlogit.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code simnhlogit.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\breg.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code breg.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\cgetC.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code cgetC.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\clusterMix.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code clusterMix.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\condMom.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code condMom.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\createX.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code createX.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\eMixMargDen.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code eMixMargDen.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\fsh.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code fsh.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\ghkvec.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code ghkvec.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\init.rmultiregfp.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code init.rmultiregfp.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\llmnl.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code llmnl.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\llmnp.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code llmnp.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\llnhlogit.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code llnhlogit.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\lndIChisq.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code lndIChisq.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\lndIWishart.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code lndIWishart.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\lndMvn.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code lndMvn.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\lndMvst.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code lndMvst.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\logMargDenNR.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code logMargDenNR.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\mixDen.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code mixDen.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\mixDenBi.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code mixDenBi.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\mnlHess.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code mnlHess.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\mnpProb.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code mnpProb.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\momMix.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code momMix.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\nmat.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code nmat.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\numEff.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code numEff.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rbiNormGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rbiNormGibbs.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rbprobitGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rbprobitGibbs.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rdirichlet.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rdirichlet.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rhierBinLogit.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rhierBinLogit.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rhierLinearModel.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rhierLinearModel.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rhierMnlRwMixture.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rhierMnlRwMixture.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rhierNegbinRw.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rhierNegbinRw.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rivGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rivGibbs.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rmixGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmixGibbs.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rmixture.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmixture.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rmnlIndepMetrop.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmnlIndepMetrop.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rmnpGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmnpGibbs.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rmultireg.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmultireg.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rmultiregfp.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmultiregfp.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rmvpGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmvpGibbs.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rmvst.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rmvst.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rnegbinRw.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rnegbinRw.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rnmixGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rnmixGibbs.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rscaleUsage.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rscaleUsage.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rsurGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rsurGibbs.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rtrun.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rtrun.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\runireg.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code runireg.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\runiregGibbs.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code runiregGibbs.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\rwishart.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code rwishart.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\simmnl.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code simmnl.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\simmnlwX.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code simmnlwX.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\simmnp.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code simmnp.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\simmvp.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code simmvp.R
+2005.12.23 13:23 B C:\userdata\per\res\R_package\bayesm\v204\bayesm\R\simnhlogit.R --> gsbwww.chicagogsb.edu /opt/ns-home/docs/fac/peter.rossi/research/bayes book/bayesm/function code simnhlogit.R
diff --git a/R/lndIWishart.R b/R/lndIWishart.R
index 197e23a..7e64919 100755
--- a/R/lndIWishart.R
+++ b/R/lndIWishart.R
@@ -1,5 +1,5 @@
lndIWishart=
-function(nu,S,IW)
+function(nu,V,IW)
{
#
# P. Rossi 12/04
@@ -9,17 +9,17 @@ function(nu,S,IW)
#
# arguments:
# nu is d. f. parm
-# S is location matrix
+# V is location matrix
# IW is the value at which the density should be evaluated
#
# output:
# value of log density
#
-# note: in this parameterization, E[IW]=S/(nu-k-1)
+# note: in this parameterization, E[IW]=V/(nu-k-1)
#
-k=ncol(S)
+k=ncol(V)
Uiw=chol(IW)
-lndetSd2=sum(log(diag(chol(S))))
+lndetVd2=sum(log(diag(chol(V))))
lndetIWd2=sum(log(diag(Uiw)))
#
# first evaluate constant
@@ -27,5 +27,5 @@ lndetIWd2=sum(log(diag(Uiw)))
const=((nu*k)/2)*log(2)+((k*(k-1))/4)*log(pi)
arg=(nu+1-c(1:k))/2
const=const+sum(lgamma(arg))
-return(-const+nu*lndetSd2-(nu+k+1)*lndetIWd2-.5*sum(diag(S%*%chol2inv(Uiw))))
+return(-const+nu*lndetVd2-(nu+k+1)*lndetIWd2-.5*sum(diag(V%*%chol2inv(Uiw))))
}
diff --git a/R/lndMvn.R b/R/lndMvn.R
index bafc680..d99ab93 100755
--- a/R/lndMvn.R
+++ b/R/lndMvn.R
@@ -2,12 +2,15 @@ lndMvn=
function(x,mu,rooti)
{
#
+# changed 12/05 by Rossi to include normalizing constant
+#
# function to evaluate log of MV NOrmal density with mean mu, var Sigma
-# and with sigma^-1=rooti%*%t(rooti)
+# Sigma=t(root)%*%root (root is upper tri cholesky root)
+# Sigma^-1=rooti%*%t(rooti)
# rooti is in the inverse of upper triangular chol root of sigma
# note: this is the UL decomp of sigmai not LU!
# Sigma=root'root root=inv(rooti)
#
z=as.vector(t(rooti)%*%(x-mu))
-return(-.5*(z%*%z) + sum(log(diag(rooti))))
+return( -(length(x)/2)*log(2*pi) -.5*(z%*%z) + sum(log(diag(rooti))))
}
diff --git a/R/lndMvst.R b/R/lndMvst.R
index ad756be..439e7aa 100755
--- a/R/lndMvst.R
+++ b/R/lndMvst.R
@@ -1,12 +1,19 @@
lndMvst=
-function(x,nu,mu,rooti)
+function(x,nu,mu,rooti,NORMC=FALSE)
{
#
+# modified by Rossi 12/2005 to include normalizing constant
+#
# function to evaluate log of MVstudent t density with nu df, mean mu,
# and with sigmai=rooti%*%t(rooti) note: this is the UL decomp of sigmai not LU!
# rooti is in the inverse of upper triangular chol root of sigma
# or Sigma=root'root root=inv(rooti)
#
+dim=length(x)
+if(NORMC)
+ {constant=(nu/2)*log(nu)+lgamma((nu+dim)/2)-(dim/2)*log(pi)-lgamma(nu/2)}
+ else
+ {constant=0}
z=as.vector(t(rooti)%*%(x-mu))
-return(-((length(x)+nu)/2)*log(nu+z%*%z)+sum(log(diag(rooti))))
+return(constant -((dim+nu)/2)*log(nu+z%*%z)+sum(log(diag(rooti))))
}
diff --git a/R/rhierMnlRwMixture.R b/R/rhierMnlRwMixture.R
index a00760e..3c80969 100755
--- a/R/rhierMnlRwMixture.R
+++ b/R/rhierMnlRwMixture.R
@@ -6,6 +6,7 @@ function(Data,Prior,Mcmc)
# changed 12/17/04 by rossi to fix bug in drawdelta when there is zero/one unit
# in a mixture component
# added loglike output, changed to reflect new argument order in llmnl, mnlHess 9/05
+# changed weighting scheme to (1-w)logl_i + w*Lbar (normalized) 12/05
#
# purpose: run hierarchical mnl logit model with mixture of normals
# using RW and cov(RW inc) = (hess_i + Vbeta^-1)^-1
@@ -49,8 +50,8 @@ function(Data,Prior,Mcmc)
# MCMC parameters
# s is the scaling parameter for the RW inc covariance matrix; s^2 Var is inc cov
# matrix
-# c is parameter for weighting function in fractional likelihood
-# weight= n_i/(cN)
+# w is parameter for weighting function in fractional likelihood
+# w is the weight on the normalized pooled likelihood
# R is number of draws
# keep is thinning parameter, keep every keepth draw
#
@@ -135,7 +136,7 @@ if(missing(Mcmc))
else
{
if(is.null(Mcmc$s)) {s=2.93/sqrt(nvar)} else {s=Mcmc$s}
- if(is.null(Mcmc$c)) {c=2} else {c=Mcmc$c}
+ if(is.null(Mcmc$w)) {w=.1} else {w=Mcmc$w}
if(is.null(Mcmc$keep)) {keep=1} else {keep=Mcmc$keep}
if(is.null(Mcmc$R)) {pandterm("Requires R argument in Mcmc list")} else {R=Mcmc$R}
}
@@ -167,7 +168,7 @@ if(drawdelta)
}
cat(" ",fill=TRUE)
cat("MCMC Parms: ",fill=TRUE)
-cat(paste("s=",round(s,3)," c= ",c," R= ",R," keep= ",keep),fill=TRUE)
+cat(paste("s=",round(s,3)," w= ",w," R= ",R," keep= ",keep),fill=TRUE)
cat("",fill=TRUE)
#
# allocate space for draws
@@ -185,9 +186,9 @@ compdraw=NULL
# create functions needed
#
llmnlFract=
-function(beta,y,X,betapooled,rootH,w){
+function(beta,y,X,betapooled,rootH,w,wgt){
z=as.vector(rootH%*%(beta-betapooled))
-return(llmnl(beta,y,X)+w*(-.5*(z%*%z)))
+return((1-w)*llmnl(beta,y,X)+w*wgt*(-.5*(z%*%z)))
}
mnlRwMetropOnce=
@@ -255,7 +256,9 @@ fsh()
#
# now go thru and computed fraction likelihood estimates and hessians
#
-# Lbar_i=L_i x L^w
+# Lbar=log(pooled likelihood^(n_i/N))
+#
+# fraction loglike = (1-w)*loglike_i + w*Lbar
#
betainit=c(rep(0,nvar))
#
@@ -268,9 +271,9 @@ H=mnlHess(betapooled,ypooled,Xpooled)
rootH=chol(H)
for (i in 1:nlgt)
{
- w=length(lgtdata[[i]]$y)/(c*length(ypooled))
+ wgt=length(lgtdata[[i]]$y)/length(ypooled)
out=optim(betapooled,llmnlFract,method="BFGS",control=list( fnscale=-1,trace=0,reltol=1e-4),
- X=lgtdata[[i]]$X,y=lgtdata[[i]]$y,betapooled=betapooled,rootH=rootH,w=w)
+ X=lgtdata[[i]]$X,y=lgtdata[[i]]$y,betapooled=betapooled,rootH=rootH,w=w,wgt=wgt)
if(out$convergence == 0)
{ hess=mnlHess(out$par,lgtdata[[i]]$y,lgtdata[[i]]$X)
lgtdata[[i]]=c(lgtdata[[i]],list(converge=1,betafmle=out$par,hess=hess)) }
diff --git a/man/lndIWishart.Rd b/man/lndIWishart.Rd
index 538e8b4..e70b4af 100755
--- a/man/lndIWishart.Rd
+++ b/man/lndIWishart.Rd
@@ -8,15 +8,16 @@
\code{lndIWishart} computes the log of an Inverted Wishart density.
}
\usage{
-lndIWishart(nu, S, IW)
+lndIWishart(nu, V, IW)
}
\arguments{
\item{nu}{ d.f. parameter }
- \item{S}{ "location" parameter }
+ \item{V}{ "location" parameter }
\item{IW}{ ordinate for density evaluation }
}
\details{
- \eqn{Z = Wishart(nu,V^{-1})^{-1}}, \eqn{Z} \eqn{\sim}{~} Inverted Wishart(nu,V). \cr
+ \eqn{Z} \eqn{\sim}{~} Inverted Wishart(nu,V). \cr
+ in this parameterization, \eqn{E[Z]=1/(nu-k-1) V}, V is a k x k matirx
\code{lndIWishart} computes the complete log-density, including normalizing constants.
}
\value{
diff --git a/man/lndMvn.Rd b/man/lndMvn.Rd
index ddfc49e..d462ebd 100755
--- a/man/lndMvn.Rd
+++ b/man/lndMvn.Rd
@@ -16,11 +16,10 @@ lndMvn(x, mu, rooti)
\arguments{
\item{x}{ density ordinate }
\item{mu}{ mu vector }
- \item{rooti}{ inv of Cholesky root of Sigma }
+ \item{rooti}{ inv of Upper Triangular Cholesky root of Sigma }
}
\details{
\eqn{z} \eqn{\sim}{~} \eqn{N(mu,\Sigma)}
- note: does not include full normalizing constant
}
\value{
log density value
diff --git a/man/lndMvst.Rd b/man/lndMvst.Rd
index b51d9f7..664b3da 100755
--- a/man/lndMvst.Rd
+++ b/man/lndMvst.Rd
@@ -9,7 +9,7 @@
\code{lndMvst} computes the log of a Multivariate Student-t Density.
}
\usage{
-lndMvst(x, nu, mu, rooti)
+lndMvst(x, nu, mu, rooti,NORMC)
}
\arguments{
@@ -17,11 +17,11 @@ lndMvst(x, nu, mu, rooti)
\item{nu}{ d.f. parameter }
\item{mu}{ mu vector }
\item{rooti}{ inv of Cholesky root of Sigma }
+ \item{NORMC}{ include normalizing constant, def: FALSE }
}
\details{
\eqn{z} \eqn{\sim}{~} \eqn{MVst(mu,nu,\Sigma)}
- note: does not include full normalizing constant
}
\value{
log density value
diff --git a/man/rhierMnlRwMixture.Rd b/man/rhierMnlRwMixture.Rd
index 520687b..0349402 100755
--- a/man/rhierMnlRwMixture.Rd
+++ b/man/rhierMnlRwMixture.Rd
@@ -83,7 +83,7 @@ rhierMnlRwMixture(Data, Prior, Mcmc)
to a weight between 0 and 1. w is the fractional weight on the normalized pooled likelihood.
This differs from what is in Rossi et al chapter 5, i.e.
- \eqn{like_i^(1-w) x like_pooled^(n_i/N)*w}
+ \eqn{like_i^(1-w) x like_pooled^((n_i/N)*wi)}
Large R values may be required (>20,000).
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-bayesm.git
More information about the debian-science-commits
mailing list