Resolve "Introduce conditional prior sets" (!332) · Merge requests · lscsoft / bilby · GitLab

Snippets Groups Projects

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

Dec 02, 2019
- Added minor suggestions on conditional priors · 4cf27b0f
  Moritz authored 5 years ago
  
  4cf27b0f
Nov 29, 2019
- Merge remote-tracking branch 'origin/master' into 270-introduce-correlated-prior-sets · 8257c69f
  Moritz authored 5 years ago
  
  8257c69f
- Fixed an issue during timing · 1c9db8ef
  Moritz authored 5 years ago
  
  1c9db8ef
Nov 21, 2019
- Removed obsolete OrderedDict · ac8380e1
  Moritz authored 5 years ago
  
  ac8380e1
- Merge remote-tracking branch 'origin/master' into 270-introduce-correlated-prior-sets · 2dd1a4b1
  Moritz authored 5 years ago
  
  # Conflicts: # bilby/gw/prior.py
  2dd1a4b1
Nov 06, 2019
- Removed an unused import · 11226717
  Moritz authored 5 years ago
  
  11226717
- Adapted cpnest to work with conditional priors · 98b30c31
  Moritz authored 5 years ago
  
  98b30c31
- Removed conditional secondary mass prior because incompatibilities · 24e6b0dd
  Moritz authored 5 years ago
  
  24e6b0dd
Oct 30, 2019
- Fixed an issue with testing ConditionalPriorDict.ln_prob · 69985321
  Moritz authored 5 years ago
  
  69985321
- Merge remote-tracking branch 'origin/master' into 270-introduce-correlated-prior-sets · a37722c8
  Moritz authored 5 years ago
  
  a37722c8
- Changed ConditionalPriorDict.ln_prob back because of technical issues · 7ef8941d
  Moritz authored 5 years ago
  
  7ef8941d
Oct 29, 2019
- Made a few statements relating to conditional prior dicts safer · 465661eb
  Moritz authored 5 years ago
  
  465661eb
- Made a few statements relating to conditional prior dicts safer · 38132c1c
  Moritz authored 5 years ago
  
  38132c1c
- Simplified some expressions for sample_subset · 6ed993dc
  Moritz authored 5 years ago
  
  6ed993dc
Oct 28, 2019
- Simplified an expression · 50df9881
  Moritz authored 5 years ago
  
  50df9881
Oct 24, 2019
- Added check when sampling multiple from conditional prior dict · 8a8352ba
  Moritz authored 5 years ago
  
  8a8352ba
- Created a generic conditional prior example · a9be56e1
  Moritz authored 5 years ago
  
  a9be56e1
- Created a generic conditional prior example · e636e4f6
  Moritz authored 5 years ago
  
  e636e4f6
Oct 23, 2019
- Added tests to modified waveform caching · e8a14cf0
  Moritz authored 5 years ago
  
  e8a14cf0
- Moved the location of the secondary mass condition function · 017a24d6
  Moritz authored 5 years ago
  
  017a24d6
- Merge branch 'allow-correlated-prior-saving' into 270-introduce-correlated-prior-sets · 62c83683
  Moritz authored 5 years ago
  
  62c83683
Oct 22, 2019
- Merge remote-tracking branch 'origin/master' into 270-introduce-correlated-prior-sets · 3cac428a
  Moritz authored 5 years ago
  
  3cac428a
- Merge branch 'master' into allow-correlated-prior-saving · 7ca88563
  Colm Talbot authored 5 years ago
  
  7ca88563
- allow conditional prior dicts to be written to/read from text/json · 7d6abd22
  Colm Talbot authored 5 years ago
  
  7d6abd22
Oct 17, 2019
- Fixed a final conditional prior test · 16369f82
  Moritz authored 5 years ago
  
  16369f82
- Some minor improvements to the conditional prior docstrings and logic · eb624d8d
  Moritz authored 5 years ago
  
  eb624d8d
- Fixed the conditional prior tests · f2ebbd77
  Moritz authored 5 years ago
  
  f2ebbd77
Oct 16, 2019
- Fixed some issues that I caused by rebasing · bd8fb0e3
  Moritz authored 5 years ago
  
  bd8fb0e3
- Fixed some issues that I caused by rebasing · d6a8f540
  Moritz authored 5 years ago
  
  d6a8f540
- Fixed some issues that I caused by rebasing · a4d38e1b
  Moritz authored 5 years ago
  
  a4d38e1b
- Merge remote-tracking branch 'origin/270-introduce-correlated-prior-sets' into... · 9e23bf59
  Moritz authored 5 years ago
  
  Merge remote-tracking branch 'origin/270-introduce-correlated-prior-sets' into 270-introduce-correlated-prior-sets # Conflicts: # bilby/core/prior.py
  9e23bf59
- Changed a label · 97052021
  Moritz authored 5 years ago
  
  97052021
- PEP 8 violations resolved · 1ef111fc
  Moritz authored 5 years ago
  
  1ef111fc
- Some modifications to ConditionalPriorDict after testing · a6f27db5
  Moritz authored 5 years ago
  
  a6f27db5
- Made minor improvements due to issues that came up when testing conditional priors · 90f0a79c
  Moritz authored 5 years ago
  
  90f0a79c
- Restructured obtaining of required variables for cond. priors · cfa37ed4
  Moritz authored 5 years ago
  
  cfa37ed4
- Reworked rescale method of ConditionalPriorDict · dd84a861
  Moritz authored 5 years ago
  
  dd84a861
- Rearranged some properties · 1972830f
  Moritz authored 5 years ago
  
  1972830f
- Fixed bug that caused conditional runs to stop · 1434e4be
  Moritz authored 5 years ago
  
  1434e4be
- Fixed an issue with the conditional secondary mass prior · 607b601a
  Moritz authored 5 years ago
  
  607b601a
- Some more code improvements on conditional prior dicts · 3ec52dcd
  Moritz authored 5 years ago
  
  3ec52dcd
- Simplified more logic in ConditionalPriorDict · e5fa7037
  Moritz authored 5 years ago
  
  e5fa7037
- Refactored recurring behaviour in ConditionalPriorDict into a method · daf1d5ce
  Moritz authored 5 years ago
  
  daf1d5ce
- Improved logic for conditional prior sets in prob/ln_prob/rescale · 63c5e1d8
  Moritz authored 5 years ago
  
  63c5e1d8
- Improved sampling logic for conditional prior sets · 73767bc6
  Moritz authored 5 years ago
  
  73767bc6
- Changed some stuff for the example · d1a0ed40
  Moritz authored 5 years ago
  
  d1a0ed40
- Made some more technical changes and added resetting for cond. priors · a2ed0568
  Moritz authored 5 years ago
  
  a2ed0568
- Made _get_instantiation_dict public · 0a34fb72
  Moritz authored 5 years ago
  
  0a34fb72
- Added least_recently_sampled to MultivariateGaussian · f2f7891a
  Moritz authored 5 years ago
  
  f2f7891a
- Added conditonal priors to tests · d2e94471
  Moritz authored 5 years ago
  
  d2e94471
- Made sure every ConditionalPrior class can be used by checking if the 'boundary' exists · a4ec60af
  Moritz authored 5 years ago
  
  a4ec60af
- Added extra checking when updating conditions in ConditionalPriorDicts · 787bef2a
  Moritz authored 5 years ago
  
  787bef2a
- renamed an internal function parameter · de38d30c
  Moritz authored 5 years ago
  
  de38d30c
- Cleaned up parts of the example · 6201534e
  Moritz authored 5 years ago
  
  6201534e
- Made prior saving/loading work for conditional priors (less condition function) · f710838a
  Moritz authored 5 years ago
  
  f710838a
- Fixed a PEP 8 violation · 4451647d
  Moritz authored 5 years ago
  
  4451647d
- Modified some values · 6d62a39f
  Moritz authored 5 years ago
  
  6d62a39f
- Changed some parameters · 41d2c3be
  Moritz authored 5 years ago
  
  41d2c3be
- Fixed some minor issues · 48d8c466
  Moritz authored 5 years ago
  
  48d8c466
- Modified some of the values · 141534a8
  Moritz authored 5 years ago
  
  141534a8
- Moved the file and added injection test · a71bca57
  Moritz authored 5 years ago
  
  a71bca57
- Fixed some minor bug relating to conditional priors · 560ae717
  Moritz authored 5 years ago
  
  560ae717
- Fixed a minor bug related to evaluation conditional priors · c5cc07a8
  Moritz authored 5 years ago
  
  c5cc07a8
- Added some documentation · f2ea7b87
  Moritz authored 5 years ago
  
  f2ea7b87
- Simplified condition function handling · a46945fd
  Moritz authored 5 years ago
  
  a46945fd
