summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarpreet2016-02-24 16:26:51 +0530
committerHarpreet2016-02-24 16:26:51 +0530
commitd0cad398d8df199a4974112bfb7945c18636b5f8 (patch)
tree74a097976e0088a0fd2847d93bd2ae9d83f140e1
parent03241d180c9d65fa1e75ceac4c257df44438a1ce (diff)
downloadFOSSEE-Optimization-toolbox-d0cad398d8df199a4974112bfb7945c18636b5f8.tar.gz
FOSSEE-Optimization-toolbox-d0cad398d8df199a4974112bfb7945c18636b5f8.tar.bz2
FOSSEE-Optimization-toolbox-d0cad398d8df199a4974112bfb7945c18636b5f8.zip
fmincon examples added
-rw-r--r--help/en_US/fminimax.xml10
-rw-r--r--help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETSbin256 -> 256 bytes
-rw-r--r--help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONSbin36126 -> 36124 bytes
-rw-r--r--help/en_US/scilab_en_US_help/fminimax.html10
-rw-r--r--jar/scilab_en_US_help.jarbin226396 -> 226390 bytes
5 files changed, 10 insertions, 10 deletions
diff --git a/help/en_US/fminimax.xml b/help/en_US/fminimax.xml
index efe4812..e733a3d 100644
--- a/help/en_US/fminimax.xml
+++ b/help/en_US/fminimax.xml
@@ -30,11 +30,11 @@
xopt = fminimax(fun,x0,A,b,Aeq,beq,lb,ub)
xopt = fminimax(fun,x0,A,b,Aeq,beq,lb,ub,nonlinfun)
xopt = fminimax(fun,x0,A,b,Aeq,beq,lb,ub,nonlinfun,options)
- [xopt, fval] = fmincon(.....)
- [xopt, fval, maxfval]= fmincon(.....)
- [xopt, fval, maxfval, exitflag]= fmincon(.....)
- [xopt, fval, maxfval, exitflag, output]= fmincon(.....)
- [xopt, fval, maxfval, exitflag, output, lambda]= fmincon(.....)
+ [xopt, fval] = fminimax(.....)
+ [xopt, fval, maxfval]= fminimax(.....)
+ [xopt, fval, maxfval, exitflag]= fminimax(.....)
+ [xopt, fval, maxfval, exitflag, output]= fminimax(.....)
+ [xopt, fval, maxfval, exitflag, output, lambda]= fminimax(.....)
</synopsis>
</refsynopsisdiv>
diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS
index 9f06801..48d2dc4 100644
--- a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS
+++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS
Binary files differ
diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS
index 708749d..b391d86 100644
--- a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS
+++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS
Binary files differ
diff --git a/help/en_US/scilab_en_US_help/fminimax.html b/help/en_US/scilab_en_US_help/fminimax.html
index a701aa7..4143821 100644
--- a/help/en_US/scilab_en_US_help/fminimax.html
+++ b/help/en_US/scilab_en_US_help/fminimax.html
@@ -43,11 +43,11 @@
<span class="default">xopt</span><span class="default"> = </span><span class="functionid">fminimax</span><span class="default">(</span><span class="default">fun</span><span class="default">,</span><span class="default">x0</span><span class="default">,</span><span class="default">A</span><span class="default">,</span><span class="default">b</span><span class="default">,</span><span class="default">Aeq</span><span class="default">,</span><span class="default">beq</span><span class="default">,</span><span class="default">lb</span><span class="default">,</span><span class="default">ub</span><span class="default">)</span>
<span class="default">xopt</span><span class="default"> = </span><span class="functionid">fminimax</span><span class="default">(</span><span class="default">fun</span><span class="default">,</span><span class="default">x0</span><span class="default">,</span><span class="default">A</span><span class="default">,</span><span class="default">b</span><span class="default">,</span><span class="default">Aeq</span><span class="default">,</span><span class="default">beq</span><span class="default">,</span><span class="default">lb</span><span class="default">,</span><span class="default">ub</span><span class="default">,</span><span class="default">nonlinfun</span><span class="default">)</span>
<span class="default">xopt</span><span class="default"> = </span><span class="functionid">fminimax</span><span class="default">(</span><span class="default">fun</span><span class="default">,</span><span class="default">x0</span><span class="default">,</span><span class="default">A</span><span class="default">,</span><span class="default">b</span><span class="default">,</span><span class="default">Aeq</span><span class="default">,</span><span class="default">beq</span><span class="default">,</span><span class="default">lb</span><span class="default">,</span><span class="default">ub</span><span class="default">,</span><span class="default">nonlinfun</span><span class="default">,</span><span class="default">options</span><span class="default">)</span>
-<span class="default">[</span><span class="default">xopt</span><span class="default">, </span><span class="default">fval</span><span class="default">] = </span><span class="default">fmincon</span><span class="default">(.....)</span>
-<span class="default">[</span><span class="default">xopt</span><span class="default">, </span><span class="default">fval</span><span class="default">, </span><span class="default">maxfval</span><span class="default">]= </span><span class="default">fmincon</span><span class="default">(.....)</span>
-<span class="default">[</span><span class="default">xopt</span><span class="default">, </span><span class="default">fval</span><span class="default">, </span><span class="default">maxfval</span><span class="default">, </span><span class="default">exitflag</span><span class="default">]= </span><span class="default">fmincon</span><span class="default">(.....)</span>
-<span class="default">[</span><span class="default">xopt</span><span class="default">, </span><span class="default">fval</span><span class="default">, </span><span class="default">maxfval</span><span class="default">, </span><span class="default">exitflag</span><span class="default">, </span><span class="default">output</span><span class="default">]= </span><span class="default">fmincon</span><span class="default">(.....)</span>
-<span class="default">[</span><span class="default">xopt</span><span class="default">, </span><span class="default">fval</span><span class="default">, </span><span class="default">maxfval</span><span class="default">, </span><span class="default">exitflag</span><span class="default">, </span><span class="default">output</span><span class="default">, </span><span class="default">lambda</span><span class="default">]= </span><span class="default">fmincon</span><span class="default">(.....)</span></pre></div></div>
+<span class="default">[</span><span class="default">xopt</span><span class="default">, </span><span class="default">fval</span><span class="default">] = </span><span class="functionid">fminimax</span><span class="default">(.....)</span>
+<span class="default">[</span><span class="default">xopt</span><span class="default">, </span><span class="default">fval</span><span class="default">, </span><span class="default">maxfval</span><span class="default">]= </span><span class="functionid">fminimax</span><span class="default">(.....)</span>
+<span class="default">[</span><span class="default">xopt</span><span class="default">, </span><span class="default">fval</span><span class="default">, </span><span class="default">maxfval</span><span class="default">, </span><span class="default">exitflag</span><span class="default">]= </span><span class="functionid">fminimax</span><span class="default">(.....)</span>
+<span class="default">[</span><span class="default">xopt</span><span class="default">, </span><span class="default">fval</span><span class="default">, </span><span class="default">maxfval</span><span class="default">, </span><span class="default">exitflag</span><span class="default">, </span><span class="default">output</span><span class="default">]= </span><span class="functionid">fminimax</span><span class="default">(.....)</span>
+<span class="default">[</span><span class="default">xopt</span><span class="default">, </span><span class="default">fval</span><span class="default">, </span><span class="default">maxfval</span><span class="default">, </span><span class="default">exitflag</span><span class="default">, </span><span class="default">output</span><span class="default">, </span><span class="default">lambda</span><span class="default">]= </span><span class="functionid">fminimax</span><span class="default">(.....)</span></pre></div></div>
<div class="refsection"><h3 class="title">Parameters</h3>
<dl><dt><span class="term">fun:</span>
diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar
index 04f7231..ee0cb27 100644
--- a/jar/scilab_en_US_help.jar
+++ b/jar/scilab_en_US_help.jar
Binary files differ