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

**kwargs input and anesthetic.NestedSamples output #90

Merged
merged 95 commits into from
Jan 29, 2024
Merged

**kwargs input and anesthetic.NestedSamples output #90

merged 95 commits into from
Jan 29, 2024

Commits on May 19, 2022

  1. neighbor spelling (assuming we're sticking to American spelling!)

    @AdamOrmondroyd
    AdamOrmondroyd committed May 19, 2022
    Configuration menu
    Copy the full SHA
    f1f52ed View commit details
    Browse the repository at this point in the history

Commits on May 28, 2022

  1. Merge branch 'PolyChord:master' into master

    @AdamOrmondroyd
    AdamOrmondroyd authored May 28, 2022
    Configuration menu
    Copy the full SHA
    2f0c339 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. updated run_poypolychord to use **kwargs rather than PolyChordSettings

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    6efc40c View commit details
    Browse the repository at this point in the history

  2. return anesthetic.NestedSamples output if installed

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    df7b300 View commit details
    Browse the repository at this point in the history

  3. added kwargs to run_pypolychord() docstring

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    3f21a7b View commit details
    Browse the repository at this point in the history

  4. changed examples to use **kwargs

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    85b7dfb View commit details
    Browse the repository at this point in the history

  5. accidental rename of run_polychord()

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    8cfcd22 View commit details
    Browse the repository at this point in the history

  6. set kwarg defaults separately to run_pypolychord so that they can be … 

    …given to resume file
    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    84c30c3 View commit details
    Browse the repository at this point in the history

  7. run_polychord creates the paramnames file

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    6fe0516 View commit details
    Browse the repository at this point in the history

  8. changed other examples paramnames are passed to run_pypolychord

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    51928d0 View commit details
    Browse the repository at this point in the history

  9. mention anesthetic output in docstring (incomplete)

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    da44aa7 View commit details
    Browse the repository at this point in the history

  10. tidied up grade_dims and nlives argument processing

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    617ad12 View commit details
    Browse the repository at this point in the history

  11. logx should be logc

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    d375810 View commit details
    Browse the repository at this point in the history

  12. missing comma

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    6270512 View commit details
    Browse the repository at this point in the history

  13. removed settings argument

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    1316fa8 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2022

  1. Restored old interface

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    28ee39b View commit details
    Browse the repository at this point in the history

  2. run_polychord -> run

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    50fa72b View commit details
    Browse the repository at this point in the history

  3. reverted Python_Functions/ (apart from logx->logc correction

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    ae5c261 View commit details
    Browse the repository at this point in the history

  4. put PolyChordSettings back in __init__.py

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    247c51c View commit details
    Browse the repository at this point in the history

  5. run() uses make_resume_file_kwargs_interface

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    cf54330 View commit details
    Browse the repository at this point in the history

  6. added run to __init__.py

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    dd2cf63 View commit details
    Browse the repository at this point in the history

  7. update nDerived, prior and dumper to kwargs

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    7c06066 View commit details
    Browse the repository at this point in the history

  8. nDims is not a kwarg

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    7b79d66 View commit details
    Browse the repository at this point in the history

  9. add nDerived, prior and dumper to kwargs

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    9698948 View commit details
    Browse the repository at this point in the history

  10. use default_kwargs to set the defaults, then use this to see if kwarg… 

    …s has any excess keys
    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    5117092 View commit details
    Browse the repository at this point in the history

  11. separate default_kwargs that refer to other default_kwargs

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    aa64442 View commit details
    Browse the repository at this point in the history

  12. wrong brackets - think it's time to leave this for a moment

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    0f153cb View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. removed accidental commas

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    1ae0da3 View commit details
    Browse the repository at this point in the history

  2. pass kwargs directly rather than creating dict

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    477c796 View commit details
    Browse the repository at this point in the history

  3. added anesthetic to install_requires

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    0b5e998 View commit details
    Browse the repository at this point in the history

  4. anesthetic now assumed to be installed, so new interface always retur… 

    …ns an anesthetic output
    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    25eb130 View commit details
    Browse the repository at this point in the history

  5. tidy up plotting to just use anesthetic output

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    4b4f29f View commit details
    Browse the repository at this point in the history

  6. simplified to _make_resume_file(), plus wrapper _legacy_make_resume_f… 

    …ile which translates from a settings object
    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    8da3f8b View commit details
    Browse the repository at this point in the history

  7. added run_pypolychord_legacy_interface.py

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    405f67d View commit details
    Browse the repository at this point in the history

  8. update run() docstring to anesthetic output

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    78a9ca8 View commit details
    Browse the repository at this point in the history

  9. removed unused sqrt from run_pypolychord.py

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    78654d8 View commit details
    Browse the repository at this point in the history

  10. updated run_pypolychord.ipynb with py2nb

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    203f117 View commit details
    Browse the repository at this point in the history

  11. change requirement to anesthetic==2.0.0b11

    @AdamOrmondroyd
    AdamOrmondroyd committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    0730a18 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2022

  1. removed creation of .paramnames file from run(), added to run_pypolyc… 

    …hord.py
    @AdamOrmondroyd
    AdamOrmondroyd committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    b963910 View commit details
    Browse the repository at this point in the history

  2. corrected kwargs error message

    @AdamOrmondroyd
    AdamOrmondroyd committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    805db75 View commit details
    Browse the repository at this point in the history

  3. exception handling if chains/ already exists

    @AdamOrmondroyd
    AdamOrmondroyd committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    6b2ead8 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2022

  1. update to anesthetic 2.0.0b12

    @AdamOrmondroyd
    AdamOrmondroyd committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    07f51e7 View commit details
    Browse the repository at this point in the history

  2. rather than repeating PolyChordOutput.make_paramnames_file(), make it… 

    … a static method and reuse it
    @AdamOrmondroyd
    AdamOrmondroyd committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    72bdea6 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2022

  1. changed setup.py to point to github anesthetic as 2.0.0b12 hasn't bee… 

    …n released
    @AdamOrmondroyd
    AdamOrmondroyd committed Sep 18, 2022
    Configuration menu
    Copy the full SHA
    25198cd View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2022

  1. remove unecessary os import

    @AdamOrmondroyd
    AdamOrmondroyd committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    52d6592 View commit details
    Browse the repository at this point in the history

  2. removed commented out/empty lines around paramname creation

    @AdamOrmondroyd
    AdamOrmondroyd committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    5a750fa View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2022

  1. removed unnecessary kwargs = kwargs.copy()

    @AdamOrmondroyd
    AdamOrmondroyd committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    7f67a2a View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. double quotes to be more civilised

    @AdamOrmondroyd
    AdamOrmondroyd committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    23a766f View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2022

  1. change to single quotes to make Lucas happy

    @AdamOrmondroyd
    AdamOrmondroyd committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    77fe885 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2023

  1. Merge branch 'master' into anesthetic_output

    @williamjameshandley
    williamjameshandley authored Feb 7, 2023
    Configuration menu
    Copy the full SHA
    d05cfd2 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. Merge branch 'master' into anesthetic_output

    @AdamOrmondroyd
    AdamOrmondroyd committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    f860614 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Merge branch 'master' into anesthetic_output

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

  2. update for more recent anesthetic

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

  3. line spacing and remove todo (see pr 110

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

  4. Merge remote-tracking branch 'upstream/master' into anesthetic_output

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

  5. get anesthetic from pypi instead of gh

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

  6. might as well do some formatting

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

  7. also fix wrap_loglikelihood for new interface (PolyChord#110)

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

  8. Merge remote-tracking branch 'upstream/master' into anesthetic_output

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

  9. anesthetic back to optional, return None if not installed

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

  10. version bump to 1.22.0

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

  11. py2nb run_pypolychord.py

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

  12. Fix names of run scripts/notebooks

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

  13. remove testing print statement

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

  14. remove sqrt import, who knows where this came from

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

  15. Updated with new recommended interface

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

  16. Merge branch 'anesthetic_output' of github.com:AdamOrmondroyd/PolyCho… 

    …rdLite into anesthetic_output
    @williamjameshandley
    williamjameshandley committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    eac2ffb View commit details
    Browse the repository at this point in the history

  17. anesthetic root is deprecated

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

  18. Update README.rst

    @williamjameshandley
    williamjameshandley authored Jan 9, 2024
    Configuration menu
    Copy the full SHA
    2e3208d View commit details
    Browse the repository at this point in the history

  19. more anesthetic 2 madness

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

  20. update notebooks

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

  21. remove () from dict

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

  22. play around with tests

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

  23. add anesthetic to CI install step

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

  24. only run tests on python>=3.8

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

  25. test likelihood without derived parameters

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

  26. some test housekeeping

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

Commits on Jan 10, 2024

  1. Merge remote-tracking branch 'upstream/master' into anesthetic_output

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

  2. use or between the two loglikelihood return options

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

  3. use pathlib.Path to save OSError nonsense

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

  4. explain paramnames more clearly

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

  5. check that grade_dims add up to nDims and test

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

  6. update run docstring anesthetic stuff

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

  7. correct run_pypolychord return

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

  8. correct missing blank lines in run() docstring

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

  9. add cluster_dir to kwargs, since technically it could be changed in P… 

    …olyChordSettings (with difficulty)
    @AdamOrmondroyd
    AdamOrmondroyd committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    45e9f8c View commit details
    Browse the repository at this point in the history

  10. remove os entirely in favour of pathlib

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

  11. fix line too long

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

  12. update date

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

  13. fix default grade_frac

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

  14. remove pytest-mpi requirement from CI

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

Commits on Jan 25, 2024

  1. remove unecessary cast to set

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

Commits on Jan 27, 2024

  1. don't use ac shorthand, but also don't clutter the namespace with log… 

    … and pi
    @AdamOrmondroyd
    AdamOrmondroyd committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    cc807f5 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2024

  1. Revert "don't use ac shorthand, but also don't clutter the namespace … 

    …with log and pi"

This reverts commit cc807f5.
    @AdamOrmondroyd
    AdamOrmondroyd committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    6d735e5 View commit details
    Browse the repository at this point in the history

  2. from anesthetic import make_2d_axes

    @AdamOrmondroyd
    AdamOrmondroyd committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    5d9dadf View commit details
    Browse the repository at this point in the history