From: cmzmasek Date: Thu, 13 Mar 2014 19:03:05 +0000 (+0000) Subject: in progress X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2b92cc1027b3c3df36a0b6088d469bcd0341e273;p=jalview.git in progress --- diff --git a/forester/test_data/temp.txt b/forester/test_data/temp.txt index 1d19b2a..6274dc6 100644 --- a/forester/test_data/temp.txt +++ b/forester/test_data/temp.txt @@ -1,67 +1,93 @@ - -1.69 0.00 1.52 1.48 1.45 1.44 1.46 1.69=0 -1.72 1.52 0.00 0.71 0.60 0.62 0.56 1.52=1 1.72=0 -1.66 1.48 0.71 0.00 0.46 0.51 0.47 0.71=2 1.48=1 1.66=0 -1.52 1.45 0.60 0.46 0.00 0.35 0.31 0.46=3 0.60=2 1.45=1 1.52=0 -1.60 1.44 0.62 0.51 0.35 0.00 0.27 0.35=4 0.51=3 0.62=2 1.44=1 1.60=0 -1.59 1.46 0.56 0.47 0.31 0.27 0.00 0.27=5 0.31=4 0.47=3 0.56=2 1.46=1 1.59=0 -N=7 - -1.69 0.00 1.52 1.48 1.45 1.44 1.46 1.69=0 -1.72 1.52 0.00 0.71 0.60 0.62 0.56 1.52=1 1.72=0 -1.66 1.48 0.71 0.00 0.46 0.51 0.47 0.71=2 1.48=1 1.66=0 -1.52 1.45 0.60 0.46 0.00 0.35 0.31 0.46=3 0.60=2 1.45=1 1.52=0 -1.60 1.44 0.62 0.51 0.35 0.00 0.27 0.35=4 0.51=3 0.62=2 1.44=1 1.60=0 -1.59 1.46 0.56 0.47 0.31 0.27 0.00 0.27=5 0.31=4 0.47=3 0.56=2 1.46=1 1.59=0 - -0 1 => -2.08 (1.69) +S + OK. +NJR +0->9.78610 +0->9.78610 1->9.04220 +0->9.78610 1->9.04220 2->5.72650 +0->9.78610 1->9.04220 2->5.72650 3->5.29640 +0->9.78610 1->9.04220 2->5.72650 3->5.29640 4->4.68640 +0->9.78610 1->9.04220 2->5.72650 3->5.29640 4->4.68640 5->4.78480 +0 1 Node Bovine joins Mouse -------------------------------------------------------------- - -N=6 - -0.78 0.00 0.71 0.60 0.62 0.56 1.52=1 1.72=0 -0.73 0.71 0.00 0.46 0.51 0.47 0.71=2 1.48=1 1.66=0 -0.64 0.60 0.46 0.00 0.35 0.31 0.46=3 0.60=2 1.45=1 1.52=0 -0.68 0.62 0.51 0.35 0.00 0.27 0.35=4 0.51=3 0.62=2 1.44=1 1.60=0 -0.68 0.56 0.47 0.31 0.27 0.00 0.27=5 0.31=4 0.47=3 0.56=2 1.46=1 1.59=0 - -0 1 => -0.91 (0.78) +0.77820 0.72905 0.64210 0.67830 0.68340 1----->2 +2----->3 +3----->4 +4----->5 +5----->6 +0-->0 +1-->2 +2-->3 +3-->4 +4-->5 +5-->6 +6-->6 +0->3.51105 +0->3.51105 1->3.26170 +0->3.51105 1->3.26170 2->2.88075 +0->3.51105 1->3.26170 2->2.88075 3->2.35770 +0->3.51105 1->3.26170 2->2.88075 3->2.35770 4->2.41990 +0 1 Node 7 (Bovine+Mouse) joins Gibbon -------------------------------------------------------------- - -N=5 - -0.33 0.00 0.46 0.51 0.47 0.71=2 1.48=1 1.66=0 -0.23 0.46 0.00 0.35 0.31 0.46=3 0.60=2 1.45=1 1.52=0 -0.26 0.51 0.35 0.00 0.27 0.35=4 0.51=3 0.62=2 1.44=1 1.60=0 -0.23 0.47 0.31 0.27 0.00 0.27=5 0.31=4 0.47=3 0.56=2 1.46=1 1.59=0 - -3 4 => -0.62 (0.27) +0.33117 0.22985 0.25900 0.23175 2----->3 +3----->4 +4----->5 +5----->6 +6----->6 +0-->0 +1-->3 +2-->4 +3-->5 +4-->6 +5-->6 +6-->6 +0->1.05177 +0->1.05177 1->1.77138 +0->1.05177 1->1.77138 2->1.34965 +0->1.05177 1->1.77138 2->1.34965 3->1.38270 +3 4 Node Chimp joins Human -------------------------------------------------------------- - -N=4 - -0.33 0.00 0.46 0.51 0.71=2 1.48=1 1.66=0 -0.23 0.46 0.00 0.35 0.46=3 0.60=2 1.45=1 1.52=0 -0.11 0.35 0.19 0.00 0.35=4 0.51=3 0.62=2 1.44=1 1.60=0 - -0 1 => -0.58 (0.33) +0.11077 0.35395 0.19375 6----->6 +6----->6 +0-->0 +1-->3 +2-->4 +3-->5 +4-->6 +5-->6 +6-->6 +0->0.67180 +0->0.67180 1->1.14822 +0->0.67180 1->1.14822 2->0.88670 +0 1 Node 8 (7+Gibbon) joins Orang -------------------------------------------------------------- - -N=3 - -0.18 0.00 0.35 0.46=3 0.60=2 1.45=1 1.52=0 -0.07 0.19 0.00 0.35=4 0.51=3 0.62=2 1.44=1 1.60=0 - -0 2 => -0.44 (0.07) +0.18089 0.06677 3----->4 +4----->5 +5----->6 +6----->6 +6----->6 +0-->0 +1-->4 +2-->5 +3-->6 +4-->6 +5-->6 +6-->6 +0->0.24766 +0->0.24766 1->0.37464 +0 2 Node 10 (8+Orang) joins 9 (Chimp+Human) -------------------------------------------------------------- - +0.15393 5----->6 +6----->6 +6----->6 +6----->6 +0-->0 +1-->4 +2-->6 +3-->6 +4-->6 +5-->6 +6-->6 Node 11 (10+9) joins Gorilla - ============================================================================================