[Depmix-commits] r646 - pkg/depmixS4/R

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

Author: ingmarvisser
Date: 2016-02-10 17:10:33 +0100 (Wed, 10 Feb 2016)
New Revision: 646

Modified:
   pkg/depmixS4/R/depmixfit.R
Log:
=added support for fitting inequality constraints with solnp optimization

Modified: pkg/depmixS4/R/depmixfit.R
===================================================================
--- pkg/depmixS4/R/depmixfit.R	2016-02-10 11:38:13 UTC (rev 645)
+++ pkg/depmixS4/R/depmixfit.R	2016-02-10 16:10:33 UTC (rev 646)
@@ -183,6 +183,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