-
Notifications
You must be signed in to change notification settings - Fork 236
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
Mafft Changes #1337
Mafft Changes #1337
Conversation
tools/mafft/macros.xml
Outdated
@@ -1,7 +1,7 @@ | |||
<?xml version="1.0"?> | |||
<macros> | |||
<token name="@VERSION@">0</token> | |||
<token name="@TOOL_VERSION@">7.508</token> | |||
<token name="@TOOL_VERSION@">7.52</token> |
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.
Oh wow, is 7.52 really bigger/newer than 7.508?
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.
The latest version is actually 7.520
. @elischberg I don't think you can just drop that trailing zero.
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.
Oh my bad. I thought, the dot is a comma.
You need to rebase this PR, please. |
New section for progressive alignement calculation
Tried for the groupsize param to get a max limit through a validator with the sequence metadata, but I think it then ignored every inserted integer of the groupsize param. Solved it right now with a condition in the command part of mafft.xml. |
In venn.xml it is a fix maximum. Unfortunately not appliable in the groupsize case with a variable maximum. We solved it with a warning for users, when they use a too large number. |
There are difficulties with the groupsize parameter. I don't know, how to change the empty value of $cond_flavour.guidetree.partetree_selection.groupsize into the calculated $sequence_count. Do you have an idea? |
tools/mafft/mafft.xml
Outdated
echo $cond_flavour.guidetree.parttree_selection.groupsize && | ||
#if $cond_flavour.guidetree.parttree_selection.groupsize == "None" | ||
int($cond_flavour.guidetree.parttree_selection.groupsize) = $sequence_count | ||
#elif $cond_flavour.guidetree.parttree_selection.groupsize > $sequence_count |
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.
Although the error:
'>' not supported between instances of 'NoneType' and 'int'
looks like it's coming from here, you can completely remove the whole section and when you don't enter anything for the optional integer param still get it in exactly the same form.
I think this comes from an internal attempt to compare the None
to the "min" and "max" values of the param =>
There's just no way to combine min, max and optional="true" for an int param.
As discussed try to use -1 instead and explain it in the param help.
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.
-1 isn't working. Then MAFFT gives an error like: Specify groupsize!
I think it is an internal function of MAFFT, if one adding a larger number than input sequences, then it shows -1 but it takes one more than the number of input sequences.
I'm just wondering, because there was a moment, when it worked with the comparison.
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.
I can remove the section but then we dont have a warning in die stoud. I can simply mention it somewhere else?
git status: clean worktree and git diff:nothing. |
GreeeennnnnnnnnnnN! |
Very good. (: |
ping @wm75 |
tools/mafft/mafft.xml
Outdated
</conditional> | ||
</when> | ||
</conditional> | ||
<section name="progressive_alignment_calculation" title="Progressive alignment calculation" expanded="true"> |
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.
Exposing these settings unconditionally makes no sense since they are part of the "flavour" definitions.
If a user selects a pre-defined flavour above and you're overwriting some of that flavour's settings here, it's not that flavour anymore.
@elischberg I've opened another PR against your branch that fixes this and a few other things.
Once that's merged you will have to regenerate all test data except for the first test (for which the settings here happen to be that of the flavour).
I guess it would be a good idea to generate all test data with mafft flavour commands on the command line to make sure the wrapper produces matching outputs.
Fix MSA flavour handling and smaller improvements
@elischberg cool! |
Going to try (: |
The |
failing ... |
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.
Thanks for the hard work on this complex wrapper @elischberg !
Fixes:
Fixes need to be done: