X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fphylogeny%2FPhylogenyBranch.java;h=4b9c673674c818b9b0fec6416f5e2501cb835713;hb=a4f2896c53c804220bbd53429780592a86c9e4b6;hp=c427c2537b7e3e79ac268a100eb563d624b186e3;hpb=eee996a6476a1e3d84c07f8f690dcde3ff4b2ef5;p=jalview.git diff --git a/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java b/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java index c427c25..4b9c673 100644 --- a/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java +++ b/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java @@ -23,7 +23,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // // Contact: phylosoft @ gmail . com -// WWW: www.phylosoft.org/forester +// WWW: https://sites.google.com/site/cmzmasek/home/software/forester package org.forester.phylogeny; @@ -32,7 +32,7 @@ import org.forester.phylogeny.data.PhylogenyData; /* * @author Christian M. Zmasek */ -public class PhylogenyBranch implements Edge { +public class PhylogenyBranch { private final PhylogenyNode _node_1; private final PhylogenyNode _node_2; @@ -89,17 +89,14 @@ public class PhylogenyBranch implements Edge { } } - @Override public PhylogenyData getData() { return _data; } - @Override public PhylogenyNode getFirstNode() { return _node_1; } - @Override public PhylogenyNode getSecondNode() { return _node_2; } @@ -132,10 +129,10 @@ public class PhylogenyBranch implements Edge { hc_2 = node_2_hc; } } - result = PRIME * result + ( ( _data == null ) ? 0 : _data.hashCode() ); - result = PRIME * result + ( _is_directed ? 1231 : 1237 ); - result = PRIME * result + hc_1; - result = PRIME * result + hc_2; + result = ( PRIME * result ) + ( ( _data == null ) ? 0 : _data.hashCode() ); + result = ( PRIME * result ) + ( _is_directed ? 1231 : 1237 ); + result = ( PRIME * result ) + hc_1; + result = ( PRIME * result ) + hc_2; return result; }