From b949656e486ba8e8ac37a06cd6241bc48c945ea2 Mon Sep 17 00:00:00 2001 From: Harpreet Date: Thu, 19 Nov 2015 15:06:02 +0530 Subject: Bugs by Prof fixed 1 --- help/en_US/master_help.xml | 4 ++++ help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS | Bin 7152 -> 7155 bytes .../en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB | Bin 807 -> 807 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | Bin 260 -> 262 bytes .../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 34771 -> 34829 bytes help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP | Bin 16384 -> 16384 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/qpipopt.html | 4 ++-- help/en_US/scilab_en_US_help/qpipopt_mat.html | 4 ++-- help/en_US/scilab_en_US_help/qpipoptmat.html | 4 ++-- .../section_19f4f1e5726c01d683e8b82be0a7e910.html | 12 ++++++++++++ help/en_US/scilab_en_US_help/symphony.html | 4 ++-- help/en_US/scilab_en_US_help/symphony_mat.html | 4 ++-- help/en_US/scilab_en_US_help/symphonymat.html | 4 ++-- 16 files changed, 44 insertions(+), 12 deletions(-) (limited to 'help') 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 @@ + + @@ -80,8 +82,10 @@ Symphony Toolbox &a6b85f6e0c98751f20b68663a23cb4cd2; +&a44928acec52adf395379e18fcff06730; &a8549a3935858ed104f4749ca2243456a; &aca972f273143ecb39f56b42e4723ac67; +&a9953e61e8dd264a86df73772d3055e7f; &a9910ada35b57b0581e8a77d145abac4a; Symphony Native Functions diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS index 02038f6..d5a7298 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 23181b6..0095d6c 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 d20c98d..3fdc4c1 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 e2773de..d69ed8d 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/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP index 7e8baef..39ca223 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/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 @@ +
  • qpipopt_mat — Solves a linear quadratic problem.
    • + + + + +
  • qpipoptmat — Solves a linear quadratic problem.
    • @@ -50,6 +56,12 @@ +
  • symphony_mat — Solves a mixed integer linear programming constrained optimization problem in intlinprog format.
    • + + + + +
  • symphonymat — Solves a mixed integer linear programming constrained optimization problem in intlinprog format.
  • Symphony Native Functions 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 @@ + + 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 @@ + + 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 @@ - qpipoptmat >> + qpipopt_mat >> @@ -138,7 +138,7 @@ find the minimum of f(x) such that

    - qpipoptmat >> + qpipopt_mat >> 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 @@ - symphony >> + qpipoptmat >> @@ -129,7 +129,7 @@ find the minimum of f(x) such that

    - symphony >> + qpipoptmat >> 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 @@
    - << qpipopt + << qpipopt_mat @@ -128,7 +128,7 @@ find the minimum of f(x) such that

    Report an issue
    - << qpipopt + << qpipopt_mat 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 @@ +
  • qpipopt_mat — Solves a linear quadratic problem.
    • + + + + +
  • qpipoptmat — Solves a linear quadratic problem.
    • @@ -49,6 +55,12 @@ +
  • symphony_mat — Solves a mixed integer linear programming constrained optimization problem in intlinprog format.
    • + + + + +
  • symphonymat — Solves a mixed integer linear programming constrained optimization problem in intlinprog format.
  • Symphony Native Functions 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 @@
    		• - symphonymat >> + symphony_mat >>
    @@ -205,7 +205,7 @@ find the minimum or maximum of f(x) such that

    - symphonymat >> + symphony_mat >> 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 @@ - Symphony Native Functions >> + symphonymat >> @@ -190,7 +190,7 @@ find the minimum or maximum of f(x) such that

    - Symphony Native Functions >> + symphonymat >> 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 @@
    - << symphony + << symphony_mat @@ -183,7 +183,7 @@ find the minimum or maximum of f(x) such that

    Report an issue
    - << symphony + << symphony_mat -- cgit