Skip to content

Fixing a bug with success #304

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.

Sign up for GitHub

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

Merged
jmlarson1 merged 2 commits into from
Jun 10, 2026
Merged

Fixing a bug with success #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f22ee89
Fixing a bug with success
jmlarson1 Jun 10, 2026
0570d80
Making the same change in matlab
jmlarson1 Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion manifold_sampling/m/manifold_sampling_primal.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@
while nf < nf_max && delta > tol.mindelta
bar_delta = delta;

successful = false;

% Line 3: manifold sampling while loop
while nf < nf_max

Expand Down Expand Up @@ -168,7 +170,6 @@

% Line 20: See if intersection is nonempty
if any(ismember(hashes_at_nf, Act_Z_k))
successful = false; % iteration is unsuccessful
break
else
% Line 24: Shrink delta
Expand Down
2 changes: 1 addition & 1 deletion manifold_sampling/py/manifold_sampling_primal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ def manifold_sampling_primal(hfun, Ffun, x0, L, U, nf_max, subprob_switch):

bar_delta = delta

successful = False
# Line 3: manifold sampling while loop
while nf + 1 < nf_max:
# Line 4: build models
Expand Down Expand Up @@ -167,7 +168,6 @@ def manifold_sampling_primal(hfun, Ffun, x0, L, U, nf_max, subprob_switch):
if np.all(np.isin(tmp_Act_Z_k, Act_Z_k)):
# Line 20: See if intersection is nonempty
if np.any(np.isin(hashes_at_nf, Act_Z_k)):
successful = False
break
else:
# Line 24: Shrink delta
Expand Down
Loading