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

Spdhg with stochastic sampler #1644

Open
wants to merge 139 commits into
base: master
Choose a base branch
from
Open

Spdhg with stochastic sampler #1644

wants to merge 139 commits into from

Commits on Aug 2, 2023

  1. First attempt at sampling class

    @MargaretDuff
    MargaretDuff committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    8389932 View commit details
    Browse the repository at this point in the history

  2. Changed how probabilities and samplers interact in SPDHG

    @MargaretDuff
    MargaretDuff committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    7331c73 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Update sampling.py 

    Quick docstring

Signed-off-by: Margaret Duff <[email protected]>
    @MargaretDuff
    MargaretDuff authored Aug 8, 2023
    Configuration menu
    Copy the full SHA
    2bce666 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Changed to factory method style and added in permuatations

    @MargaretDuff
    MargaretDuff committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    ea759c5 View commit details
    Browse the repository at this point in the history

  2. Debugging and fixing random generator in show epochs

    @MargaretDuff
    MargaretDuff committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    d1909a3 View commit details
    Browse the repository at this point in the history

  3. Testing SPDHG

    @MargaretDuff
    MargaretDuff committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    98b0694 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Changed the show epochs

    @MargaretDuff
    MargaretDuff committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    05b67cb View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Meeting with Vaggelis, Jakob, Gemma and Edo

    @MargaretDuff
    MargaretDuff committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    001350b View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Set up for installation

    @MargaretDuff
    MargaretDuff committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    890dec0 View commit details
    Browse the repository at this point in the history

  2. Added staggered and custom order and started with writing documentation

    @MargaretDuff
    MargaretDuff committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    25806fc View commit details
    Browse the repository at this point in the history

  3. Work on documentation

    @MargaretDuff
    MargaretDuff committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    75abbfe View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Commenting and examples in the class

    @MargaretDuff
    MargaretDuff committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    ebdf329 View commit details
    Browse the repository at this point in the history

  2. Debugging sampler

    @MargaretDuff
    MargaretDuff committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    ba35fb8 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. Changes after dev meeting

    @MargaretDuff
    MargaretDuff committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    beac6fa View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. Checking probabilities in init

    @MargaretDuff
    MargaretDuff committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    1202e53 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. initial testing

    @MargaretDuff
    MargaretDuff committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    079935b View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Sped up PDHG and SPDHG testing

    @MargaretDuff
    MargaretDuff committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    43e3dc4 View commit details
    Browse the repository at this point in the history

  2. Removed timing statements

    @MargaretDuff
    MargaretDuff committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    004ab2f View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. Got rid of epochs - still need to fix the shuffle

    @MargaretDuff
    MargaretDuff committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    7b857e0 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. Fixed random without replacement shuffle=False

    @MargaretDuff
    MargaretDuff committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    1f7d546 View commit details
    Browse the repository at this point in the history

  2. Changes after meeting 12-09-2023. Remove epochs in sampler and deprec… 

    …ate prob in spdhg
    @MargaretDuff
    MargaretDuff committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    6993a95 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Sampler unit tests added

    @MargaretDuff
    MargaretDuff committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    bafc748 View commit details
    Browse the repository at this point in the history

  2. Some checks for setting step sizes

    @MargaretDuff
    MargaretDuff committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    d62aa2b View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Started looking at unit tests and debugging SPDHG setters and init

    @MargaretDuff
    MargaretDuff committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    c81b71c View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Notes after discussions with gemma

    @MargaretDuff
    MargaretDuff committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    b28f2f1 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. Changes after discussion with gemma

    @MargaretDuff
    MargaretDuff committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    4a87f48 View commit details
    Browse the repository at this point in the history

  2. Updated tests

    @MargaretDuff
    MargaretDuff committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    b35222f View commit details
    Browse the repository at this point in the history

  3. Just a commenting change

    @MargaretDuff
    MargaretDuff committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    6e552af View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Initial changes and tests- currently failing tests

    @MargaretDuff
    MargaretDuff committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    6575af6 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. Sorted tests and checks on the set_norms function

    @MargaretDuff
    MargaretDuff committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    6b463bc View commit details
    Browse the repository at this point in the history

  2. Changed a comment

    @MargaretDuff
    MargaretDuff committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    215bfa6 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Changes based on Gemma's review

    @MargaretDuff
    MargaretDuff committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    96e4730 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Comments from Edo fixed

    @MargaretDuff
    MargaretDuff committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    1ca3a2b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into blockoperator-norms 

    Signed-off-by: Margaret Duff <[email protected]>
    @MargaretDuff
    MargaretDuff authored Oct 9, 2023
    Configuration menu
    Copy the full SHA
    4b541e7 View commit details
    Browse the repository at this point in the history

  3. Added stuff to gitignore

    @MargaretDuff
    MargaretDuff committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    9a04de4 View commit details
    Browse the repository at this point in the history

  4. Fixed tests

    @MargaretDuff
    MargaretDuff committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    5a302c8 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. Added a note to the documentation about which sampler to use

    @MargaretDuff
    MargaretDuff committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    0bffa24 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:MargaretDuff/CIL-margaret into st… 

    …ochastic_sampling
    @MargaretDuff
    MargaretDuff committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    18647af View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. Moved the sampler to the algorithms folder

    @MargaretDuff
    MargaretDuff committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    222c377 View commit details
    Browse the repository at this point in the history

  2. Updated tests

    @MargaretDuff
    MargaretDuff committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    1d70eb3 View commit details
    Browse the repository at this point in the history

  3. Sampler inheritance

    @MargaretDuff
    MargaretDuff committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    5c9fa3a View commit details
    Browse the repository at this point in the history

  4. Moved sampler to a new folder algorithms.utilities- think there is st… 

    …ill a bug somewhere
    @MargaretDuff
    MargaretDuff committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    8e84276 View commit details
    Browse the repository at this point in the history

  5. changed cmake file for new folder

    @MargaretDuff
    MargaretDuff committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    c552257 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Some changes from Edo

    @MargaretDuff
    MargaretDuff committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    c6e1458 View commit details
    Browse the repository at this point in the history

  2. Maths documentation

    @MargaretDuff
    MargaretDuff committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    2b35fad View commit details
    Browse the repository at this point in the history

  3. Some more Edo comments on sampler

    @MargaretDuff
    MargaretDuff committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    43e6fee View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Tried to sort the tests

    @MargaretDuff
    MargaretDuff committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    f77b553 View commit details
    Browse the repository at this point in the history

  2. Vaggelis comment on checks

    @MargaretDuff
    MargaretDuff committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    cf1b7f1 View commit details
    Browse the repository at this point in the history

  3. Change to jinja version in doc_environment.yml

    @MargaretDuff
    MargaretDuff committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    c2c4df9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'TomographicImaging:master' into blockoperator-norms

    @MargaretDuff
    MargaretDuff authored Oct 17, 2023
    Configuration menu
    Copy the full SHA
    544a215 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Revert changes to docs_environment.yml

    @lauramurgatroyd
    lauramurgatroyd committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    d11296f View commit details
    Browse the repository at this point in the history

  2. Docstring change

    @MargaretDuff
    MargaretDuff committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    32e057b View commit details
    Browse the repository at this point in the history

  3. Docstring change

    @MargaretDuff
    MargaretDuff committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    4e0ca6a View commit details
    Browse the repository at this point in the history

  4. Revert naming of docs environment file

    @lauramurgatroyd
    lauramurgatroyd committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    87f1a00 View commit details
    Browse the repository at this point in the history

  5. Updated changelog

    @MargaretDuff
    MargaretDuff committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    2ff165a View commit details
    Browse the repository at this point in the history

  6. Updated changelog

    @MargaretDuff
    MargaretDuff committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    81fc7e2 View commit details
    Browse the repository at this point in the history

  7. Updated changelog

    @MargaretDuff
    MargaretDuff committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    8f100e0 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. Changes to docstring

    @MargaretDuff
    MargaretDuff committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    381342c View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Added size to the BlockOperator

    @MargaretDuff
    MargaretDuff committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    876d4c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Merged the blockoperator-norms branch

    @MargaretDuff
    MargaretDuff committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    5ae4aaf View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Removed precalculated_norms and pull the prob_weights from the sampler

    @MargaretDuff
    MargaretDuff committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    b983e2f View commit details
    Browse the repository at this point in the history

  2. Changes to setting tau and new unit test

    @MargaretDuff
    MargaretDuff committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    71cbdf9 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. Changes after discussion with Edo and Gemma

    @MargaretDuff
    MargaretDuff committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    f0f4de3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'blockoperator-norms' of github.com:MargaretDuff/CIL-mar… 

    …garet into blockoperator-norms
    @MargaretDuff
    MargaretDuff committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    100a42d View commit details
    Browse the repository at this point in the history

  3. Documentation changes

    @MargaretDuff
    MargaretDuff committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    26584c9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'blockoperator-norms' of github.com:MargaretDuff/CIL-mar… 

    …garet into stochastic_sampling
    @MargaretDuff
    MargaretDuff committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    ba8226b View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Changes to SPDHG with block_norms

    @MargaretDuff
    MargaretDuff committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    d182423 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Started setting up factory methods

    @MargaretDuff
    MargaretDuff committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    ad86a58 View commit details
    Browse the repository at this point in the history

  2. Added function sampler

    @MargaretDuff
    MargaretDuff committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    40ba3f4 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. prob_weights to sampler

    @MargaretDuff
    MargaretDuff committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    3760458 View commit details
    Browse the repository at this point in the history

  2. TODO:s

    @MargaretDuff
    MargaretDuff committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    878675d View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Updates to sampler

    @MargaretDuff
    MargaretDuff committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    2d99762 View commit details
    Browse the repository at this point in the history

  2. Updates to SPDHG after stochastic meeting

    @MargaretDuff
    MargaretDuff committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    7154834 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into stochastic_sampling 

    Signed-off-by: Margaret Duff <[email protected]>
    @MargaretDuff
    MargaretDuff authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    11a4624 View commit details
    Browse the repository at this point in the history

  4. Merge error fixed

    @MargaretDuff
    MargaretDuff committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    4e7f2b6 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. SPDHG documentation changes

    @MargaretDuff
    MargaretDuff committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    d861a13 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Merge branch 'master' into SPDHG_unit_tests

    @MargaretDuff
    MargaretDuff authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    ea4f114 View commit details
    Browse the repository at this point in the history

  2. Merged in SPDHG speed up

    @MargaretDuff
    MargaretDuff committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    f95560f View commit details
    Browse the repository at this point in the history

  3. Changes from meeting with Edo and Gemma

    @MargaretDuff
    MargaretDuff committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    0af2e61 View commit details
    Browse the repository at this point in the history

  4. Remove changes to BlockOperator.py

    @MargaretDuff
    MargaretDuff committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    8e14034 View commit details
    Browse the repository at this point in the history

  5. sigma and tau properties

    @MargaretDuff
    MargaretDuff committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    5c34e69 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. Another attempt at speeding up unit tests

    @MargaretDuff
    MargaretDuff committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    d1fffdf View commit details
    Browse the repository at this point in the history

  2. Added random seeds to tests

    @MargaretDuff
    MargaretDuff committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    b3dc8a1 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. Started on Gemma's suggestions

    @MargaretDuff
    MargaretDuff committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    edbaa9f View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Some more of Gemma's changes

    @MargaretDuff
    MargaretDuff committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    dc1b67a View commit details
    Browse the repository at this point in the history

  2. Last of Gemma's changes

    @MargaretDuff
    MargaretDuff committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    3b41fc4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into stochastic_sampling

    @MargaretDuff
    MargaretDuff authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    7e5759b View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Edo's comments

    @MargaretDuff
    MargaretDuff committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    bab0b98 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. New __str__ functions in sampler

    @MargaretDuff
    MargaretDuff committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    41ff3b5 View commit details
    Browse the repository at this point in the history

  2. Documentation changes

    @MargaretDuff
    MargaretDuff committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    aaa7200 View commit details
    Browse the repository at this point in the history

  3. Documentation changes x2

    @MargaretDuff
    MargaretDuff committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    b9bb04d View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Moved custom order to an example of a function

    @MargaretDuff
    MargaretDuff committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    ef25425 View commit details
    Browse the repository at this point in the history

  2. Back to num_indices and more explanation for custom function examples

    @MargaretDuff
    MargaretDuff committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    0948e39 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Updates from chat with Gemma

    @MargaretDuff
    MargaretDuff committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    5804f7d View commit details
    Browse the repository at this point in the history

  2. Updates from chat with Gemma

    @MargaretDuff
    MargaretDuff committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    fca94f4 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Pulled prime factorisation code out of the Herman Meyer function

    @MargaretDuff
    MargaretDuff committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    7d4ffe6 View commit details
    Browse the repository at this point in the history

  2. created herman_meyer sampling as a fucntion of iteration number

    @gfardell
    gfardell committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    2dba9d7 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Merge pull request #1 from gfardell/stochastic_sampling_hm 

    created herman_meyer sampling as a function of iteration number
    @MargaretDuff
    MargaretDuff authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    c576a51 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into stochastic_sampling 

    Signed-off-by: Margaret Duff <[email protected]>
    @MargaretDuff
    MargaretDuff authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    4c36fdf View commit details
    Browse the repository at this point in the history

  3. Update Wrappers/Python/cil/optimisation/algorithms/SPDHG.py 

    Co-authored-by: Edoardo Pasca <[email protected]>
