-
Notifications
You must be signed in to change notification settings - Fork 82
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
Replace align_cfg::gap with align_cfg::gap_cost_affine #2037
Replace align_cfg::gap with align_cfg::gap_cost_affine #2037
Conversation
include/seqan3/alignment/configuration/align_config_gap_cost_affine.hpp
Outdated
Show resolved
Hide resolved
include/seqan3/alignment/configuration/align_config_gap_cost_affine.hpp
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some tiny things and a suggestion why travis does not build.
Otherwise 👍
7a39ccf
to
e21804d
Compare
3b64234
to
e33b813
Compare
e33b813
to
276fbc1
Compare
Codecov Report
@@ Coverage Diff @@
## release-3.0.2 #2037 +/- ##
==============================================
Coverage 97.82% 97.83%
==============================================
Files 264 264
Lines 9947 9926 -21
==============================================
- Hits 9731 9711 -20
+ Misses 216 215 -1
Continue to review full report at Codecov.
|
276fbc1
to
c8ee1b2
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry that I commented before being done with the review. Here are some more tiny things 🧐😊
test/snippet/alignment/configuration/align_cfg_gap_cost_affine_example.cpp
Outdated
Show resolved
Hide resolved
test/snippet/alignment/configuration/align_cfg_gap_cost_affine_example.cpp
Outdated
Show resolved
Hide resolved
test/unit/alignment/pairwise/fixture/semi_global_affine_banded.hpp
Outdated
Show resolved
Hide resolved
test/unit/alignment/pairwise/fixture/semi_global_affine_unbanded.hpp
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, thanks 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you :) My first pass-through. I asked the others if we really want to make the affine.extension_score
member a strong type.
doc/tutorial/pairwise_alignment/pairwise_alignment_solution_3.cpp
Outdated
Show resolved
Hide resolved
auto gap_open = g.get_gap_open_score(); // gap_open == -10 | ||
//! [gap_scheme] | ||
seqan3::align_cfg::open_score gap_open = affine_scheme.open_score; // gap_open == -10 | ||
seqan3::align_cfg::extension_score gap = affine_scheme.extension_score; // gap == -1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reminder for myself: I thought open_score/extension_score
is an integer type and not a strong type.
test/unit/alignment/configuration/align_config_gap_cost_affine_test.cpp
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
This is basically an approval, can you rebase and then reassign me?
There is one open discussion in the core team, whether
// Accessing the members of the gap scheme
int open = affine_cfg.open_score.get(); // open == -1
int extension = affine_cfg.extension_score.get(); // extension == -10
or
// Accessing the members of the gap scheme
int open = affine_cfg.open_score; // open == -1
int extension = affine_cfg.extension_score; // extension == -10
So that the members of the config element is a strong_type or the bare type.
9bffe4f
to
378bbed
Compare
The members of // Accessing the members of the gap scheme
int open = affine_cfg.open_score; // open == -1
int extension = affine_cfg.extension_score; // extension == -10 We decided on this, see seqan/product_backlog#202 @wvandertoorn Is this enough for you and do you know what this means and can you make the changes? If not I can explain it to you :) |
include/seqan3/alignment/configuration/align_config_gap_cost_affine.hpp
Outdated
Show resolved
Hide resolved
378bbed
to
8e4cb7f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you so much :) (Sorry for the delay 😿)
seqan3::align_cfg::band_fixed_size{seqan3::align_cfg::lower_diagonal{-4}, | ||
seqan3::align_cfg::upper_diagonal{4}}; | ||
// my_cfg is now of type configuration<gap, band> | ||
// my_cfg is now of type configuration<gap_cost_affine, band_fixed_size> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 nice catch
d59065b
to
a84e3f8
Compare
Fixes seqan/product_backlog#176.
Replaces seqan3::align_cfg::gap by seqan3::align_cfg::gap_cost_affine.
Deprecates seqan3::gap_scheme,seqan3::gap_open_score and seqan3::gap_score.