From 79583a44468943fad22ba1de2dd25dd86f7be167 Mon Sep 17 00:00:00 2001 From: Harpreet Date: Tue, 22 Dec 2015 14:51:05 +0530 Subject: Bugs by prof fixed 2 --- help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS | Bin 7489 -> 7496 bytes .../scilab_en_US_help/JavaHelpSearch/DOCS.TAB | Bin 862 -> 868 bytes .../en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | Bin 273 -> 270 bytes .../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 36150 -> 36157 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA | 2 +- help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP | Bin 16384 -> 16384 bytes .../scilab_en_US_help/_LaTeX_lsqlin.xml_1.png | Bin 3026 -> 3129 bytes .../scilab_en_US_help/_LaTeX_qpipoptmat.xml_1.png | Bin 3110 -> 3180 bytes .../scilab_en_US_help/_LaTeX_symphony.xml_1.png | Bin 2934 -> 3468 bytes .../scilab_en_US_help/_LaTeX_symphonymat.xml_1.png | Bin 2547 -> 3160 bytes help/en_US/scilab_en_US_help/index.html | 12 ----- help/en_US/scilab_en_US_help/jhelpmap.jhm | 2 - help/en_US/scilab_en_US_help/jhelptoc.xml | 2 - help/en_US/scilab_en_US_help/lsqlin.html | 22 ++++---- help/en_US/scilab_en_US_help/lsqnonneg.html | 12 ++--- help/en_US/scilab_en_US_help/qpipopt.html | 13 ++--- help/en_US/scilab_en_US_help/qpipoptmat.html | 59 ++++++++++----------- .../section_19f4f1e5726c01d683e8b82be0a7e910.html | 12 ----- help/en_US/scilab_en_US_help/symphony.html | 15 +++--- help/en_US/scilab_en_US_help/symphonymat.html | 15 +++--- 20 files changed, 71 insertions(+), 95 deletions(-) (limited to 'help/en_US/scilab_en_US_help') diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS index 2aa9c2c..9b6386a 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB index 954ffd9..8f3ddaf 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB and b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS index d5a0fd6..d668ed6 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS index 1fbf883..65379cd 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS and b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS differ diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA index 93aea58..b5697c6 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA @@ -1,2 +1,2 @@ JavaSearch 1.0 -TMAP bs=2048 rt=1 fl=-1 id1=1435 id2=1 +TMAP bs=2048 rt=1 fl=-1 id1=1439 id2=1 diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP index 141985f..e2f089a 100644 Binary files a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP and b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP differ diff --git a/help/en_US/scilab_en_US_help/_LaTeX_lsqlin.xml_1.png b/help/en_US/scilab_en_US_help/_LaTeX_lsqlin.xml_1.png index d89b104..873dc47 100644 Binary files a/help/en_US/scilab_en_US_help/_LaTeX_lsqlin.xml_1.png and b/help/en_US/scilab_en_US_help/_LaTeX_lsqlin.xml_1.png differ diff --git a/help/en_US/scilab_en_US_help/_LaTeX_qpipoptmat.xml_1.png b/help/en_US/scilab_en_US_help/_LaTeX_qpipoptmat.xml_1.png index b6e2743..7331197 100644 Binary files a/help/en_US/scilab_en_US_help/_LaTeX_qpipoptmat.xml_1.png and b/help/en_US/scilab_en_US_help/_LaTeX_qpipoptmat.xml_1.png differ diff --git a/help/en_US/scilab_en_US_help/_LaTeX_symphony.xml_1.png b/help/en_US/scilab_en_US_help/_LaTeX_symphony.xml_1.png index 07dafd6..96b5161 100644 Binary files a/help/en_US/scilab_en_US_help/_LaTeX_symphony.xml_1.png and b/help/en_US/scilab_en_US_help/_LaTeX_symphony.xml_1.png differ diff --git a/help/en_US/scilab_en_US_help/_LaTeX_symphonymat.xml_1.png b/help/en_US/scilab_en_US_help/_LaTeX_symphonymat.xml_1.png index 2e81ca1..94c5200 100644 Binary files a/help/en_US/scilab_en_US_help/_LaTeX_symphonymat.xml_1.png and b/help/en_US/scilab_en_US_help/_LaTeX_symphonymat.xml_1.png differ diff --git a/help/en_US/scilab_en_US_help/index.html b/help/en_US/scilab_en_US_help/index.html index c942e96..03ce98c 100644 --- a/help/en_US/scilab_en_US_help/index.html +++ b/help/en_US/scilab_en_US_help/index.html @@ -50,12 +50,6 @@ -
x = lsqlin(C,d,A,b) -x = lsqlin(C,d,A,b,Aeq,beq) -x = lsqlin(C,d,A,b,Aeq,beq,lb,ub) -x = lsqlin(C,d,A,b,Aeq,beq,lb,ub,x0) -x = lsqlin(C,d,A,b,Aeq,beq,lb,ub,x0,param) +xopt = lsqlin(C,d,A,b) +xopt = lsqlin(C,d,A,b,Aeq,beq) +xopt = lsqlin(C,d,A,b,Aeq,beq,lb,ub) +xopt = lsqlin(C,d,A,b,Aeq,beq,lb,ub,x0) +xopt = lsqlin(C,d,A,b,Aeq,beq,lb,ub,x0,param) [xopt,resnorm,residual,exitflag,output,lambda] = lsqlin( ... )
Integer identifying the reason the algorithm terminated.
Structure containing information about the optimization.
Structure containing information about the optimization. Right now it contains number of iteration.
Structure containing the Lagrange multipliers at the solution x (separated by constraint type).
Structure containing the Lagrange multipliers at the solution x (separated by constraint type).It contains lower, upper and linear equality, inequality constraints.
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 code has been written by Andreas Wächter and Carl Laird.
+We are calling IPOpt for solving the linear least square problem, IPOpt is a library written in C++.
C = [0.9501 0.7620 0.6153 0.4057 + | ![]() | ![]() |
// An advanced case where we set some options in symphony @@ -154,7 +155,7 @@ find the minimum or maximum of f(x) such that 483 336 765 637 981 980 202 35 594 689 602 76 767 693 .. 893 160 785 311 417 748 375 362 617 553 474 915 457 261 350 635 ; ]; -nbVar = size(objCoef,2) +nbVar = size(objCoef,1) conUB=[11927 13727 11551 13056 13460 ]; // Lower Bound of variables lb = repmat(0,1,nbVar) @@ -185,7 +186,7 @@ find the minimum or maximum of f(x) such that |