Signed-off-by: Margaret Duff <[email protected]>
    @MargaretDuff @paskino
    MargaretDuff and paskino authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    f5c2d96 View commit details
    Browse the repository at this point in the history

  4. Changes from Edo review

    @MargaretDuff
    MargaretDuff committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    188000f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'stochastic_sampling' of github.com:MargaretDuff/CIL-mar… 

    …garet into stochastic_sampling
    @MargaretDuff
    MargaretDuff committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    0155e3d View commit details
    Browse the repository at this point in the history

  6. Removed from_order to replace with functions

    @MargaretDuff
    MargaretDuff committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    86c1e3e View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. fix failing tests

    @MargaretDuff
    MargaretDuff committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    47542a5 View commit details
    Browse the repository at this point in the history

  2. Test fix...again

    @MargaretDuff
    MargaretDuff committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    ddbdbb3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into stochastic_sampling

    @MargaretDuff
    MargaretDuff authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    8e7a6ac View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Move back to one class

    @MargaretDuff
    MargaretDuff committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    d896594 View commit details
    Browse the repository at this point in the history

  2. Remove axpyb

    @MargaretDuff
    MargaretDuff committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    d6e986a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into stochastic_sampling

    @MargaretDuff
    MargaretDuff authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    81a4716 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. Split into two classes

    @MargaretDuff
    MargaretDuff committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    ca05199 View commit details
    Browse the repository at this point in the history

  2. Tidy up the docstrings

    @MargaretDuff
    MargaretDuff committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    46d6dad View commit details
    Browse the repository at this point in the history

  3. Some formating things

    @MargaretDuff
    MargaretDuff committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    2b6b5c7 View commit details
    Browse the repository at this point in the history

  4. Example subclass

    @MargaretDuff
    MargaretDuff committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    235d26c View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Merge branch 'master' into stochastic_sampling 

    Signed-off-by: Margaret Duff <[email protected]>
    @MargaretDuff
    MargaretDuff authored Jan 9, 2024
    Configuration menu
    Copy the full SHA
    b28f0c2 View commit details
    Browse the repository at this point in the history

  2. Changes from meeting with Edo and Gemma

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

