8000 matchms similarity: fix bug in RI filtering by maximskorik · Pull Request #300 · RECETOX/galaxytools · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

matchms similarity: fix bug in RI filtering #300

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.

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

Merged
merged 4 commits into from
Sep 8, 2022

Conversation

maximskorik
Copy link
Member
@maximskorik maximskorik commented Sep 8, 2022

Fix bug in RI masking.

Because matchms.Scores.scores property doesn't have a setter

scores.scores["score"] = np.where(ri_matches, scores.scores["score"], 0.0)

doesn't update this attribute.

Closes #298

@maximskorik maximskorik added the bug Something isn't working label Sep 8, 2022
@maximskorik maximskorik marked this pull request as draft September 8, 2022 12:49
@maximskorik maximskorik marked this pull request as ready for review September 8, 2022 14:19
@maximskorik maximskorik merged commit b974ff3 into RECETOX:master Sep 8, 2022
maximskorik added a commit to maximskorik/galaxytools that referenced this pull request Oct 12, 2022
maximskorik added a commit that referenced this pull request Oct 18, 2022
* update test data

* remove matches from output

* update `write_outputs` to return serialized `Scores` json

* update matchMS formatter tests

* remove matches file from formatter.py

* add matchms dependency

* replace deprecated decorator

* correct typos; update docs

* update similarity and formatter help

* remove duplicated help section

* add maximskorik to authors

* bump `matchms` version

* finish `matchms_formatter`

* update test data produced with erroneous ri_filtering (#300)

* update test data

* update zenodo link

* update `matchms_formatter` test data

* update link to zenodo in `matchms_filtering`

* lint

* Update tools/matchms/matchms_similarity.xml

* reduced testdata

* Started updating test data

* annotate tests

* reduce test_3

* update test_2

* truncate recetox_gc-ei_ms; update test_4

* update test_5

* update test_2 to test same format files

* add descriptive test annotations

* remove unused data

* update matchms_formatter test data

* put `MPLCONFIGDIR` to macros and add to `matchms_formatter`

* remove `environment_variables` macros; config Fontconfig via envvar

* remove indent

Co-authored-by: Helge Hecht <helge.hecht@recetox.muni.cz>
maximskorik added a commit that referenced this pull request Oct 18, 2022
* initialize wrapper

* add inputs and output

* add tests

* change param's help

* add help

* add tool to .shed.yml

* update labels and help

* add slider to score cutoff

* add maximskorik to tool authors

* add networking wrapper

* add output format selection to inputs

* update test params

* update test data

* remove matches from output

* update `write_outputs` to return serialized `Scores` json

* update matchMS formatter tests

* remove matches file from formatter.py

* add matchms dependency

* replace deprecated decorator

* correct typos; update docs

* update similarity and formatter help

* remove duplicated help section

* add maximskorik to authors

* bump `matchms` version

* finish `matchms_formatter`

* update test data produced with erroneous ri_filtering (#300)

* update test data

* update zenodo link

* update `matchms_formatter` test data

* update link to zenodo in `matchms_filtering`

* use creators from macros

* reformat wrapper

* save `parser` to `args` variable

* update method name

* fix python wrapper

* update varnames in xml wrapper

* reformat call to wrapper

* add dynamic output format

* remove test data; check file contents instead

* add test case; change parameters order

* add more test cases

* move citations to macros.xml

* format help section

* lint

* fix output tag name

* reformat python to pass linter

* remove debugging `print`

* Update tools/matchms/matchms_similarity.xml

* reduced testdata

* Started updating test data

* annotate tests

* reduce test_3

* update test_2

* truncate recetox_gc-ei_ms; update test_4

* update test_5

* update test_2 to test same format files

* add descriptive test annotations

* remove unused data

* update matchms_formatter test data

* put `MPLCONFIGDIR` to macros and add to `matchms_formatter`

* remove `environment_variables` macros; config Fontconfig via envvar

* remove indent

* add envvars to the `networking` tool schema

Co-authored-by: Helge Hecht <helge.hecht@recetox.muni.cz>
@maximskorik maximskorik deleted the matchms_298 branch November 2, 2022 18:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

RI filtering in galaxy's MatchMS version not working
1 participant
0