-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Cleaner regularization code #60
Conversation
src/NosnocSolverOptions.m
Outdated
else | ||
psi_mpcc = alpha*(a+b-sqrt(a^2+b^2+sigma^2))+(1-alpha)*(a*b-sigma); | ||
end | ||
case CFunctionType.STEFFENSON_ULBRICH |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is "Steffensen"
src/NosnocSolverOptions.m
Outdated
z = x/normalized_sigma; | ||
y_sin = normalized_sigma*((2/pi)*sin(z*pi/2+3*pi/2)+1); | ||
psi_mpcc = a+b-if_else(abs(x)>=normalized_sigma,abs(x),y_sin); | ||
case CFunctionType.STEFFENSON_ULBRICH_POLY |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Steffensen
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, just fix the typos 👍
Fixes a bug in Lin-Fukushima, and makes explicit the bounds relaxations for regularizations that don't have strict lower bounds.
Also fixes some typos.