Skip to content
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

Dicg callback info #539

Merged
merged 2 commits into from
Dec 28, 2024
Merged

Dicg callback info #539

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
064ee70
DICG callback takes the inface vertices
matbesancon Dec 27, 2024
7bb86bc
format
matbesancon Dec 27, 2024
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
Next Next commit
DICG callback takes the inface vertices
  • Loading branch information
@matbesancon
matbesancon committed Dec 27, 2024
commit 064ee70f4db68182b69e15be21f9591247843a54
8 changes: 4 additions & 4 deletions src/dicg.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ function decomposition_invariant_conditional_gradient(
gradient,
step_type,
)
if callback(state) === false
if callback(state, a, v) === false
break
end
end
Expand Down Expand Up @@ -259,7 +259,7 @@ function decomposition_invariant_conditional_gradient(
gradient,
step_type,
)
callback(state)
callback(state, nothing, v)
end
end
return (x=x, v=v, primal=primal, dual_gap=dual_gap, traj_data=traj_data)
Expand Down Expand Up @@ -441,7 +441,7 @@ function blended_decomposition_invariant_conditional_gradient(
gradient,
step_type,
)
if callback(state) === false
if callback(state, a, v) === false
break
end
end
Expand Down Expand Up @@ -477,7 +477,7 @@ function blended_decomposition_invariant_conditional_gradient(
gradient,
step_type,
)
callback(state)
callback(state, nothing, v)
end
end
return (x=x, v=v, primal=primal, dual_gap=dual_gap, traj_data=traj_data)
Expand Down