- Simplified some more code · fbe7b090
  Moritz authored 5 years ago
  
  fbe7b090
- Improved naming and simplified some code · 153b20d4
  Moritz authored 5 years ago
  
  153b20d4
- Simplified an expression · 1b2911d1
  Moritz authored 5 years ago
  
  1b2911d1
- Fixed an issue · 984bb61b
  Moritz authored 5 years ago
  
  984bb61b
- Made some more simplifications · 13b8dde9
  Moritz authored 5 years ago
  
  13b8dde9
- Added more conditional prior classes · e19a5c11
  Moritz authored 5 years ago
  
  e19a5c11
- Renamed correlated->conditional · 1c958458
  Moritz authored 5 years ago
  
  1c958458
- Developep factory pattern for conditional priors · 32145bb6
  Moritz authored 5 years ago
  
  32145bb6
- Made some simplifications · db2e4bb5
  Moritz authored 5 years ago
  
  db2e4bb5
- Renamed Correlated -> Conditional · 3e12c020
  Moritz authored 5 years ago
  
  3e12c020
- Tidied up the code a bit · 0abefb59
  Moritz authored 5 years ago
  
  0abefb59
- Tidied up the code a bit · a359b03f
  Moritz authored 5 years ago
  
  a359b03f
- Added least_recently_sampled back in · 1dda3f7a
  Moritz authored 5 years ago
  
  1dda3f7a
- Removed some obsolete code and added some docstring stubs · 4244994b
  Moritz authored 5 years ago
  
  4244994b
- flake8 · cad2c8d2
  Sylvia Biscoveanu authored 5 years ago
  
  cad2c8d2
- Look for correlation_func only · 3fc9fa13
  Sylvia Biscoveanu authored 5 years ago
  
  3fc9fa13
- flake8 · ad23d663
  Sylvia Biscoveanu authored 5 years ago
  
  ad23d663
- Convert function to string for json saving · ecd9b891
  Sylvia Biscoveanu authored 5 years ago
  
  ecd9b891
- remove break point · 539c693e
  Sylvia Biscoveanu authored 5 years ago
  
  539c693e
- Change the calls to sample() to use the method of the CorrelatedPriorDict intead of each key · 8437aca1
  Sylvia Biscoveanu authored 5 years ago
  
  8437aca1
- Fix the rescale, prob, and ln_prob methods of the CorrelatedPriorDict class · 17d1f42c
  Sylvia Biscoveanu authored 5 years ago
  
  17d1f42c
- Change example to reflect new structure of CorrelatedUniform · 2b67a284
  Sylvia Biscoveanu authored 5 years ago
  
  2b67a284
- Change min, max to dictionary · 62f575c6
  Sylvia Biscoveanu authored 5 years ago
  
  62f575c6
- Replace all calls to sample individual keys with call to sample from correlated prior dict · ce7c7491
  Sylvia Biscoveanu authored 5 years ago
  
  ce7c7491
- Revert "Rework CorrelatedUniform prior" · 1055de12
  Sylvia Biscoveanu authored 5 years ago
  
  This reverts commit 51758df6.
  1055de12
- Rework CorrelatedUniform prior · b80ec165
  Sylvia Biscoveanu authored 5 years ago
  
  b80ec165
- Simplified some stuff in the example · 21d98bf0
  Moritz authored 6 years ago
  
  21d98bf0
- Implemented CorrelatedGaussianPrior and CorrelatedUniformPrior · d611ed46
  Moritz authored 6 years ago
  
  d611ed46
- Implemented CorrelatedGaussianPrior and CorrelatedUniformPrior · e522f6f5
  Moritz authored 6 years ago
  
  e522f6f5
- Fixed a bug · 39e31c90
  Moritz authored 6 years ago
  
  39e31c90
- Changed CORRELATED_VARIABLES -> correlated_variables · de0e4af0
  Moritz authored 6 years ago
  
  de0e4af0
- Proof of concept for a generic implementation of correlated Priors · 1186b00b
  Moritz authored 6 years ago
  
  1186b00b
- Proof of concept for a generic implementation of correlated Priors · 8cb6edb7
  Moritz authored 6 years ago
  
  8cb6edb7
- Changed a label · 03a8636b
  Moritz authored 5 years ago
  
  03a8636b
- PEP 8 violations resolved · e81da3a7
  Moritz authored 5 years ago
  
  e81da3a7