[Depmix-commits] r575 - in tags/release-1.2-2: . R

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

Author: ingmarvisser
Date: 2013-01-24 22:30:14 +0100 (Thu, 24 Jan 2013)
New Revision: 575

Modified:
   tags/release-1.2-2/DESCRIPTION
   tags/release-1.2-2/NEWS
   tags/release-1.2-2/R/depmixfit.R
Log:
>From the NEWS file: 

  o Changed class assignment of depmix.fitted object using as() to make
      this version compatible with future R releases (2.3.0?)

  o Fixed a bug in the fit method of depmix models: linear inequality
    constraints were not passed on to rsolnp (thanks to Peiming Wang for
    bringing this to my attention.)

Modified: tags/release-1.2-2/DESCRIPTION
===================================================================
--- tags/release-1.2-2/DESCRIPTION	2013-01-14 16:27:57 UTC (rev 574)
+++ tags/release-1.2-2/DESCRIPTION	2013-01-24 21:30:14 UTC (rev 575)
@@ -1,10 +1,10 @@
 Package: depmixS4
-Version: 1.2-1
-Date: 2012-08-12
+Version: 1.2-2
+Date: 2013-01-24
 Title: Dependent Mixture Models - Hidden Markov Models of GLMs and Other Distributions in S4
 Author: Ingmar Visser <i.visser at uva.nl>, Maarten Speekenbrink <m.speekenbrink at ucl.ac.uk>
 Maintainer: Ingmar Visser <i.visser at uva.nl>
-Depends: R (>= 2.15.0), stats, nnet, methods, MASS, Rsolnp, stats4
+Depends: R (>= 2.15.2), stats, nnet, methods, MASS, Rsolnp, stats4
 Suggests: gamlss, gamlss.dist, TTR
 Description: Fit latent (hidden) Markov models on mixed categorical and continuous (timeseries)
    data, otherwise known as dependent mixture models

Modified: tags/release-1.2-2/NEWS
===================================================================
--- tags/release-1.2-2/NEWS	2013-01-14 16:27:57 UTC (rev 574)
+++ tags/release-1.2-2/NEWS	2013-01-24 21:30:14 UTC (rev 575)
@@ -1,3 +1,12 @@
+Changes in depmixS4 version 1.2-2
+
+  o Changed class assignment of depmix.fitted object using as() to make 
+  	this version compatible with future R releases (2.3.0?)
+
+  o Fixed a bug in the fit method of depmix models: linear inequality 
+    constraints were not passed on to rsolnp (thanks to Peiming Wang for 
+	bringing this to my attention.)
+
 Changes in depmixS4 version 1.2-1
 
   o Fixed a bug in handling of missing values for mix models

Modified: tags/release-1.2-2/R/depmixfit.R
===================================================================
--- tags/release-1.2-2/R/depmixfit.R	2013-01-14 16:27:57 UTC (rev 574)
+++ tags/release-1.2-2/R/depmixfit.R	2013-01-24 21:30:14 UTC (rev 575)
@@ -180,6 +180,10 @@
 					linineq <- lincon[ineq, ,drop=FALSE]
 					ineqLB <- lin.l[ineq]
 					ineqUB <- lin.u[ineq]
+					ineqfun <- function(pp) {
+						ans = as.vector(linineq%*%pp)
+						ans
+					}
 				} else {
 					ineqfun = NULL
 					ineqLB=NULL