From eb9ca1191c94059cd7adcf69805906c809fe9712 Mon Sep 17 00:00:00 2001 From: Harpreet Date: Tue, 29 Dec 2015 00:38:48 +0530 Subject: Bugs fixed 4 --- help/en_US/scilab_en_US_help/lsqlin.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'help/en_US/scilab_en_US_help/lsqlin.html') diff --git a/help/en_US/scilab_en_US_help/lsqlin.html b/help/en_US/scilab_en_US_help/lsqlin.html index b843257..aef773d 100644 --- a/help/en_US/scilab_en_US_help/lsqlin.html +++ b/help/en_US/scilab_en_US_help/lsqlin.html @@ -46,9 +46,9 @@

Parameters

C : -

a matrix of double, represents the multiplier of the solution x in the expression C*x - d. C is M-by-N, where M is the number of equations, and N is the number of elements of x.

+

a matrix of double, represents the multiplier of the solution x in the expression C*x - d. Number of columns in C is equal to the number of elements in x.

d : -

a vector of double, represents the additive constant term in the expression C*x - d. d is M-by-1, where M is the number of equations.

+

a vector of double, represents the additive constant term in the expression C*x - d. Number of elements in d is equal to the number of rows in C matrix.

A :

a vector of double, represents the linear coefficients in the inequality constraints

b : @@ -57,9 +57,9 @@

a matrix of double, represents the linear coefficients in the equality constraints

beq :

a vector of double, represents the linear coefficients in the equality constraints

-
LB : +
lb :

a vector of double, contains lower bounds of the variables.

-
UB : +
ub :

a vector of double, contains upper bounds of the variables.

x0 :

a vector of double, contains initial guess of variables.

@@ -72,16 +72,16 @@
residual :

a vector of double, solution residuals returned as the vector C*x-d.

exitflag : -

Integer identifying the reason the algorithm terminated.

+

Integer identifying the reason the algorithm terminated. It could be 0, 1 or 2 etc. i.e. Optimal, Maximum Number of Iterations Exceeded, CPU time exceeded. Other flags one can see in the lsqlin macro.

output : -

Structure containing information about the optimization. Right now it contains number of iteration.

+

Structure containing information about the optimization. This version only contains number of iterations.

lambda : -

Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper and linear equality, inequality constraints.

+

Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper bound multiplier and linear equality, inequality constraints.

Description

Search the minimum of a constrained linear least square problem specified by :

-

-

We are calling IPOpt for solving the linear least square problem, IPOpt is a library written in C++.

+

+

The routine calls Ipopt for solving the linear least square problem, Ipopt is a library written in C++.

Examples

@@ -106,7 +106,7 @@ // Press ENTER to continue

Examples

- 
//A basic example for equality, inequality and bounds
+   
//A basic example for equality, inequality constraints and variable bounds
 C = [0.9501    0.7620    0.6153    0.4057
 0.2311    0.4564    0.7919    0.9354
 0.6068    0.0185    0.9218    0.9169
-- 
cgit