Skip to content
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

Extend compatibility checks on parameter settings to all four programs. #33

Merged
merged 7 commits into from
May 1, 2018

Conversation

ekcannon
Copy link
Collaborator

This extends work started by @bradfordcondon. There is also a fair bit of code optimization and general cleanup.

Reference for determining compatible combinations of settings was the NCBI BLAST UI:
https://blast.ncbi.nlm.nih.gov/Blast.cgi

@bradfordcondon
Copy link
Member

getting to this today, sorry for the delay...

@bradfordcondon
Copy link
Member

bradfordcondon commented May 1, 2018

  • the options look good.

  • The refactoring is great, reusing the same ajax = 🍪

  • the commented code cleanup is very appreciated.

  • I'm noticing a lot of undefined variables in the submits. for example, when submitting a blastp i get:

Notice: Undefined variable: gapOpen in blast_ui_blastp_advanced_options_form_submit() (line 432 of /Users/chet/UTK/tripal/sites/all/modules/custom/tripal_blast/includes/blast_ui.form_advanced_options.inc).
Notice: Undefined variable: gapExtend in blast_ui_blastp_advanced_options_form_submit() (line 433 of /Users/chet/UTK/tripal/sites/all/modules/custom/tripal_blast/includes/blast_ui.form_advanced_options.inc).

I can contribute the fixes for this....

@laceysanderson
Copy link
Member

That would be awesome @bradfordcondon! I just cleaned up the merge conflict so hopefully we can get this merged ASAP :-) I'm working towards releasing a new version of the module today with all the awesome fixes + features :-)

@bradfordcondon
Copy link
Member

bradfordcondon commented May 1, 2018

ok shouldnt take me too long.

$qrange/culling is not part of the advanced forms anymore, but it is passed into the submit in places... whats the plan for that parameter, remove?

edit seeing as how it was previously commented out everywhere im going to assume we want to phase it out entirely.

@laceysanderson
Copy link
Member

I'm not sure there is a long term plan. @ekcannon originally commented it out until we handle it correctly so I'd be tempted to leave it in (or at least comments referring to it) so we remember to handle it properly? What are your thoughts?

@bradfordcondon
Copy link
Member

all done. I made a PR to ethy's branch to fix the issues i spotted. I could submit blast jobs for everything now.

@ekcannon
Copy link
Collaborator Author

ekcannon commented May 1, 2018

RE: culling: yes, take it out. Here's the definition:
culling_limit - Delete a hit that is enveloped by at least this many higher-scoring hits.

It seemed to make sense as a way of limiting results, but apparently didn't pan out as expected. I've forgotten the details as to why, unfortunately. It doesn't appear on the NCBI BLAST UI.

@bradfordcondon
Copy link
Member

isnt culling = qrange? I assumed it was this:

screen shot 2018-05-01 at 12 58 08 pm

You may be right about leaving in comments, i might have been overzealous removing them.

We could add back in, or, alternatively, create an issue for later investigation.

Copy link
Member

@bradfordcondon bradfordcondon left a comment

Choose a reason for hiding this comment

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

Please see my PR ekcannon#1
A couple of stray options break the submissions for all types.

@@ -521,9 +424,6 @@ function blast_ui_blastp_advanced_options_form_submit($form, $form_state) {
$gapKey = $form_state['values']['gapCost'];
$gap = _set_protein_gap($matrix, $gapKey);
Copy link
Member

Choose a reason for hiding this comment

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

set_protein_gap operates on the key (0, 1, 2) but it gets passed the value (ie 11_1) when submitting blastp job

Copy link
Member

Choose a reason for hiding this comment

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

upon futher inpsection, i think that the protein submit wants to be using get_gap to explode the string based on the underscore.

@@ -76,17 +68,6 @@ function blast_ui_blastn_advanced_options_form(&$form, $form_state) {
'#description' => t('The length of the seed that initiates an alignment'),
);

/*eksc: remove this as it is either the same as max_target_seqs, or miss-implemented
as culling_limit, which is something else entirely
$form['ALG']['GParam']['qRange'] = array(
Copy link
Member

Choose a reason for hiding this comment

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

qrange shows up in a few submissions. Looks like we just want to kill this parameter? It is a valid parameter on ncbi. DOn't get me wrong i don't care i just want the submits to pass without errors...

@bradfordcondon
Copy link
Member

copying @ekcannon 's comment on qrange here to the core repo:

RE: qrange and culling limit: I'm inclined to remove all mention of both and make an issue on Tripal/tripal_blast to examine them more closely, and if possible, add them to advanced options.

I second this approach. We can put the deleted code snippets in the issue if we really want.

@laceysanderson
Copy link
Member

I third the suggestion of removing for now and creating an issue for it 👍

fix validator for proteins.  remove unused parameters in validate.
@laceysanderson
Copy link
Member

Awesome :-) Merging this in and then I'll try to do a final test before the end of the day and make a new release! Thanks Team!

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.

None yet

3 participants