Skip to content

Commit

Permalink
fixed bug in BFGS and fixed bug in active set plot
Browse files Browse the repository at this point in the history
  • Loading branch information
alexe15 committed Jun 3, 2020
1 parent b4e38e8 commit 9528721
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/core/initializeVariables.m
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
iter.logg.Mfun = [];
iter.logg.consViol = inf;
iter.logg.wrkSet = zeros(ng + nh,opts.maxiter);
iter.logg.wrkSetChang = zeros(ng + nh,opts.maxiter);
iter.logg.wrkSetChang = zeros(1,opts.maxiter);
iter.logg.obj = zeros(1,opts.maxiter);
% iter.logg.desc = [];
% iter.logg.alpha = [];
Expand Down
2 changes: 1 addition & 1 deletion src/core/logValues.m
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@
iter.logg.wrkSet(:,i) = ~vertcat(iter.loc.inact{:});

if i>2 % number of changing active constraints
iter.logg.wrkSetChang(:,i) = sum(abs(iter.logg.wrkSet(:,end-1) - ~vertcat(iter.loc.inact{:})));
iter.logg.wrkSetChang(:,i) = sum(abs(iter.logg.wrkSet(:,i-1) - iter.logg.wrkSet(:,i)));
end
end

0 comments on commit 9528721

Please sign in to comment.