[r-cran-bayesm] 36/44: Import Upstream version 2.2-4

[Andreas Tille]

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 7ef74976130fd332ea34da49ee11a2e1ae97d5d9
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 7 13:10:15 2017 +0200

    Import Upstream version 2.2-4
---
 DESCRIPTION          |  12 ++++++------
 R/rivDP.R            |   2 +-
 data/Scotch.rda      | Bin 212574 -> 5884 bytes
 data/bank.rda        | Bin 1154613 -> 19808 bytes
 data/cheese.rda      | Bin 201974 -> 63768 bytes
 data/customerSat.rda | Bin 93417 -> 9240 bytes
 data/detailing.rda   | Bin 687283 -> 33336 bytes
 data/margarine.rda   | Bin 491229 -> 23316 bytes
 data/orangeJuice.rda | Bin 1156010 -> 589012 bytes
 data/tuna.rda        | Bin 48101 -> 40120 bytes
 src/thetadraw.c      |   3 ++-
 11 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 201f1d2..04d5969 100755
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,10 +1,10 @@
 Package: bayesm
-Version: 2.2-3
-Date: 2010-08-11
+Version: 2.2-4
+Date: 2011-02-25
 Title: Bayesian Inference for Marketing/Micro-econometrics
-Author: Peter Rossi <perossi at gmail.com>.
+Author: Peter Rossi <perossichi at gmail.com>.
 Maintainer: Peter Rossi <perossichi at gmail.com>
-Depends: R (>= 2.5.1)
+Depends: R (>= 2.12.1)
 Description: bayesm covers many important models used in marketing and
         micro-econometrics applications. The package includes: Bayes
         Regression (univariate or multivariate dep var), Bayes
@@ -27,6 +27,6 @@ Description: bayesm covers many important models used in marketing and
         McCulloch.
 License: GPL (>= 2)
 URL: http://www.perossi.org/home/bsm-1
-Packaged: 2010-08-11 19:29:22 UTC; perossichi
+Packaged: 2011-02-26 20:38:56 UTC; perossichi
 Repository: CRAN
-Date/Publication: 2010-08-11 20:01:11
+Date/Publication: 2011-02-27 18:04:44
diff --git a/R/rivDP.R b/R/rivDP.R
index 8a7dfee..f222266 100755
--- a/R/rivDP.R
+++ b/R/rivDP.R
@@ -72,7 +72,7 @@ if(missing(Data)) {pandterm("Requires Data argument -- list of z,w,x,y")}
 #
 n=length(y)
 if(isgamma)
-   {if(is.matrix(w)) {pandterm("w is not a matrix")}
+   {if(!is.matrix(w)) {pandterm("w is not a matrix")}
    dimg=ncol(w)
    if(n != nrow(w) ) {pandterm("length(y) ne nrow(w)")}}
 
diff --git a/data/Scotch.rda b/data/Scotch.rda
index 0dc3b8b..d914c1a 100755
Binary files a/data/Scotch.rda and b/data/Scotch.rda differ
diff --git a/data/bank.rda b/data/bank.rda
index 84b49e6..195d5dc 100755
Binary files a/data/bank.rda and b/data/bank.rda differ
diff --git a/data/cheese.rda b/data/cheese.rda
index 6a89bc1..9f3ede2 100755
Binary files a/data/cheese.rda and b/data/cheese.rda differ
diff --git a/data/customerSat.rda b/data/customerSat.rda
index b34a8be..1204287 100755
Binary files a/data/customerSat.rda and b/data/customerSat.rda differ
diff --git a/data/detailing.rda b/data/detailing.rda
index 04bc634..b640f1f 100755
Binary files a/data/detailing.rda and b/data/detailing.rda differ
diff --git a/data/margarine.rda b/data/margarine.rda
index 52a8690..ff7eaf9 100755
Binary files a/data/margarine.rda and b/data/margarine.rda differ
diff --git a/data/orangeJuice.rda b/data/orangeJuice.rda
index 6c0c69e..2abc091 100755
Binary files a/data/orangeJuice.rda and b/data/orangeJuice.rda differ
diff --git a/data/tuna.rda b/data/tuna.rda
index 33eed3c..78442af 100755
Binary files a/data/tuna.rda and b/data/tuna.rda differ
diff --git a/src/thetadraw.c b/src/thetadraw.c
index 7a2b417..2c63ede 100755
--- a/src/thetadraw.c
+++ b/src/thetadraw.c
@@ -6,6 +6,7 @@
 
 /* modified by rossi 7/06 to remove thetaStar argument and copy */
 /* modified by rossi 7/06 to remove theta copy and modify directly */
+/* modified by rossi 8/10 to fix error in allocation of size of newrow */
 
 /* function to make multinomial draws */
 
@@ -77,7 +78,7 @@ SEXP  thetadraw( SEXP y,  SEXP ydenmatO, SEXP indicO, SEXP q0v, SEXP p,
    PROTECT(ydim=GET_DIM(y));
    ncol=INTEGER_POINTER(ydim)[1];
    PROTECT(yrow=NEW_NUMERIC(ncol));
-   PROTECT(newrow=NEW_NUMERIC(ncol));
+   PROTECT(newrow=NEW_NUMERIC(n));
    PROTECT(ydenmat=NEW_NUMERIC(maxuniq*n));
    PROTECT(ydendim=NEW_INTEGER(2));
    INTEGER_POINTER(ydendim)[0]=maxuniq;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-bayesm.git