Commits on Jan 10, 2024

  1. Prob weights in init and documentation

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

Commits on Jan 15, 2024

  1. Merge branch 'master' into spdhg_sampler

    @MargaretDuff
    MargaretDuff authored Jan 15, 2024
    Configuration menu
    Copy the full SHA
    443e4da View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Merge branch 'master' into spdhg_sampler 

    Signed-off-by: Margaret Duff <[email protected]>
    @MargaretDuff
    MargaretDuff authored Jan 25, 2024
    Configuration menu
    Copy the full SHA
    e3bd7d5 View commit details
    Browse the repository at this point in the history

  2. Tidy up PR

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

  3. Moved some variables to hidden and updated doc-strings

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

Commits on Jan 30, 2024

  1. Update docs

    @MargaretDuff
    MargaretDuff committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    716a793 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Merge branch 'master' into spdhg_sampler 

    Signed-off-by: Margaret Duff <[email protected]>
    @MargaretDuff
    MargaretDuff authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    ebf617c View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Fixes TomographicImaging#1860

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

Commits on Jul 11, 2024

  1. Updated documentation and examples

    @MargaretDuff
    MargaretDuff committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    d7bc4dc View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Merge branch 'master' into spdhg_sampler 

    Signed-off-by: Margaret Duff <[email protected]>
    @MargaretDuff
    MargaretDuff authored Aug 22, 2024
    Configuration menu
    Copy the full SHA
    67ab790 View commit details
    Browse the repository at this point in the history

  2. Documentation updates and unit test fix

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

  3. Merge branch 'master' into spdhg_sampler 

    Signed-off-by: Margaret Duff <[email protected]>
    @MargaretDuff
    MargaretDuff authored Aug 22, 2024
    Configuration menu
    Copy the full SHA
    02133be View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Merge branch 'master' into spdhg_sampler

    @MargaretDuff
    MargaretDuff authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    0466abe View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into spdhg_sampler 

    Signed-off-by: Margaret Duff <[email protected]>
    @MargaretDuff
    MargaretDuff authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    b67d977 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Changes to sapyb call to save memory

    @MargaretDuff
    MargaretDuff committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    2b11156 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into spdhg_sampler

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

Commits on Sep 23, 2024

  1. Merge branch 'master' into spdhg_sampler

    @MargaretDuff
    MargaretDuff authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    2edd0e8 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Edo's comments

    @MargaretDuff
    MargaretDuff committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    9da703a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into spdhg_sampler

    @MargaretDuff
    MargaretDuff authored Oct 2, 2024
    Configuration menu
    Copy the full SHA
    0b42f5c View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Updates following discussion with Edo

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

Commits on Oct 8, 2024

  1. Merge branch 'master' into spdhg_sampler

    @MargaretDuff
    MargaretDuff authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    76780c8 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Changed sampler init

    @MargaretDuff
    MargaretDuff committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    e8641d0 View commit details
    Browse the repository at this point in the history

  2. Fix to failing test

    @MargaretDuff
    MargaretDuff committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    b1f0dbb View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Updates from Gemma's comments

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