Skip to content
Snippets Groups Projects

Resolve "Introduce conditional prior sets"

Merged Moritz Huebner requested to merge 270-introduce-correlated-prior-sets into master

Closes #270 (closed)

PP test show that the new capabilities do not interfere with the results we are getting so far. This test is done without any conditional priors, it just shows that everything still works as expected.

https://ldas-jobs.ligo.caltech.edu/~moritz.huebner/conditional_prior_pp/outdir_pp_test_4s/pp.png

Edited by Moritz Huebner

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Gregory Ashton changed milestone to %Future

    changed milestone to %Future

  • added 1 commit

    • 51758df6 - Rework CorrelatedUniform prior

    Compare with previous version

  • added 1 commit

    • eb57d8c6 - Revert "Rework CorrelatedUniform prior"

    Compare with previous version

  • Sorry, I tried to check out a fork of this branch and apparently ended up checking out the lscsoft version! I reverted the commit.

  • Moritz Huebner added 725 commits

    added 725 commits

    • eb57d8c6...d700db73 - 724 commits from branch master
    • c7424e50 - Merge remote-tracking branch 'origin/0.5.7-release' into 270-introduce-correlated-prior-sets

    Compare with previous version

  • Gregory Ashton mentioned in merge request !598 (merged)

    mentioned in merge request !598 (merged)

  • Moritz Huebner added 14 commits

    added 14 commits

    • 2e75c43e - Manually resolve conflicts
    • 6e22d3fb - Replace all calls to sample individual keys with call to sample from correlated prior dict
    • a944429d - Change min, max to dictionary
    • 28d63afd - Change example to reflect new structure of CorrelatedUniform
    • a76f32cc - Fix the rescale, prob, and ln_prob methods of the CorrelatedPriorDict class
    • ce06eb61 - Change the calls to sample() to use the method of the CorrelatedPriorDict intead of each key
    • eabf7f47 - remove break point
    • 40a41ee7 - Add axis argumant to ln_prob and don't cast result.prior to PriorDict
    • d1f2069b - Convert function to string for json saving
    • 7fad46c9 - flake8
    • f7d0951a - Look for correlation_func only
    • 201b2553 - flake8
    • 0b663559 - Merge remote-tracking branch 'origin/0.5.7-release' into correlated-priors-sylvia
    • ced3af19 - Merge branch 'correlated-priors-sylvia' into 270-introduce-correlated-prior-sets

    Compare with previous version

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 3 commits

    added 3 commits

    • eac937d9 - Removed some obsolete code and added some docstring stubs
    • a8ac2684 - Added least_recently_sampled back in
    • b010814e - Tidied up the code a bit

    Compare with previous version

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 28 commits

    added 28 commits

    • b010814e...5d55c3b4 - 26 commits from branch master
    • 337596a7 - Merge remote-tracking branch 'origin/master' into 270-introduce-correlated-prior-sets
    • 5a61f7e7 - Tidied up the code a bit

    Compare with previous version

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 3 commits

    added 3 commits

    • f899924a - Renamed Correlated -> Conditional
    • 678bb9b8 - Made some simplifications
    • 314cd514 - Developep factory pattern for conditional priors

    Compare with previous version

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 3 commits

    added 3 commits

    • f026fe3c - Renamed correlated->conditional
    • a16d4c5d - Added more conditional prior classes
    • 05447e4f - Made some more simplifications

    Compare with previous version

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 9 commits

    added 9 commits

    • 47cda57b - Fixed an issue
    • 35c689ba - Simplified an expression
    • c8717da3 - Improved naming and simplified some code
    • 013bb70f - Simplified some more code
    • a29f7232 - Simplified condition function handling
    • 32851c55 - Added some documentation
    • f537afb8 - Fixed a minor bug related to evaluation conditional priors
    • bb37ed55 - Fixed some minor bug relating to conditional priors
    • 43c028fd - Moved the file and added injection test

    Compare with previous version

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 3 commits

    added 3 commits

    Compare with previous version

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 1 commit

    added 1 commit

    Compare with previous version

  • Moritz Huebner changed title from WIP: Resolve "Introduce correlated prior sets" to WIP: Resolve "Introduce conditional prior sets"

    changed title from WIP: Resolve "Introduce correlated prior sets" to WIP: Resolve "Introduce conditional prior sets"

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 2 commits

    added 2 commits

    • 73ceeb21 - Fixed a PEP 8 violation
    • 55ebad70 - Made prior saving/loading work for conditional priors (less condition function)

    Compare with previous version

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 1 commit

    added 1 commit

    • 465b5272 - Cleaned up parts of the example

    Compare with previous version

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 7 commits

    added 7 commits

    • 628e29ed - renamed an internal function parameter
    • d05b5660 - Added extra checking when updating conditions in ConditionalPriorDicts
    • a36346cb - Made sure every ConditionalPrior class can be used by checking if the 'boundary' exists
    • 4669ab10 - Added conditonal priors to tests
    • 3a45e1d4 - Added least_recently_sampled to MultivariateGaussian
    • 4d1eb24c - Made _get_instantiation_dict public
    • 6cd3617a - Made some more technical changes and added resetting for cond. priors

    Compare with previous version

  • mentioned in issue #419 (closed)

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 6 commits

    added 6 commits

    • de1948a0 - Changed some stuff for the example
    • 4d25c431 - Improved sampling logic for conditional prior sets
    • ae8a5122 - Improved logic for conditional prior sets in prob/ln_prob/rescale
    • bbba6e11 - Refactored recurring behaviour in ConditionalPriorDict into a method
    • a002b57e - Simplified more logic in ConditionalPriorDict
    • f65cbdf3 - Some more code improvements on conditional prior dicts

    Compare with previous version

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 2 commits

    added 2 commits

    • b34164d2 - Fixed an issue with the conditional secondary mass prior
    • e6dd9912 - Fixed bug that caused conditional runs to stop

    Compare with previous version

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 5 commits

    added 5 commits

    • 4053a6fc - Rearranged some properties
    • 3418d898 - Reworked rescale method of ConditionalPriorDict
    • de5b87ee - Restructured obtaining of required variables for cond. priors
    • 4adcd871 - Made minor improvements due to issues that came up when testing conditional priors
    • f67b4961 - Some modifications to ConditionalPriorDict after testing

    Compare with previous version

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 34 commits

    added 34 commits

    • f67b4961...e042803b - 33 commits from branch master
    • 87b8aa02 - Merge remote-tracking branch 'origin/master' into 270-introduce-correlated-prior-sets

    Compare with previous version

  • Moritz Huebner unmarked as a Work In Progress

    unmarked as a Work In Progress

  • Moritz Huebner resolved all threads

    resolved all threads

  • Moritz Huebner added 1 commit

    added 1 commit

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading