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

Jump to bottom

Step-size methods and preconditoners for GD #1768

Merged
merged 47 commits into from
May 24, 2024
Merged

Step-size methods and preconditoners for GD #1768

merged 47 commits into from
May 24, 2024

Commits on Mar 28, 2024

  1. I think the step_size_rule class is working

    @MargaretDuff
    MargaretDuff committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    faefe9c View commit details
    Browse the repository at this point in the history

  2. Actuallly added the right file

    @MargaretDuff
    MargaretDuff committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    d15c940 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:TomographicImaging/CIL into GD-ca… 

    …llbacks-stepsizes
    @MargaretDuff
    MargaretDuff committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    533d1aa View commit details
    Browse the repository at this point in the history

  4. Added Vaggelis' preconditioner code

    @MargaretDuff
    MargaretDuff committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    bb4852f View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Merge branch 'master' into GD-callbacks-stepsizes 

    Signed-off-by: Margaret Duff <43645617+MargaretDuff@users.noreply.github.com>
    @MargaretDuff
    MargaretDuff authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    16f21ff View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. Fix to armijio rule

    @MargaretDuff
    MargaretDuff committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    1c375aa View commit details
    Browse the repository at this point in the history

  2. Fix to Rosenbrock tests

    @MargaretDuff
    MargaretDuff committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    c681fb4 View commit details
    Browse the repository at this point in the history

  3. Unit tests for the step size methods

    @MargaretDuff
    MargaretDuff committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    4c6f6f8 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. preconditioner testing

    @MargaretDuff
    MargaretDuff committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    07db6ec View commit details
    Browse the repository at this point in the history

  2. preconditioner testing

    @MargaretDuff
    MargaretDuff committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    d3b25e0 View commit details
    Browse the repository at this point in the history

  3. preconditioner testing bug fix

    @MargaretDuff
    MargaretDuff committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    35c545a View commit details
    Browse the repository at this point in the history

  4. preconditioner testing bug fix - attempt 2

    @MargaretDuff
    MargaretDuff committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    bc863d6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into GD-callbacks-stepsizes

    @MargaretDuff
    MargaretDuff authored Apr 23, 2024
    Configuration menu
    Copy the full SHA
    196ec0e View commit details
    Browse the repository at this point in the history

  6. Unit tests for adaptive sensitivity

    @MargaretDuff
    MargaretDuff committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    3c06c05 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Unit tests for adaptive sensitivity - with random seeds :)

    @MargaretDuff
    MargaretDuff committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    c65b77a View commit details
    Browse the repository at this point in the history

  2. Draft for Adam and AdaGrad pre-conditioners

    @MargaretDuff
    MargaretDuff committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    72777d9 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. Update adam and adagrad. Adam tests are failing

    @MargaretDuff
    MargaretDuff committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    f570890 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Fix to Adam pre-conditioner

    @MargaretDuff
    MargaretDuff committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    0e757d9 View commit details
    Browse the repository at this point in the history

  2. Changes in documentation and optimisation.rst file

    @MargaretDuff
    MargaretDuff committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    76f652d View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Documentation update

    @MargaretDuff
    MargaretDuff committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    9a23278 View commit details
    Browse the repository at this point in the history

  2. Unit tests without saved sensitivity matrix

    @MargaretDuff
    MargaretDuff committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    1621f98 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Added step sizes and preconditioners for ISTA and FISTA

    @MargaretDuff
    MargaretDuff committed May 1, 2024
    Configuration menu
    Copy the full SHA
    731c5db View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into GD-callbacks-stepsizes

    @MargaretDuff
    MargaretDuff authored May 1, 2024
    Configuration menu
    Copy the full SHA
    a43770f View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Reorganised unit tests and unit tests for ISTA and FISTA pre-conditio… 

    …ners and step-sizes
    @MargaretDuff
    MargaretDuff committed May 2, 2024
    Configuration menu
    Copy the full SHA
    8929ed9 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. New unit tests and safe division

    @MargaretDuff
    MargaretDuff committed May 7, 2024
    Configuration menu
    Copy the full SHA
    ddda834 View commit details
    Browse the repository at this point in the history

  2. New tests for step-sizes

    @MargaretDuff
    MargaretDuff committed May 7, 2024
    Configuration menu
    Copy the full SHA
    a4dae02 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. PR tidy

    @MargaretDuff
    MargaretDuff committed May 8, 2024
    Configuration menu
    Copy the full SHA
    a84bc8b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into GD-callbacks-stepsizes

    @MargaretDuff
    MargaretDuff authored May 8, 2024
    Configuration menu
    Copy the full SHA
    34b3c6b View commit details
    Browse the repository at this point in the history

  3. Changes after stochastic catch-up meeting

    @MargaretDuff
    MargaretDuff committed May 8, 2024
    Configuration menu
    Copy the full SHA
    70024f6 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Removed adam and adagrad and ressponded to Vaggelis and Kris' comments

    @MargaretDuff
    MargaretDuff committed May 10, 2024
    Configuration menu
    Copy the full SHA
    a9b3a05 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into GD-callbacks-stepsizes

    @MargaretDuff
    MargaretDuff authored May 10, 2024
    Configuration menu
    Copy the full SHA
    106a53c View commit details
    Browse the repository at this point in the history

  3. Unit tests should now pass

    @MargaretDuff
    MargaretDuff committed May 10, 2024
    Configuration menu
    Copy the full SHA
    d358b7b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'GD-callbacks-stepsizes' of github.com:MargaretDuff/CIL-… 

    …margaret into GD-callbacks-stepsizes
    @MargaretDuff
    MargaretDuff committed May 10, 2024
    Configuration menu
    Copy the full SHA
    d34c4e4 View commit details
    Browse the repository at this point in the history

  5. Check convergence not possible if a preconditioner is passed

    @MargaretDuff
    MargaretDuff committed May 10, 2024
    Configuration menu
    Copy the full SHA
    e93ba49 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Merge branch 'master' into GD-callbacks-stepsizes

    @MargaretDuff
    MargaretDuff authored May 13, 2024
    Configuration menu
    Copy the full SHA
    dfe61ca View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Merge branch 'master' into GD-callbacks-stepsizes

    @MargaretDuff
    MargaretDuff authored May 15, 2024
    Configuration menu
    Copy the full SHA
    405d3a5 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Changes from stochastic catch-up discussion

    @MargaretDuff
    MargaretDuff committed May 16, 2024
    Configuration menu
    Copy the full SHA
    55e1689 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into GD-callbacks-stepsizes

    @MargaretDuff
    MargaretDuff authored May 16, 2024
    Configuration menu
    Copy the full SHA
    efab7e3 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Changes from Kris' review

    @MargaretDuff
    MargaretDuff committed May 17, 2024
    Configuration menu
    Copy the full SHA
    6b9c2f1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'GD-callbacks-stepsizes' of github.com:MargaretDuff/CIL-… 

    …margaret into GD-callbacks-stepsizes
    @MargaretDuff
    MargaretDuff committed May 17, 2024
    Configuration menu
    Copy the full SHA
    11e7305 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Reviews by Edo and Vaggelis

    @MargaretDuff
    MargaretDuff committed May 22, 2024
    Configuration menu
    Copy the full SHA
    a1fedb6 View commit details
    Browse the repository at this point in the history

  2. Changes after discussion with Edo and Vaggelis

    @MargaretDuff
    MargaretDuff committed May 22, 2024
    Configuration menu
    Copy the full SHA
    439222d View commit details
    Browse the repository at this point in the history

  3. Documentation and fix unit test

    @MargaretDuff
    MargaretDuff committed May 22, 2024
    Configuration menu
    Copy the full SHA
    0955dc7 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Changed from Edo's review

    @MargaretDuff
    MargaretDuff committed May 23, 2024
    Configuration menu
    Copy the full SHA
    76137de View commit details
    Browse the repository at this point in the history

  2. Unit test changes

    @MargaretDuff
    MargaretDuff committed May 23, 2024
    Configuration menu
    Copy the full SHA
    b7bbc56 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Update CHANGELOG.md 

    Signed-off-by: Margaret Duff <43645617+MargaretDuff@users.noreply.github.com>
    @MargaretDuff
    MargaretDuff authored May 24, 2024
    Configuration menu
    Copy the full SHA
    c5b648c View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG.md 

    Signed-off-by: Margaret Duff <43645617+MargaretDuff@users.noreply.github.com>
    @MargaretDuff
    MargaretDuff authored May 24, 2024
    Configuration menu
    Copy the full SHA
    472d588 View commit details
    Browse the repository at this point in the history