diff options
| author | Harpreet | 2015-11-19 15:06:02 +0530 |
|---|---|---|
| committer | Harpreet | 2015-11-19 15:06:02 +0530 |
| commit | b949656e486ba8e8ac37a06cd6241bc48c945ea2 (patch) | |
| tree | 433c5dd7db16943d79eee9128957ccb7b1b5d65d /help | |
| parent | a8277e2be90bf00bd70ab5e7d6b92b91c49b7320 (diff) | |
| download | FOSSEE-Optimization-toolbox-b949656e486ba8e8ac37a06cd6241bc48c945ea2.tar.gz FOSSEE-Optimization-toolbox-b949656e486ba8e8ac37a06cd6241bc48c945ea2.tar.bz2 FOSSEE-Optimization-toolbox-b949656e486ba8e8ac37a06cd6241bc48c945ea2.zip | |
Bugs by Prof fixed 1
Diffstat (limited to 'help')
16 files changed, 44 insertions, 12 deletions
diff --git a/help/en_US/master_help.xml b/help/en_US/master_help.xml index 67338f2..66b8e0d 100644 --- a/help/en_US/master_help.xml +++ b/help/en_US/master_help.xml @@ -2,8 +2,10 @@ <!DOCTYPE book [ <!--Begin Entities--> <!ENTITY a6b85f6e0c98751f20b68663a23cb4cd2 SYSTEM "/home/harpreet/symphony_work/symphony/help/en_US/qpipopt.xml"> +<!ENTITY a44928acec52adf395379e18fcff06730 SYSTEM "/home/harpreet/symphony_work/symphony/help/en_US/qpipopt_mat.xml"> <!ENTITY a8549a3935858ed104f4749ca2243456a SYSTEM "/home/harpreet/symphony_work/symphony/help/en_US/qpipoptmat.xml"> <!ENTITY aca972f273143ecb39f56b42e4723ac67 SYSTEM "/home/harpreet/symphony_work/symphony/help/en_US/symphony.xml"> +<!ENTITY a9953e61e8dd264a86df73772d3055e7f SYSTEM "/home/harpreet/symphony_work/symphony/help/en_US/symphony_mat.xml"> <!ENTITY a9910ada35b57b0581e8a77d145abac4a SYSTEM "/home/harpreet/symphony_work/symphony/help/en_US/symphonymat.xml"> <!ENTITY acc223314e8a8bc290a13618df33a6237 SYSTEM "/home/harpreet/symphony_work/symphony/help/en_US/Symphony Native Function/sym_addConstr.xml"> <!ENTITY a5e032b3334f53385f0ce250f0d5c18f2 SYSTEM "/home/harpreet/symphony_work/symphony/help/en_US/Symphony Native Function/sym_addVar.xml"> @@ -80,8 +82,10 @@ <part xml:id='section_19f4f1e5726c01d683e8b82be0a7e910'> <title>Symphony Toolbox</title> &a6b85f6e0c98751f20b68663a23cb4cd2; +&a44928acec52adf395379e18fcff06730; &a8549a3935858ed104f4749ca2243456a; &aca972f273143ecb39f56b42e4723ac67; +&a9953e61e8dd264a86df73772d3055e7f; &a9910ada35b57b0581e8a77d145abac4a; <chapter xml:id='section_508f0b211d17ea6769714cc144e6b731'> <title>Symphony Native Functions</title> diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS Binary files differindex 02038f6..d5a7298 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB Binary files differindex 23181b6..0095d6c 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS Binary files differindex d20c98d..3fdc4c1 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS Binary files differindex e2773de..d69ed8d 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP Binary files differindex 7e8baef..39ca223 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP diff --git a/help/en_US/scilab_en_US_help/index.html b/help/en_US/scilab_en_US_help/index.html index 12fb83c..b1cfd9c 100644 --- a/help/en_US/scilab_en_US_help/index.html +++ b/help/en_US/scilab_en_US_help/index.html @@ -38,6 +38,12 @@ +<li><a href="qpipopt_mat.html" class="refentry">qpipopt_mat</a> — <span class="refentry-description">Solves a linear quadratic problem.</span></li> + + + + + <li><a href="qpipoptmat.html" class="refentry">qpipoptmat</a> — <span class="refentry-description">Solves a linear quadratic problem.</span></li> @@ -50,6 +56,12 @@ +<li><a href="symphony_mat.html" class="refentry">symphony_mat</a> — <span class="refentry-description">Solves a mixed integer linear programming constrained optimization problem in intlinprog format.</span></li> + + + + + <li><a href="symphonymat.html" class="refentry">symphonymat</a> — <span class="refentry-description">Solves a mixed integer linear programming constrained optimization problem in intlinprog format.</span></li> <li><a href="section_508f0b211d17ea6769714cc144e6b731.html" class="chapter">Symphony Native Functions</a> diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm index 9dfdea5..47f4429 100644 --- a/help/en_US/scilab_en_US_help/jhelpmap.jhm +++ b/help/en_US/scilab_en_US_help/jhelpmap.jhm @@ -4,8 +4,10 @@ <mapID target="index" url="index.html"/> <mapID target="section_19f4f1e5726c01d683e8b82be0a7e910" url="section_19f4f1e5726c01d683e8b82be0a7e910.html"/> <mapID target="qpipopt" url="qpipopt.html"/> +<mapID target="qpipopt_mat" url="qpipopt_mat.html"/> <mapID target="qpipoptmat" url="qpipoptmat.html"/> <mapID target="symphony" url="symphony.html"/> +<mapID target="symphony_mat" url="symphony_mat.html"/> <mapID target="symphonymat" url="symphonymat.html"/> <mapID target="section_508f0b211d17ea6769714cc144e6b731" url="section_508f0b211d17ea6769714cc144e6b731.html"/> <mapID target="sym_addConstr" url="sym_addConstr.html"/> diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml index 84c6d37..95d4995 100644 --- a/help/en_US/scilab_en_US_help/jhelptoc.xml +++ b/help/en_US/scilab_en_US_help/jhelptoc.xml @@ -4,8 +4,10 @@ <tocitem target="index" text="Symphony Toolbox"> <tocitem target="section_19f4f1e5726c01d683e8b82be0a7e910" text="Symphony Toolbox"> <tocitem target="qpipopt" text="qpipopt"/> +<tocitem target="qpipopt_mat" text="qpipopt_mat"/> <tocitem target="qpipoptmat" text="qpipoptmat"/> <tocitem target="symphony" text="symphony"/> +<tocitem target="symphony_mat" text="symphony_mat"/> <tocitem target="symphonymat" text="symphonymat"/> <tocitem target="section_508f0b211d17ea6769714cc144e6b731" text="Symphony Native Functions"> <tocitem target="sym_addConstr" text="sym_addConstr"/> diff --git a/help/en_US/scilab_en_US_help/qpipopt.html b/help/en_US/scilab_en_US_help/qpipopt.html index b1c18ac..63da9d2 100644 --- a/help/en_US/scilab_en_US_help/qpipopt.html +++ b/help/en_US/scilab_en_US_help/qpipopt.html @@ -20,7 +20,7 @@ </td> <td width="30%" class="next"> - <span class="next"><a href="qpipoptmat.html">qpipoptmat >></a></span> + <span class="next"><a href="qpipopt_mat.html">qpipopt_mat >></a></span> </td> </tr></table> @@ -138,7 +138,7 @@ find the minimum of f(x) such that</p> </td> <td width="30%" class="next"> - <span class="next"><a href="qpipoptmat.html">qpipoptmat >></a></span> + <span class="next"><a href="qpipopt_mat.html">qpipopt_mat >></a></span> </td> </tr></table> diff --git a/help/en_US/scilab_en_US_help/qpipopt_mat.html b/help/en_US/scilab_en_US_help/qpipopt_mat.html index 5e30769..2089d8b 100644 --- a/help/en_US/scilab_en_US_help/qpipopt_mat.html +++ b/help/en_US/scilab_en_US_help/qpipopt_mat.html @@ -20,7 +20,7 @@ </td> <td width="30%" class="next"> - <span class="next"><a href="symphony.html">symphony >></a></span> + <span class="next"><a href="qpipoptmat.html">qpipoptmat >></a></span> </td> </tr></table> @@ -129,7 +129,7 @@ find the minimum of f(x) such that</p> </td> <td width="30%" class="next"> - <span class="next"><a href="symphony.html">symphony >></a></span> + <span class="next"><a href="qpipoptmat.html">qpipoptmat >></a></span> </td> </tr></table> diff --git a/help/en_US/scilab_en_US_help/qpipoptmat.html b/help/en_US/scilab_en_US_help/qpipoptmat.html index a9f97aa..10cb590 100644 --- a/help/en_US/scilab_en_US_help/qpipoptmat.html +++ b/help/en_US/scilab_en_US_help/qpipoptmat.html @@ -12,7 +12,7 @@ <div class="manualnavbar"> <table width="100%"><tr> <td width="30%"> - <span class="previous"><a href="qpipopt.html"><< qpipopt</a></span> + <span class="previous"><a href="qpipopt_mat.html"><< qpipopt_mat</a></span> </td> <td width="40%" class="center"> @@ -128,7 +128,7 @@ find the minimum of f(x) such that</p> <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> <tr> <td width="30%"> - <span class="previous"><a href="qpipopt.html"><< qpipopt</a></span> + <span class="previous"><a href="qpipopt_mat.html"><< qpipopt_mat</a></span> </td> <td width="40%" class="center"> diff --git a/help/en_US/scilab_en_US_help/section_19f4f1e5726c01d683e8b82be0a7e910.html b/help/en_US/scilab_en_US_help/section_19f4f1e5726c01d683e8b82be0a7e910.html index 1e5e538..52d6d9e 100644 --- a/help/en_US/scilab_en_US_help/section_19f4f1e5726c01d683e8b82be0a7e910.html +++ b/help/en_US/scilab_en_US_help/section_19f4f1e5726c01d683e8b82be0a7e910.html @@ -37,6 +37,12 @@ +<li><a href="qpipopt_mat.html" class="refentry">qpipopt_mat</a> — <span class="refentry-description">Solves a linear quadratic problem.</span></li> + + + + + <li><a href="qpipoptmat.html" class="refentry">qpipoptmat</a> — <span class="refentry-description">Solves a linear quadratic problem.</span></li> @@ -49,6 +55,12 @@ +<li><a href="symphony_mat.html" class="refentry">symphony_mat</a> — <span class="refentry-description">Solves a mixed integer linear programming constrained optimization problem in intlinprog format.</span></li> + + + + + <li><a href="symphonymat.html" class="refentry">symphonymat</a> — <span class="refentry-description">Solves a mixed integer linear programming constrained optimization problem in intlinprog format.</span></li> <li><a href="section_508f0b211d17ea6769714cc144e6b731.html" class="chapter">Symphony Native Functions</a> diff --git a/help/en_US/scilab_en_US_help/symphony.html b/help/en_US/scilab_en_US_help/symphony.html index c5b8336..48ea705 100644 --- a/help/en_US/scilab_en_US_help/symphony.html +++ b/help/en_US/scilab_en_US_help/symphony.html @@ -20,7 +20,7 @@ </td> <td width="30%" class="next"> - <span class="next"><a href="symphonymat.html">symphonymat >></a></span> + <span class="next"><a href="symphony_mat.html">symphony_mat >></a></span> </td> </tr></table> @@ -205,7 +205,7 @@ find the minimum or maximum of f(x) such that</p> </td> <td width="30%" class="next"> - <span class="next"><a href="symphonymat.html">symphonymat >></a></span> + <span class="next"><a href="symphony_mat.html">symphony_mat >></a></span> </td> </tr></table> diff --git a/help/en_US/scilab_en_US_help/symphony_mat.html b/help/en_US/scilab_en_US_help/symphony_mat.html index cc337f4..4f07aca 100644 --- a/help/en_US/scilab_en_US_help/symphony_mat.html +++ b/help/en_US/scilab_en_US_help/symphony_mat.html @@ -20,7 +20,7 @@ </td> <td width="30%" class="next"> - <span class="next"><a href="section_508f0b211d17ea6769714cc144e6b731.html">Symphony Native Functions >></a></span> + <span class="next"><a href="symphonymat.html">symphonymat >></a></span> </td> </tr></table> @@ -190,7 +190,7 @@ find the minimum or maximum of f(x) such that</p> </td> <td width="30%" class="next"> - <span class="next"><a href="section_508f0b211d17ea6769714cc144e6b731.html">Symphony Native Functions >></a></span> + <span class="next"><a href="symphonymat.html">symphonymat >></a></span> </td> </tr></table> diff --git a/help/en_US/scilab_en_US_help/symphonymat.html b/help/en_US/scilab_en_US_help/symphonymat.html index 8001136..b559c8a 100644 --- a/help/en_US/scilab_en_US_help/symphonymat.html +++ b/help/en_US/scilab_en_US_help/symphonymat.html @@ -12,7 +12,7 @@ <div class="manualnavbar"> <table width="100%"><tr> <td width="30%"> - <span class="previous"><a href="symphony.html"><< symphony</a></span> + <span class="previous"><a href="symphony_mat.html"><< symphony_mat</a></span> </td> <td width="40%" class="center"> @@ -183,7 +183,7 @@ find the minimum or maximum of f(x) such that</p> <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> <tr> <td width="30%"> - <span class="previous"><a href="symphony.html"><< symphony</a></span> + <span class="previous"><a href="symphony_mat.html"><< symphony_mat</a></span> </td> <td width="40%" class="center"> |