Commit Graph

122 Commits

Author SHA1 Message Date
Mike Henry
dd7c4a8d84 update tests to match new std output 2024-04-17 07:56:29 -07:00
Richard Gowers
1dd5d7eab6 update LomapAtomMapper default settings to established best practices (#730)
* update LomapAtomMapper default settings to established best practices

* fixup tests for relative_alchemical_network_planner following lomap default change

make these tests use the legacy default settings for Lomap, they're just smoke testing and the actual mappings don't matter

* fixup regression tests for command line plan-rbfe

these are different now that the lomap defaults have been changed for 1.0

---------

Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>
2024-03-26 19:49:35 -07:00
Richard Gowers
0a64694fa5 Update fetch results (#779)
* update rbfe_results.tar.gz for new settings schema

* re-enable test_gather tests

* devscript for updating rbfe_results.tar.gz

* cli: gather: rework raw gather to work off protocol_result dict

this allows us to later deduplicate and remove the unit_results key from results dicts

* cli: gather: update expected gather results

current raw results are only one replicate, should probably have multiple repeats to test raw output

* cli: gather: use \t escape code in gather raw test

could instead normalise the whitespace to be more permissive...

* Apply suggestions from code review

Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>

* rerun ci

---------

Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>
2024-03-26 19:08:02 -07:00
richard gowers
2753f33a7e smoke test for central_ligand input via cli 2024-02-26 16:13:28 +00:00
IAlibay
b4907ce016 Add xfails 2024-02-08 18:25:59 +00:00
richard gowers
c8ee0f6d23 update sample data for gather tests 2024-02-06 17:47:47 +00:00
richard gowers
9abdc3662e temporarily mark as xfail while in migration 2024-02-06 17:47:37 +00:00
Richard Gowers
ae5374ed38 update away from nose test style 2024-02-06 09:04:10 +00:00
richard gowers
fcf5735b5f update openfecli test files for new settings 2024-02-06 00:08:18 +00:00
Richard Gowers
c96cb57163 Adds YAML input to CLI planning tools (#583)
* [skip ci]

draft of yaml format for CI

* adds yaml reader for cli options input

fixes #580

* change plan_rXfe_network_main functions to expect list of mappers

* move settings yaml parsing to be parameter

* add YAML_OPTIONS as parameter

* add YAML_OPTIONS to plan_rbfe_network

currently does nothing

* cli: add interpretation of settings yaml

* cli: enable settings yaml reading in plan_rbfe_network

* cli: some extra documentation on load_yaml

* cli: fix tests to account for normalisation

* cli: add test for custom rbfe yaml usage

* cli: update plan_rhfe to allow yaml options

* cli: use v1/2 compatible Pydantic

* cli: fixup pydantic v1/2 compat

* remove draft yaml idea

* cli:  centralise parsing of yaml options and defaults

* add pyyaml to deps

---------

Co-authored-by: Irfan Alibay <IAlibay@users.noreply.github.com>
2023-11-17 10:56:09 +00:00
Richard Gowers
94929f5c27 cli: gather raw option (#620)
* fixes issue #618

openfe gather will not correctly report DDG hydration values

* cli: add --report raw option to gather

this reports the unit estimates individually

* add doc to cli for gather raw option

* cli:  add test for gather raw

* cli:  gather, remove dg-raw option

* Update openfecli/commands/gather.py

Co-authored-by: Irfan Alibay <IAlibay@users.noreply.github.com>

* Update environment.yml

* change tyk2 regression to use gather --report ddg

* fixup raw gather test to include MBAR uncertainty label

---------

Co-authored-by: Irfan Alibay <IAlibay@users.noreply.github.com>
2023-11-17 10:42:26 +00:00
Richard Gowers
2af8dcda29 remove obsolete test data file (#621)
Co-authored-by: Mike Henry <11765982+mikemhenry@users.noreply.github.com>
2023-11-10 12:52:10 -07:00
Irfan Alibay
adf9e8ef49 Merge branch 'main' into charge-correction 2023-11-02 12:13:30 +00:00
David W.H. Swenson
2b762c60e0 Add gather --allow-partial, improve related error message (#588)
* improve error message

* Add --allow-partial to gather

* use it for the other call as well

* ignore coverage on line that should never happen

* Make it possible to do both RHFE and RBFE
2023-10-30 13:46:37 +00:00
IAlibay
c5616451f2 various pep8 fixes 2023-10-17 14:33:24 +01:00
IAlibay
ea0921b764 fix tests 2023-10-17 12:40:28 +01:00
Irfan Alibay
e35ca05e71 Update test_plan_rhfe_network.py 2023-10-17 08:05:15 +01:00
Irfan Alibay
4d2cf67373 Update test_plan_rbfe_network.py 2023-10-17 08:04:58 +01:00
IAlibay
734d17e245 try some tempdirs 2023-10-17 07:46:34 +01:00
IAlibay
879b0171d5 who globs data files? 2023-10-04 19:38:49 +01:00
David W.H. Swenson
7f830c8fd8 Improve error message if missing one leg for ligand pair (#568) 2023-09-26 12:29:02 -07:00
richard gowers
92b3b7e898 finish migration from resources.path to resources.files 2023-09-06 13:09:38 +01:00
richard gowers
c7259f8858 yet more migration from resources.path to resources.files 2023-09-06 13:09:38 +01:00
richard gowers
eac9f78bd3 more migration from resources.path to resources.files 2023-09-06 13:09:38 +01:00
David W.H. Swenson
b027cff8d0 update tutorial test 2023-08-24 09:59:55 +01:00
David W.H. Swenson
0601e7eb95 update gather tests 2023-08-24 09:59:55 +01:00
David W.H. Swenson
64b35a5b1a Add HyphenAwareChoice 2023-08-24 09:59:55 +01:00
David W.H. Swenson
5fff2b38b1 add tests for uncertainty calc stuff 2023-08-24 09:59:55 +01:00
David W.H. Swenson
3e67dc6a71 Merge branch 'main' into log 2023-08-01 11:06:40 -05:00
Mike Henry
16e7f54e18 Duplicate /home/mmh/Downloads/results.tar (2).gz history in openfecli/tests/data/rbfe_results.tar.gz history. (#496) 2023-08-01 17:03:42 +01:00
David W.H. Swenson
dbe288a0fa Apply suggestions from code review
Co-authored-by: Irfan Alibay <IAlibay@users.noreply.github.com>
2023-08-01 07:10:09 -05:00
David W.H. Swenson
4e0a50b86b Update logging; final tests 2023-07-31 16:35:24 -05:00
David W.H. Swenson
82bb48e9ac finish tests of configure_logger 2023-07-31 15:07:37 -05:00
David W.H. Swenson
65bc171411 testing things involving root logger is hard 2023-07-31 14:45:09 -05:00
richard gowers
516a3aeb55 allow gathering of legacy results 2023-07-05 18:22:21 +01:00
richard gowers
916695fa87 fix gather entry order
also sort leg types in gather
2023-07-03 10:52:40 +01:00
richard gowers
8c99d03941 remove a debug line 2023-07-03 10:52:40 +01:00
richard gowers
1ad3e41143 add tyk2 tutorial tests 2023-07-03 10:52:40 +01:00
richard gowers
8af9335f32 add tyk2 test files 2023-07-03 10:52:40 +01:00
richard gowers
0c9703f086 use -C for cofactors input
allow multiple cofactor files
2023-06-22 13:00:32 +01:00
richard gowers
87ccf5757b strip out most of the eg5 ligands
speeds up cli tests
2023-06-22 13:00:32 +01:00
richard gowers
bf14794ebe add test for cofactor containing system through cli 2023-06-22 13:00:32 +01:00
richard gowers
3abaf55849 plumb in cofactors to rbfe cli 2023-06-22 13:00:32 +01:00
richard gowers
259ca74ce4 gather: disable gather tests for now 2023-06-12 12:10:34 +01:00
Mike Henry
d404d55eb3 add needed assets for showcase notebook 2023-06-12 10:22:01 +01:00
David W.H. Swenson
4cc915cd67 CLI Updates
1. Updates to improve help for plan-*-network
2. Renamed ligand-network-viewer to view-ligand-network (commands are
   verbs)
2023-05-13 07:16:51 -04:00
David W.H. Swenson
16155ea83f Merge branch 'main' into regroup-sections 2023-05-11 12:47:05 -04:00
David W.H. Swenson
7c04812e81 Allow multiple orders of ligand loading 2023-05-11 12:35:58 -04:00
David W.H. Swenson
23196f8f11 Line-by-line asserts in test_plan_*_network
We're getting some weird errors in CI on these (apparently OS-specific?)
This will help debug that.
2023-05-11 12:35:58 -04:00
David W.H. Swenson
e01b6d1d3b Clean up fetch command organization 2023-05-10 12:13:57 -04:00