Skip to content

Commit

Permalink
231007.214939.HKT set eta1, eta2, gamma1, gamma2 in the MATLAB interface
Browse files Browse the repository at this point in the history
  • Loading branch information
zaikunzhang committed Oct 7, 2023
1 parent 778f0dd commit 894fa3b
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions matlab/interfaces/private/preprima.m
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,10 @@
output_nlchist = false; % Output the history of the nonlinear constraints?
min_maxfilt = 200; % The smallest value of maxfilt; if maxfilt is too small, the returned x may not be the best one visited
maxfilt = 10*min_maxfilt; % Length of the filter used for selecting the returned x in constrained problems
eta1 = 0.1;
eta2 = 0.7;
gamma1 = 0.5;
gamma2 = 2;

if ~(isa(options, 'struct') || isempty(options))
% Public/normal error
Expand Down Expand Up @@ -1616,7 +1620,7 @@
end
end
if ~validated
options.eta1 = NaN; % NaN means that Fortran will take the hard-coded default value.
options.eta1 = eta1;
end
options.eta1 = double(options.eta1);

Expand All @@ -1641,7 +1645,7 @@
end
end
if ~validated
options.eta2 = NaN; % NaN means that Fortran will take the hard-coded default value.
options.eta2 = eta2;
end
options.eta2 = double(options.eta2);

Expand All @@ -1658,7 +1662,7 @@
end
end
if ~validated
options.gamma1 = NaN; % NaN means that Fortran will take the hard-coded default value.
options.gamma1 = gamma1;
end
options.gamma1 = double(options.gamma1);

Expand All @@ -1675,7 +1679,7 @@
end
end
if ~validated
options.gamma2 = NaN; % NaN means that Fortran will take the hard-coded default value.
options.gamma2 = gamma2;
end
options.gamma2 = double(options.gamma2);

Expand Down

1 comment on commit 894fa3b

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@check-spelling-bot Report

🔴 Please review

See the 📜action log or 📝 job summary for details.

Unrecognized words (2)

gcp
whos

To accept these unrecognized words as correct, you could run the following commands

... in a clone of the git@github.com:libprima/prima.git repository
on the main branch (ℹ️ how do I use this?):

curl -s -S -L 'https://raw.githubusercontent.com/check-spelling/check-spelling/main/apply.pl' |
perl - 'https://github.com/libprima/prima/actions/runs/6441564932/attempts/1'
If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

Please sign in to comment.