From d0cad398d8df199a4974112bfb7945c18636b5f8 Mon Sep 17 00:00:00 2001
From: Harpreet
Date: Wed, 24 Feb 2016 16:26:51 +0530
Subject: fmincon examples added
---
help/en_US/fminimax.xml | 10 +++++-----
.../en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS | Bin 256 -> 256 bytes
.../scilab_en_US_help/JavaHelpSearch/POSITIONS | Bin 36126 -> 36124 bytes
help/en_US/scilab_en_US_help/fminimax.html | 10 +++++-----
jar/scilab_en_US_help.jar | Bin 226396 -> 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(.....)
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
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 708749d..b391d86 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/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 @@
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(.....)
Parameters
- fun:
diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar
index 04f7231..ee0cb27 100644
Binary files a/jar/scilab_en_US_help.jar and b/jar/scilab_en_US_help.jar differ
--
cgit