fix bugs with snoptmain examples

Author: gnowzil

matlab/examples/snmain/snoptmain2.m

@@ -12,20 +12,23 @@
 %Get condensed data for the Hexagon problem.
 [x,xlow,xupp,xmul,xstate, ...
    Flow,Fupp,Fmul,Fstate, ...
- A.val, A.row, A.col, G.row, G.col] = hexagon;
+ A.val, A.row, A.col, G.row, G.col, ...
+ ObjRow, ObjAdd] = hexagon;
 
 options.maximize = '';
 
 [x,F,INFO] = snopt(x,xlow,xupp,xmul,xstate, ...
 		   Flow,Fupp,Fmul,Fstate, ...
 		   @snoptuserfun2, ...
+		   ObjAdd, ObjRow, ...
 		   A,G,options);
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  function [x,xlow,xupp,xmul,xstate, ...
 	   Flow,Fupp,Fmul,Fstate, ...
-	   A,iAfun,jAvar,iGfun,jGvar] = hexagon()
+	   A,iAfun,jAvar,iGfun,jGvar ...
+	   Obj, ObjAdd] = hexagon()
 %function [x,xlow,xupp,Flow,Fupp,A,iAfun,jAvar,iGfun,jGvar] = hexagon()
 %
 % Defines the problem hexagon:
@@ -57,6 +60,7 @@
 neF    = 19;
 n      =  9;
 Obj    =  1; % The default objective row
+ObjAdd = 0.;
 
 % A dense Jacobian of F is provided in snoptuserfun2
 

matlab/examples/snmain/snoptmain3.m

@@ -10,23 +10,28 @@
 options.printfile = 'snoptmain3.out';
 
 options.verify_level = 3;
+options.maximize = 1;
 options.derivative_option = 0;
 
+
 % Get the data defining the Hexagon problem.
 [x,xlow,xupp,xmul,xstate, ...
  Flow,Fupp,Fmul,Fstate, ...
- A.val,A.row,A.col,G.row,G.col] = hexagon;
+ A.val,A.row,A.col,G.row,G.col, ...
+ ObjRow, ObjAdd] = hexagon;
 
 [x,F,INFO] = snopt(x,xlow,xupp,xmul,xstate, ...
 		   Flow,Fupp,Fmul,Fstate, ...
 		   @snoptuserfun3, ...
+		   ObjAdd, ObjRow, ...
 		   A, G, options);
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  function [x,xlow,xupp,xmul,xstate, ...
    	     Flow,Fupp,Fmul,Fstate, ...
-	   A,iAfun,jAvar,iGfun,jGvar] = hexagon()
+	   A,iAfun,jAvar,iGfun,jGvar, ...
+	   Obj, ObjAdd] = hexagon()
 %function [x,xlow,xupp,Flow,Fupp,A,iAfun,jAvar,iGfun,jGvar] = hexagon()
 %
 % Defines the problem hexagon:
@@ -58,6 +63,7 @@
 neF    = 19;
 n      =  9;
 Obj    =  1; % The default objective row
+ObjAdd = 0.;
 
 % The nonzeros of the Jacobian of F are provided in snoptuserfun3
 
@@ -164,6 +170,4 @@
          .2;
          .25;
         -.2;
-        -.25 ];
-
-snset('Maximize');
+        -.25 ];