From 2269cb2d89c9e27b1edeb14849f201e90cbf89f7 Mon Sep 17 00:00:00 2001 From: Harpreet Date: Wed, 31 Aug 2016 01:43:18 +0530 Subject: Windows 32 bit bug fixed and third party updated --- macros/Checkdims.bin | Bin 8188 -> 8188 bytes macros/Checklhs.bin | Bin 10312 -> 10312 bytes macros/Checkrhs.bin | Bin 12852 -> 12852 bytes macros/Checktype.bin | Bin 9156 -> 9156 bytes macros/Checkvector.bin | Bin 9696 -> 9696 bytes macros/fgoalattain.bin | Bin 76660 -> 76660 bytes macros/fminbnd.bin | Bin 64156 -> 64156 bytes macros/fmincon.bin | Bin 156076 -> 156144 bytes macros/fmincon.sci | 4 +++- macros/fminimax.bin | Bin 86512 -> 86532 bytes macros/fminimax.sci | 10 +++++----- macros/fminunc.bin | Bin 69644 -> 69644 bytes macros/lib | Bin 912 -> 996 bytes macros/linprog.bin | Bin 30012 -> 30012 bytes macros/lsqlin.bin | Bin 64528 -> 64528 bytes macros/lsqnonneg.bin | Bin 33808 -> 33808 bytes macros/matrix_linprog.bin | Bin 30584 -> 30584 bytes macros/mps_linprog.bin | Bin 10064 -> 10064 bytes macros/names | 1 - macros/qpipopt.bin | Bin 63432 -> 63432 bytes macros/qpipoptmat.bin | Bin 65684 -> 65684 bytes macros/setOptions.bin | Bin 3040 -> 3040 bytes macros/symphony_call.bin | Bin 4580 -> 4580 bytes 23 files changed, 8 insertions(+), 7 deletions(-) (limited to 'macros') diff --git a/macros/Checkdims.bin b/macros/Checkdims.bin index 8df0367..40e385a 100644 Binary files a/macros/Checkdims.bin and b/macros/Checkdims.bin differ diff --git a/macros/Checklhs.bin b/macros/Checklhs.bin index 34561dc..7156107 100644 Binary files a/macros/Checklhs.bin and b/macros/Checklhs.bin differ diff --git a/macros/Checkrhs.bin b/macros/Checkrhs.bin index 2ec00b7..2c45876 100644 Binary files a/macros/Checkrhs.bin and b/macros/Checkrhs.bin differ diff --git a/macros/Checktype.bin b/macros/Checktype.bin index a43e55c..bbe1585 100644 Binary files a/macros/Checktype.bin and b/macros/Checktype.bin differ diff --git a/macros/Checkvector.bin b/macros/Checkvector.bin index 9a6bfdc..dfe03ab 100644 Binary files a/macros/Checkvector.bin and b/macros/Checkvector.bin differ diff --git a/macros/fgoalattain.bin b/macros/fgoalattain.bin index c329f4a..faa0821 100644 Binary files a/macros/fgoalattain.bin and b/macros/fgoalattain.bin differ diff --git a/macros/fminbnd.bin b/macros/fminbnd.bin index c9ddb2e..24cd387 100644 Binary files a/macros/fminbnd.bin and b/macros/fminbnd.bin differ diff --git a/macros/fmincon.bin b/macros/fmincon.bin index dacdfd9..dfd67b4 100644 Binary files a/macros/fmincon.bin and b/macros/fmincon.bin differ diff --git a/macros/fmincon.sci b/macros/fmincon.sci index a92faf1..3f65464 100644 --- a/macros/fmincon.sci +++ b/macros/fmincon.sci @@ -250,7 +250,9 @@ function [xopt,fopt,exitflag,output,lambda,gradient,hessian] = fmincon (varargin // endfunction // //Hessian of the Lagrange Function // function y= lHess(x,obj,lambda) - // y= obj*[0,1,0;1,0,1;0,1,0] + lambda(1)*[2,0,0;0,0,0;0,0,0] + lambda(2)*[2,0,0;0,2,0;0,0,0] +lambda(3)*[0,0,0;0,0,0;0,0,2] + lambda(4)*[6*x(1 ),0,0;0,0,0;0,0,0] + lambda(5)*[0,0,0;0,2,0;0,0,2]; + // y= obj*[0,1,0;1,0,1;0,1,0] + lambda(1)*[2,0,0;0,0,0;0,0,0] + .. + // lambda(2)*[2,0,0;0,2,0;0,0,0] +lambda(3)*[0,0,0;0,0,0;0,0,2] + .. + // lambda(4)*[6*x(1),0,0;0,0,0;0,0,0] + lambda(5)*[0,0,0;0,2,0;0,0,2]; // endfunction // //Gradient of Non-Linear Constraints // function [cg,ceqg] = cGrad(x) diff --git a/macros/fminimax.bin b/macros/fminimax.bin index 9704302..c023720 100644 Binary files a/macros/fminimax.bin and b/macros/fminimax.bin differ diff --git a/macros/fminimax.sci b/macros/fminimax.sci index c775b1b..b649640 100644 --- a/macros/fminimax.sci +++ b/macros/fminimax.sci @@ -19,11 +19,11 @@ function [x,fval,maxfval,exitflag,output,lambda] = fminimax(varargin) // 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: The function to be minimized. fun is a function that accepts a vector x and returns a vector F, the objective functions evaluated at x. diff --git a/macros/fminunc.bin b/macros/fminunc.bin index ab53755..b5dee4a 100644 Binary files a/macros/fminunc.bin and b/macros/fminunc.bin differ diff --git a/macros/lib b/macros/lib index 1c23fc4..f2d0c92 100644 Binary files a/macros/lib and b/macros/lib differ diff --git a/macros/linprog.bin b/macros/linprog.bin index 7ba3ab3..1d3a5aa 100644 Binary files a/macros/linprog.bin and b/macros/linprog.bin differ diff --git a/macros/lsqlin.bin b/macros/lsqlin.bin index 56c1e69..7baf7be 100644 Binary files a/macros/lsqlin.bin and b/macros/lsqlin.bin differ diff --git a/macros/lsqnonneg.bin b/macros/lsqnonneg.bin index 17b5808..32620d0 100644 Binary files a/macros/lsqnonneg.bin and b/macros/lsqnonneg.bin differ diff --git a/macros/matrix_linprog.bin b/macros/matrix_linprog.bin index 2b4af21..a51bc14 100644 Binary files a/macros/matrix_linprog.bin and b/macros/matrix_linprog.bin differ diff --git a/macros/mps_linprog.bin b/macros/mps_linprog.bin index f45ed06..c0d2e3e 100644 Binary files a/macros/mps_linprog.bin and b/macros/mps_linprog.bin differ diff --git a/macros/names b/macros/names index 2f20196..21c7d4e 100644 --- a/macros/names +++ b/macros/names @@ -9,7 +9,6 @@ fmincon fminimax fminunc fseminf -intlinprog linprog lsqlin lsqnonlin diff --git a/macros/qpipopt.bin b/macros/qpipopt.bin index d33679e..e2ba3de 100644 Binary files a/macros/qpipopt.bin and b/macros/qpipopt.bin differ diff --git a/macros/qpipoptmat.bin b/macros/qpipoptmat.bin index 0bd1c14..b9c741f 100644 Binary files a/macros/qpipoptmat.bin and b/macros/qpipoptmat.bin differ diff --git a/macros/setOptions.bin b/macros/setOptions.bin index 8953829..8d23e73 100644 Binary files a/macros/setOptions.bin and b/macros/setOptions.bin differ diff --git a/macros/symphony_call.bin b/macros/symphony_call.bin index 57ce782..a883f05 100644 Binary files a/macros/symphony_call.bin and b/macros/symphony_call.bin differ -- cgit