From ba24b59b6b1a638a404eec1dd1bba7718ef34fee Mon Sep 17 00:00:00 2001 From: Paul BIGNIER Date: Wed, 24 Apr 2013 11:12:49 +0200 Subject: [PATCH 1/1] Optimization module: minor improvements in qpsolve() and qld() docs Change-Id: I60777a7452e27687d9b62eda4c94015de0406415 --- scilab/modules/optimization/help/en_US/qld.xml | 5 ++--- .../modules/optimization/help/en_US/qp_solve.xml | 2 +- scilab/modules/optimization/help/en_US/qpsolve.xml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scilab/modules/optimization/help/en_US/qld.xml b/scilab/modules/optimization/help/en_US/qld.xml index b213dc9..fd0a1fe 100644 --- a/scilab/modules/optimization/help/en_US/qld.xml +++ b/scilab/modules/optimization/help/en_US/qld.xml @@ -7,8 +7,7 @@ Calling Sequence - [x, lagr] = qld(Q, p, C, b, ci, cs, me [,tol]) - [x, lagr, info] = qld(Q, p, C, b, ci, cs, me [,tol]) + [x [,lagr [,info]]] = qld(Q, p, C, b, ci, cs, me [,tol]) @@ -176,7 +175,7 @@ C1= [1,-1,1,0,3,1; 2,5,3,0,1,0]; b1=[1;2;3]; -//C2*x <= b2 (2 inequality constraints) +//C2*x <= b2 (2 inequality constraints i.e md=2) C2=[0,1,0,1,2,-1; -1,0,2,1,1,0]; b2=[-1;2.5]; diff --git a/scilab/modules/optimization/help/en_US/qp_solve.xml b/scilab/modules/optimization/help/en_US/qp_solve.xml index 6f51267..9ef34be 100644 --- a/scilab/modules/optimization/help/en_US/qp_solve.xml +++ b/scilab/modules/optimization/help/en_US/qp_solve.xml @@ -161,7 +161,7 @@ C1= [ 1,-1, 2; 1, 6, 0]; b1=[1;2;3]; -// x'*C2 >= b2 (2 inequality constraints) +// x'*C2 >= b2 (2 inequality constraints i.e md=2) C2= [ 0 ,1; -1, 0; 0,-2; diff --git a/scilab/modules/optimization/help/en_US/qpsolve.xml b/scilab/modules/optimization/help/en_US/qpsolve.xml index a1ffd1b..8ce4bd7 100644 --- a/scilab/modules/optimization/help/en_US/qpsolve.xml +++ b/scilab/modules/optimization/help/en_US/qpsolve.xml @@ -139,7 +139,7 @@ C1= [1,-1,1,0,3,1; 2,5,3,0,1,0]; b1=[1;2;3]; -//C2*x <= b2 (2 inequality constraints) +//C2*x <= b2 (2 inequality constraints i.e md=2) C2=[0,1,0,1,2,-1; -1,0,2,1,1,0]; b2=[-1;2.5]; -- 1.7.9.5