[Depmix-commits] r270 - / trunk trunk/R

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

Author: ingmarvisser
Date: 2009-05-13 15:24:41 +0200 (Wed, 13 May 2009)
New Revision: 270

Modified:
   todo
   trunk/DESCRIPTION
   trunk/NEWS
   trunk/R/depmixfit.R
Log:
Fixed conrows warning (bug #342)

Modified: todo
===================================================================
--- todo	2009-05-13 13:07:39 UTC (rev 269)
+++ todo	2009-05-13 13:24:41 UTC (rev 270)
@@ -7,26 +7,22 @@
 	- similarly for actual markov models and mixture models
 
 2) add example of adding new response model to JSS paper: exgaus models
-for speed data
+for speed data
 
-3) check models with boundary values in the transition and initial
-state probabilities (possibly work on identity link for multinomial
-models, but this involves also adding parstruct or something like it
-to the response models to incorporate linear constraints within those
-parameter vectors)
-
-4) write the paper
+3) write the paper
 
-5) balance data set refs toevoegen en toestemming vragen aan Brenda, data set 
+4) balance data set refs toevoegen en toestemming vragen aan Brenda, data set 
 reduceren dmv random subset
 
-6) Tests: 
+5) Tests: 
 	- make output files for test files
 
-7) Bugs: 
+6) Bugs: 
 	- check error sent by Rita Gaio
 	- check error by Maartje
 
+
+
 
 TODO Medium term
 
@@ -41,6 +37,12 @@
 
 4) Get Hessian for standard errors (computed by e.g. Louis' method)
 
+5) check models with boundary values in the transition and initial
+state probabilities (possibly work on identity link for multinomial
+models, but this involves also adding parstruct or something like it
+to the response models to incorporate linear constraints within those
+parameter vectors)
+
 
 TODO long term 
 

Modified: trunk/DESCRIPTION
===================================================================
--- trunk/DESCRIPTION	2009-05-13 13:07:39 UTC (rev 269)
+++ trunk/DESCRIPTION	2009-05-13 13:24:41 UTC (rev 270)
@@ -1,5 +1,5 @@
 Package: depmixS4
-Version: 0.2-1
+Version: 0.2-2
 Date: 2009-02-17
 Title: Dependent Mixture Models
 Author: Ingmar Visser <i.visser at uva.nl>, Maarten Speekenbrink <m.speekenbrink at ucl.ac.uk>

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-05-13 13:07:39 UTC (rev 269)
+++ trunk/NEWS	2009-05-13 13:24:41 UTC (rev 270)
@@ -1,12 +1,19 @@
 
+Changes in depmixS4 version 0.2-2
+
+  o fixed a warning produced when specifying conrows.upper and .lower in the
+    the fit function
+
+  o 
+
 Changes in depmixS4 version 0.2-1
 
   o fixed a bug in the Viterbi algorithm used to compute posterior states
   
   o restructured test files somewhat
 
-  o fixed a bug in the use of the conrows argument in the fit function (a missing
-    drop=FALSE statement)
+  o fixed a bug in the use of the conrows argument in the fit function (a 
+    missing drop=FALSE statement)
 
   o updated help files for mix classes
 

Modified: trunk/R/depmixfit.R
===================================================================
--- trunk/R/depmixfit.R	2009-05-13 13:07:39 UTC (rev 269)
+++ trunk/R/depmixfit.R	2009-05-13 13:24:41 UTC (rev 270)
@@ -71,13 +71,13 @@
 			if(!is.null(conrows)) {
 				if(ncol(conrows)!=npar(object)) stop("'conrows' does not have the right dimensions")
 				lincon <- rbind(lincon,conrows)
-				if(conrows.upper==0) {
+				if(any(conrows.upper==0)) {
 					lin.u <- c(lin.u,rep(0,nrow(conrows)))
 				} else {
 					if(length(conrows.upper)!=nrow(conrows)) stop("'conrows.upper does not have correct length")
 					lin.u <- c(lin.u,conrows.upper)
 				}
-				if(conrows.lower==0) {
+				if(any(conrows.lower==0)) {
 					lin.l <- c(lin.l,rep(0,nrow(conrows)))
 				} else {
 					if(length(conrows.lower)!=nrow(conrows)) stop("'conrows.lower does not have correct length")