Skip to content

Conversation

@MohamedLaghdafHABIBOULLAH
Copy link
Collaborator

Add still allocating versions of R2N and R2DH.
Update LM to give the possibility to use R2DH as subsolver

Copy link
Member

@dpo dpo left a comment

Choose a reason for hiding this comment

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

Please update LM in a separate PR. It's unrelated to R2N.

@MohamedLaghdafHABIBOULLAH MohamedLaghdafHABIBOULLAH force-pushed the R2N-R2DH branch 3 times, most recently from 4700798 to b6cd089 Compare September 17, 2024 05:43
@MohamedLaghdafHABIBOULLAH
Copy link
Collaborator Author

@dpo here I add a test in line 194 to discuss the case if $$mk(s)$$ is big enough

@MohamedLaghdafHABIBOULLAH
Copy link
Collaborator Author

@dpo il est à noter que je me suis permis de changer R2_alg.jl afin de pouvoir récupérer le temps pour chaque iter et tracer la courbe objective vs temps

@dpo
Copy link
Member

dpo commented Sep 17, 2024

@dpo il est à noter que je me suis permis de changer R2_alg.jl afin de pouvoir récupérer le temps pour chaque iter et tracer la courbe objective vs temps

src/R2DH.jl Outdated
D.d .= summation ? D.d .+ σk : D.d .* σk
DNorm = norm(D.d, Inf)


Copy link
Member

Choose a reason for hiding this comment

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

Remove all duplicate blank lines.

@MohamedLaghdafHABIBOULLAH
Copy link
Collaborator Author

Thanks @dpo for the comments. I tried to incorporate and answer all your comments.
Now I need to add some unitests

@MaxenceGollier
Copy link
Collaborator

This PR has been open for a while now, can we merge it ? @MohamedLaghdafHABIBOULLAH @dpo
I will open a PR thereafter that will remove the allocations.

@dpo
Copy link
Member

dpo commented Dec 23, 2024

I would much prefer to review one PR instead of two. Could you please put your work together into a single PR? Maybe just close this one and open a new one?!

@dpo
Copy link
Member

dpo commented Jan 9, 2025

@MohamedLaghdafHABIBOULLAH Please rebase this branch against main.

Copy link
Member

@dpo dpo left a comment

Choose a reason for hiding this comment

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

@MohamedLaghdafHABIBOULLAH Let’s please finish this fast.

@MaxenceGollier
Copy link
Collaborator

@dpo, are we planning to merge this first in the end ?

I would much prefer to review one PR instead of two. Could you please put your work together into a single PR? Maybe just close this one and open a new one?!

Some of your comments are already taken care of in my version

What is this bit for? If it is to increase σk until the prox returns a finite value, there should be a while. Otherwise, please remove it. It doesn’t appear in any other solver.

precise when to debug

Co-authored-by: Dominique <dominique.orban@gmail.com>
correct $\Delta_{mod}$

Co-authored-by: Dominique <dominique.orban@gmail.com>
Add some unit tests for R2DH/R2N/R2N_R2DH
Co-authored-by: Dominique <dominique.orban@gmail.com>
Co-authored-by: Dominique <dominique.orban@gmail.com>
Co-authored-by: Dominique <dominique.orban@gmail.com>
I will add (-Inf) condition in ShiftedProximalOperators as well
Co-authored-by: Dominique <dominique.orban@gmail.com>
Co-authored-by: Dominique <dominique.orban@gmail.com>
Co-authored-by: Dominique <dominique.orban@gmail.com>
Co-authored-by: Dominique <dominique.orban@gmail.com>
Co-authored-by: Dominique <dominique.orban@gmail.com>
Co-authored-by: Dominique <dominique.orban@gmail.com>
Co-authored-by: Dominique <dominique.orban@gmail.com>
Co-authored-by: Maxence Gollier <134112149+MaxenceGollier@users.noreply.github.com>
Add a documentation for second calling form of R2DH
@MohamedLaghdafHABIBOULLAH
Copy link
Collaborator Author

The tests with Julia 1 fail.

Just sync your fork @MohamedLaghdafHABIBOULLAH and tests should pass on Julia 1. The errors are on the R2 allocation test which where solved recently in #164

Now it should be better @MaxenceGollier.

@MaxenceGollier
Copy link
Collaborator

The demo with TRDH keeps failing by the way, perhaps we should add a random seed to prevent it.

@MohamedLaghdafHABIBOULLAH
Copy link
Collaborator Author

MohamedLaghdafHABIBOULLAH commented Jan 16, 2025

The demo with TRDH keeps failing by the way, perhaps we should add a random seed to prevent it.

You mean we need to change the seed?

@MohamedLaghdafHABIBOULLAH
Copy link
Collaborator Author

demo-Julia-1-test

Even on the master branch, this demo test fails. Should we open an issue?

@dpo
Copy link
Member

dpo commented Jan 17, 2025

The demos will have to be overhauled completely after we remove FHist, etc., anyways.

@dpo dpo merged commit 356eef3 into JuliaSmoothOptimizers:master Jan 17, 2025
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants