git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
in progress
[jalview.git]
/
forester
/
ruby
/
evoruby
/
lib
/
evo
/
tool
/
hmmscan_summary.rb
diff --git
a/forester/ruby/evoruby/lib/evo/tool/hmmscan_summary.rb
b/forester/ruby/evoruby/lib/evo/tool/hmmscan_summary.rb
index
a8f1590
..
08de9c1
100644
(file)
--- a/
forester/ruby/evoruby/lib/evo/tool/hmmscan_summary.rb
+++ b/
forester/ruby/evoruby/lib/evo/tool/hmmscan_summary.rb
@@
-6,7
+6,6
@@
#
# $Id: hmmscan_parser.rb,v 1.5 2010/12/13 19:00:11 cmzmasek Exp $
#
#
# $Id: hmmscan_parser.rb,v 1.5 2010/12/13 19:00:11 cmzmasek Exp $
#
-# last modified: 121003
require 'set'
require 'set'
@@
-14,28
+13,26
@@
require 'lib/evo/util/constants'
require 'lib/evo/util/util'
require 'lib/evo/util/command_line_arguments'
require 'lib/evo/io/parser/hmmscan_parser'
require 'lib/evo/util/util'
require 'lib/evo/util/command_line_arguments'
require 'lib/evo/io/parser/hmmscan_parser'
-require 'lib/evo/io/parser/uniprot_parser'
-require 'lib/evo/io/web/uniprotkb'
module Evoruby
class HmmscanSummary
PRG_NAME = "hsp"
module Evoruby
class HmmscanSummary
PRG_NAME = "hsp"
- PRG_VERSION = "2.000"
+ PRG_VERSION = "2.002"
PRG_DESC = "hmmscan summary"
PRG_DESC = "hmmscan summary"
- PRG_DATE = "2012.10.23"
- COPYRIGHT = "2012 Christian M Zmasek"
- CONTACT = "phylosoft@gmail.com"
- WWW = "www.phylosoft.org"
+ PRG_DATE = "130319"
+ COPYRIGHT = "2013 Christian M Zmasek"
+ CONTACT = "phyloxml@gmail.com"
+ WWW = "https://sites.google.com/site/cmzmasek/home/software/forester"
DELIMITER_OPTION = "d"
DELIMITER_OPTION = "d"
+ SPECIES_OPTION = "s"
I_E_VALUE_THRESHOLD_OPTION = "ie"
FS_E_VALUE_THRESHOLD_OPTION = "pe"
HMM_FOR_PROTEIN_OUTPUT = "m"
IGNORE_DUF_OPTION = "i"
PARSE_OUT_DESCRIPITION_OPTION = "a"
I_E_VALUE_THRESHOLD_OPTION = "ie"
FS_E_VALUE_THRESHOLD_OPTION = "pe"
HMM_FOR_PROTEIN_OUTPUT = "m"
IGNORE_DUF_OPTION = "i"
PARSE_OUT_DESCRIPITION_OPTION = "a"
- UNIPROT = "u"
HELP_OPTION_1 = "help"
HELP_OPTION_2 = "h"
HELP_OPTION_1 = "help"
HELP_OPTION_2 = "h"
@@
-49,9
+46,6
@@
module Evoruby
def run
def run
- ukb = UniprotKB.new
- ukb.get
-
Util.print_program_information( PRG_NAME,
PRG_VERSION,
PRG_DESC,
Util.print_program_information( PRG_NAME,
PRG_VERSION,
PRG_DESC,
@@
-85,7
+79,7
@@
module Evoruby
allowed_opts.push( IGNORE_DUF_OPTION )
allowed_opts.push( PARSE_OUT_DESCRIPITION_OPTION )
allowed_opts.push( HMM_FOR_PROTEIN_OUTPUT )
allowed_opts.push( IGNORE_DUF_OPTION )
allowed_opts.push( PARSE_OUT_DESCRIPITION_OPTION )
allowed_opts.push( HMM_FOR_PROTEIN_OUTPUT )
- allowed_opts.push( UNIPROT )
+ allowed_opts.push( SPECIES_OPTION )
disallowed = cla.validate_allowed_options_as_str( allowed_opts )
if ( disallowed.length > 0 )
disallowed = cla.validate_allowed_options_as_str( allowed_opts )
if ( disallowed.length > 0 )
@@
-139,10
+133,10
@@
module Evoruby
end
end
end
end
- uniprot = ""
- if ( cla.is_option_set?( UNIPROT ) )
+ species = "HUMAN"
+ if ( cla.is_option_set?( SPECIES_OPTION ) )
begin
begin
- uniprot = cla.get_option_value( UNIPROT )
+ species = cla.get_option_value( SPECIES_OPTION )
rescue ArgumentError => e
Util.fatal_error( PRG_NAME, "error: " + e.to_s, STDOUT )
end
rescue ArgumentError => e
Util.fatal_error( PRG_NAME, "error: " + e.to_s, STDOUT )
end
@@
-161,6
+155,7
@@
module Evoruby
puts()
puts( "hmmpfam outputfile : " + inpath )
puts( "outputfile : " + outpath )
puts()
puts( "hmmpfam outputfile : " + inpath )
puts( "outputfile : " + outpath )
+ puts( "species : " + species )
if ( i_e_value_threshold >= 0.0 )
puts( "i-E-value threshold : " + i_e_value_threshold.to_s )
else
if ( i_e_value_threshold >= 0.0 )
puts( "i-E-value threshold : " + i_e_value_threshold.to_s )
else
@@
-189,9
+184,6
@@
module Evoruby
if !hmm_for_protein_output.empty?
puts( "HMM for proteins : " + hmm_for_protein_output )
end
if !hmm_for_protein_output.empty?
puts( "HMM for proteins : " + hmm_for_protein_output )
end
- if !uniprot.empty?
- puts( "Uniprot : " + uniprot )
- end
puts()
begin
puts()
begin
@@
-203,13
+195,12
@@
module Evoruby
parse_descriptions,
fs_e_value_threshold,
hmm_for_protein_output,
parse_descriptions,
fs_e_value_threshold,
hmm_for_protein_output,
- uniprot )
+ species )
rescue IOError => e
Util.fatal_error( PRG_NAME, "error: " + e.to_s, STDOUT )
end
domain_counts = get_domain_counts()
rescue IOError => e
Util.fatal_error( PRG_NAME, "error: " + e.to_s, STDOUT )
end
domain_counts = get_domain_counts()
-
puts
puts( "domain counts (considering potential i-E-value threshold and ignoring of DUFs):" )
puts( "(number of different domains: " + domain_counts.length.to_s + ")" )
puts
puts( "domain counts (considering potential i-E-value threshold and ignoring of DUFs):" )
puts( "(number of different domains: " + domain_counts.length.to_s + ")" )
@@
-232,9
+223,7
@@
module Evoruby
get_descriptions,
fs_e_value_threshold,
hmm_for_protein_output,
get_descriptions,
fs_e_value_threshold,
hmm_for_protein_output,
- uniprot )
-
-
+ species )
Util.check_file_for_readability( inpath )
Util.check_file_for_writability( outpath )
Util.check_file_for_readability( inpath )
Util.check_file_for_writability( outpath )
@@
-242,11
+231,6
@@
module Evoruby
hmmscan_parser = HmmscanParser.new( inpath )
results = hmmscan_parser.parse
hmmscan_parser = HmmscanParser.new( inpath )
results = hmmscan_parser.parse
- uniprot_entries = nil
- if !uniprot.empty? && !hmm_for_protein_output.empty?
- uniprot_entries = read_uniprot( results, uniprot )
- end
-
outfile = File.open( outpath, "a" )
query = ""
outfile = File.open( outpath, "a" )
query = ""
@@
-258,8
+242,6
@@
module Evoruby
hmmscan_results_per_protein = []
hmmscan_results_per_protein = []
-
-
prev_query = ""
results.each do | r |
prev_query = ""
results.each do | r |
@@
-295,7
+277,7
@@
module Evoruby
fs_e_value_threshold,
hmm_for_protein_output,
i_e_value_threshold,
fs_e_value_threshold,
hmm_for_protein_output,
i_e_value_threshold,
- uniprot_entries )
+ species )
end
hmmscan_results_per_protein.clear
end
end
hmmscan_results_per_protein.clear
end
@@
-310,17
+292,17
@@
module Evoruby
end
end
end
end
end
end
+
if !hmm_for_protein_output.empty? && !hmmscan_results_per_protein.empty?
process_hmmscan_results_per_protein( hmmscan_results_per_protein,
fs_e_value_threshold,
hmm_for_protein_output,
i_e_value_threshold,
if !hmm_for_protein_output.empty? && !hmmscan_results_per_protein.empty?
process_hmmscan_results_per_protein( hmmscan_results_per_protein,
fs_e_value_threshold,
hmm_for_protein_output,
i_e_value_threshold,
- uniprot_entries )
+ species )
end
outfile.flush()
outfile.close()
end
outfile.flush()
outfile.close()
-
end # def parse
def process_id( id )
end # def parse
def process_id( id )
@@
-330,17
+312,6
@@
module Evoruby
id
end
id
end
- def read_uniprot( hmmscan_results, uniprot )
- ids = Set.new
- hmmscan_results.each do | r |
-
- ids << process_id( r.query )
- end
- uniprot_parser = UniprotParser.new uniprot
- uniprot_entries = uniprot_parser.parse ids
- uniprot_entries
- end
-
def count_model( model )
if ( @domain_counts.has_key?( model ) )
count = @domain_counts[ model ].to_i
def count_model( model )
if ( @domain_counts.has_key?( model ) )
count = @domain_counts[ model ].to_i
@@
-355,7
+326,7
@@
module Evoruby
fs_e_value_threshold,
hmm_for_protein_output,
i_e_value_threshold,
fs_e_value_threshold,
hmm_for_protein_output,
i_e_value_threshold,
- uniprot_entries )
+ species )
dc = 0
# filter according to i-Evalue threshold
dc = 0
# filter according to i-Evalue threshold
@@
-363,12
+334,14
@@
module Evoruby
hmmscan_results_per_protein_filtered = []
hmmscan_results_per_protein.each do | r |
hmmscan_results_per_protein_filtered = []
hmmscan_results_per_protein.each do | r |
+
+
if r.model == hmm_for_protein_output
if r.model == hmm_for_protein_output
- if r.fs_e_value > fs_e_value_threshold
+ if fs_e_value_threshold > 0.0 && r.fs_e_value > fs_e_value_threshold
return
end
end
return
end
end
- if r.i_e_value <= i_e_value_threshold
+ if i_e_value_threshold <= 0 || r.i_e_value <= i_e_value_threshold
hmmscan_results_per_protein_filtered << r
if r.model == hmm_for_protein_output
dc += 1
hmmscan_results_per_protein_filtered << r
if r.model == hmm_for_protein_output
dc += 1
@@
-392,7
+365,7
@@
module Evoruby
s = ""
s << own.query + "\t"
s = ""
s << own.query + "\t"
- s << "HUMAN" + "\t"
+ s << species + "\t"
s << own.fs_e_value.to_s + "\t"
s << own.qlen.to_s + "\t"
s << dc.to_s + "\t"
s << own.fs_e_value.to_s + "\t"
s << own.qlen.to_s + "\t"
s << dc.to_s + "\t"
@@
-401,32
+374,15
@@
module Evoruby
s << r.model + " "
end
s << "\t"
s << r.model + " "
end
s << "\t"
- e = uniprot_entries[ process_id( own.query ) ]
- if e != nil && e.de != nil
- e.de.each { |i| s << i + " " }
- else
- s << "-"
- end
- s << "\t"
-
- if e != nil && e.gn != nil
- e.gn.each { |i| s << i + " " }
- else
- s << "-"
- end
-
-
- s << "\t"
overview = make_overview( hmmscan_results_per_protein_filtered, hmm_for_protein_output )
overview = make_overview( hmmscan_results_per_protein_filtered, hmm_for_protein_output )
- s << overview + "\t"
+ s << overview + "\t"
s << calc_linkers( hmmscan_results_per_protein_filtered, hmm_for_protein_output ) + "\t"
prev_r = nil
hmmscan_results_per_protein_filtered.each do | r |
s << calc_linkers( hmmscan_results_per_protein_filtered, hmm_for_protein_output ) + "\t"
prev_r = nil
hmmscan_results_per_protein_filtered.each do | r |
-
if prev_r != nil
s << make_interdomain_sequence( r.env_from - prev_r.env_to - 1 )
else
if prev_r != nil
s << make_interdomain_sequence( r.env_from - prev_r.env_to - 1 )
else
@@
-440,11
+396,10
@@
module Evoruby
s << "]"
prev_r = r
end
s << "]"
prev_r = r
end
- s << make_interdomain_sequence( own.qlen - prev_r.env_from, false )
+ s << make_interdomain_sequence( own.qlen - prev_r.env_to, false )
puts s
end
puts s
end
-
def calc_linkers( hmmscan_results_per_protein_filtered, hmm_for_protein_output )
linkers = ""
prev_r = nil
def calc_linkers( hmmscan_results_per_protein_filtered, hmm_for_protein_output )
linkers = ""
prev_r = nil
@@
-499,7
+454,6
@@
module Evoruby
end
end
-
def print_help()
puts( "Usage:" )
puts()
def print_help()
puts( "Usage:" )
puts()
@@
-511,6
+465,7
@@
module Evoruby
puts( " -" + IGNORE_DUF_OPTION + ": ignore DUFs" )
puts( " -" + FS_E_VALUE_THRESHOLD_OPTION + ": E-value threshold for full protein sequences, only for protein summary" )
puts( " -" + HMM_FOR_PROTEIN_OUTPUT + ": HMM for protein summary" )
puts( " -" + IGNORE_DUF_OPTION + ": ignore DUFs" )
puts( " -" + FS_E_VALUE_THRESHOLD_OPTION + ": E-value threshold for full protein sequences, only for protein summary" )
puts( " -" + HMM_FOR_PROTEIN_OUTPUT + ": HMM for protein summary" )
+ puts( " -" + SPECIES_OPTION + ": species for protein summary" )
puts()
end
puts()
end