Skip to content

Conversation

@sverhoeven
Copy link
Contributor

@sverhoeven sverhoeven commented Feb 14, 2024

You are about to submit a new Pull Request. Before continuing make sure you read the contributing guidelines and that you comply with the following criteria:

  • You have sticked to Python. Please talk to us before adding other programming languages to HADDOCK3
  • Your PR is about CNS
  • Your code is well documented: proper docstrings and explanatory comments for those tricky parts
  • You structured the code into small functions as much as possible. You can use classes if there is a (state) purpose
  • Your code follows our coding style
  • You wrote tests for the new code
  • tox tests pass. Run tox command inside the repository folder
  • -test.cfg examples execute without errors. Inside examples/ run python run_tests.py -b
  • PR does not add any dependencies, unless permission granted by the HADDOCK team
  • PR does not break licensing
  • Your PR is about writing documentation for already existing code 🔥
  • Your PR is about writing tests for already existing code :godmode:

Closes #719

Uses Structures table from i-VRESSE/haddock3-analysis-components#13 to render when there are no clusters.

@sverhoeven sverhoeven mentioned this pull request Feb 14, 2024
12 tasks
@mgiulini
Copy link
Contributor

hey @sverhoeven , does this take also care of showing the top 4 models even when not all clusters have four models? I already developed some code that takes care of that issue, let me know

@sverhoeven
Copy link
Contributor Author

@mgiulini it does for example

127 0 0 1_8000_analysis_10_caprieval_analysis_report html (1)

Also notice the std dev is not shown if 0.

Unclustered structurers are shown as rows:
127 0 0 1_8000_analysis_06_caprieval_analysis_report html

@sverhoeven sverhoeven marked this pull request as ready for review February 15, 2024 13:35
@sverhoeven
Copy link
Contributor Author

The CI integration workflow (https://github.com/haddocking/haddock3/actions/runs/7916792483/job/21611546576?pr=799) is complaining about missing cns and csv files. I think this is due to being a PR from a fork.

@rvhonorato can you assist?

@rvhonorato
Copy link
Member

@sverhoeven, added a skip here #801

@mgiulini
Copy link
Contributor

@mgiulini it does for example

127 0 0 1_8000_analysis_10_caprieval_analysis_report html (1)

Also notice the std dev is not shown if 0.

Unclustered structurers are shown as rows: 127 0 0 1_8000_analysis_06_caprieval_analysis_report html

@sverhoeven looks perfect! let me know when it's ready and I'll review this!

@sverhoeven
Copy link
Contributor Author

What should happen when there are more than 10 clusters?
Should I merge all those into a cluster called - and recalculate the mean and std dev and show the best 4 structure in that combined cluster? Or show until the 11th cluster and not show clusters with rank >10.

Almost ready, just need to make webapp use this PR and solve question above.

@mgiulini
Copy link
Contributor

What should happen when there are more than 10 clusters? Should I merge all those into a cluster called - and recalculate the mean and std dev and show the best 4 structure in that combined cluster? Or show until the 11th cluster and not show clusters with rank >10.

Almost ready, just need to make webapp use this PR and solve question above.

first option! it would be in line with the 2.4 output https://bianca.science.uu.nl/haddock2.4/result/4242424242/0-E2A-HPR and, more importantly, would allow to directly inspect the best 4 structures that are not part of the top 10 clusters. This should be called "Other" rather than "-" I would say.

would it be feasible to add a short disclaimer saying something like "This is not a real cluster but rather a combination of the top models of the other clusters"?

Copy link
Contributor

@mgiulini mgiulini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plots look for the examples! I created this PR to uniform the names in capri folders #805 , maybe we can first merge that and then this one

@sverhoeven
Copy link
Contributor Author

plots look for the examples! I created this PR to uniform the names in capri folders #805 , maybe we can first merge that and then this one

I caught up to #805, so this pr is ready to get merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

show unclustered structures side-by-side in analysis report

3 participants