X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=binaries%2Fsrc%2Fmafft%2Fcore%2Fnewick2mafft.rb;h=c16fb84b4fbb20bfa2c30971d2a63319444631c4;hb=711ff37b582bf25ba17d553008c4bf06cbdb8c84;hp=b74ba3657dc203d7e43309c144d9095ffc8f1592;hpb=7c6018cf87e67d7ac21f5230284ef2162a19320f;p=jabaws.git

diff --git a/binaries/src/mafft/core/newick2mafft.rb b/binaries/src/mafft/core/newick2mafft.rb
index b74ba36..c16fb84 100644
--- a/binaries/src/mafft/core/newick2mafft.rb
+++ b/binaries/src/mafft/core/newick2mafft.rb
@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 
-#version 2, 2009/01/24
+#version 2, 2009/Jan/24
+#version 3, 2015/Dec/8
 
 
 if ARGV.length == 1
@@ -30,7 +31,8 @@ infp.close
 
 
 #tree = tree.gsub( /_.*?:/, ":" ).gsub(/[0-9]\.[0-9]*e-[0-9][0-9]/, "0").gsub(/\[.*?\]/,"").gsub(/ /, "").gsub(/:\-[0-9\.]+/, ":0.0" )
-tree = tree.gsub( /_.*?:/, ":" ).gsub(/[0-9]\.[0-9]*e-[0-9][0-9]/, "0").gsub(/\[.*?\]/,"").gsub(/ /, "")
+#tree = tree.gsub( /_.*?:/, ":" ).gsub(/[0-9]\.[0-9]*e-[0-9][0-9]/, "0").gsub(/\[.*?\]/,"").gsub(/ /, "")
+tree = tree.gsub( /_.*?:/, ":" ).gsub(/[0-9\.]*[eE]-[0-9]*/, "0").gsub(/\[.*?\]/,"").gsub(/ /, "")
 
 
 STDERR.puts "Initial tree = " +  tree
@@ -125,7 +127,7 @@ while tree.index( /\(/ )
 
 	tree.sub!( /XXX/, memi[0].to_s )
 
-	STDERR.puts "Tree = " + tree
+#	STDERR.puts "Tree = " + tree
 
 	printf( "%5d %5d %10.5f %10.5f\n", memi[0], memi[1], leni[0], leni[1] )