From: cmzmasek@gmail.com Date: Thu, 28 Nov 2013 03:55:21 +0000 (+0000) Subject: inprogress X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2fd8b4253e465b0de7f15e54b8f1d9a1229831ee;p=jalview.git inprogress --- diff --git a/forester/ruby/evoruby/lib/evo/io/parser/fasta_parser.rb b/forester/ruby/evoruby/lib/evo/io/parser/fasta_parser.rb index 2e3d51a..dfc3a79 100644 --- a/forester/ruby/evoruby/lib/evo/io/parser/fasta_parser.rb +++ b/forester/ruby/evoruby/lib/evo/io/parser/fasta_parser.rb @@ -44,7 +44,7 @@ module Evoruby end # was: seq = $1.rstrip seq = $1.gsub(/\s+/, '') - current_seq = current_seq + seq + current_seq << seq else error_msg = "Unexpected line: " + line raise IOError, error_msg diff --git a/forester/ruby/evoruby/lib/evo/tool/multi_sequence_extractor.rb b/forester/ruby/evoruby/lib/evo/tool/multi_sequence_extractor.rb index 932a6b4..a868b6a 100644 --- a/forester/ruby/evoruby/lib/evo/tool/multi_sequence_extractor.rb +++ b/forester/ruby/evoruby/lib/evo/tool/multi_sequence_extractor.rb @@ -537,7 +537,7 @@ module Evoruby rescue Exception => e Util.fatal_error( PRG_NAME, "error: " + e.to_s ) end - if @seqs <= 500000 + if @seqs <= 600000 @file_to_msa[ input ] = msa @seqs += msa.get_number_of_seqs puts " total seqs in memory: " + @seqs.to_s