WIP: Incorporate latest upstream changes #6
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There are quite a few changes to the MEX files, so we'll want to handle with care. |
mcg1969
commented
May 7, 2017
| @@ -32,11 +32,11 @@ | |||
| const = 1e-2/max(1,norm(par.dy2)); | |||
| alpha = max(1e-14,min(1e-10,const*norm(par.rp))/(1+norm(diagschur.*par.dy2))); | |||
| pertdiag = alpha*max(1e-8,diagschur); %% Note: alpha is close to 1e-15. | |||
| mexschurfun(schur,pertdiag); | |||
| schur = mexschurfun(schur,pertdiag); | |||
There was a problem hiding this comment.
One of the key functional changes: eliminating the reliance on MEX side effects. This is but one of the many instances of this change.
mcg1969
commented
May 7, 2017
| newtol = max(relgap,infeas); | ||
| update_best(iter+1) = ~( newtol >= besttol ); %#ok | ||
| if update_best(iter+1), | ||
| if ((prim_infeas < 1.5*prim_infeas_best) ... |
There was a problem hiding this comment.
Non-trivial changes to progress tracking.
mcg1969
commented
May 7, 2017
| @@ -68,7 +68,7 @@ | |||
| if (printlevel); fprintf('\n %s',msg); end | |||
| end | |||
| if (termcode == 3) | |||
| maxblowup = max(ops(X,'norm')/normX0,ops(Z,'norm')/normZ0); | |||
| maxblowup = max(ops(X,'norm')/max(1,normX0),ops(Z,'norm')/max(1,normZ0)); | |||
There was a problem hiding this comment.
Note the change to stopping criteria
mcg1969
commented
May 7, 2017
| @@ -38,17 +38,23 @@ | |||
| % stime = cputime; | |||
| Ap = At{p}'; Cp = C{p}; | |||
There was a problem hiding this comment.
Non-trivial changes here.
mcg1969
commented
May 7, 2017
| @@ -71,17 +71,26 @@ | |||
| end | |||
| else | |||
| decolidx = checkdense(At{p,1}'); | |||
| %% checkdense punts if the matrix has too many dense columns | |||
There was a problem hiding this comment.
Non-trivial changes here.
|
Tested against |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5.
No MEX files have been recompiled yet. So needless to say, it isn't even tested yet. This is not ready to merge.