From 0f900be50421b6b321736b2e702da1d5e9c7b84c Mon Sep 17 00:00:00 2001 From: "cmzmasek@gmail.com" Date: Wed, 27 Nov 2013 23:58:32 +0000 Subject: [PATCH] inprogress --- forester/ruby/evoruby/lib/evo/msa/msa.rb | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/forester/ruby/evoruby/lib/evo/msa/msa.rb b/forester/ruby/evoruby/lib/evo/msa/msa.rb index ca6832d..579941d 100644 --- a/forester/ruby/evoruby/lib/evo/msa/msa.rb +++ b/forester/ruby/evoruby/lib/evo/msa/msa.rb @@ -80,6 +80,12 @@ module Evoruby indices = Array.new() for i in 0 ... get_number_of_seqs() current_name = get_sequence( i ).get_name() + if case_sensitive && !partial_match + if !@name_to_seq_indices.has_key?( current_name ) + @name_to_seq_indices[ current_name ] = [] + end + @name_to_seq_indices[ current_name ].push( i ) + end if !case_sensitive current_name = current_name.downcase name = name.downcase @@ -89,9 +95,6 @@ module Evoruby indices.push( i ) end end - if case_sensitive && !partial_match - @name_to_seq_indices[ name ] = indices - end indices end @@ -133,6 +136,12 @@ module Evoruby for i in 0 ... get_number_of_seqs() get_sequence( i ).get_name() =~ /^\s*(\S+)/ current_name = $1 + if case_sensitive + if !@namestart_to_seq_indices.has_key?( current_name ) + @namestart_to_seq_indices[ current_name ] = [] + end + @namestart_to_seq_indices[ current_name ].push( i ) + end if !case_sensitive current_name = current_name.downcase name = name.downcase @@ -141,9 +150,6 @@ module Evoruby indices.push( i ) end end - if case_sensitive - @namestart_to_seq_indices[ name ] = indices - end indices end -- 1.7.10.2