X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fphylogeny%2FPhylogenyBranch.java;h=4b9c673674c818b9b0fec6416f5e2501cb835713;hb=17dce416188e13160d9bf0840bb370e3adca041e;hp=214337f671358398eeda5ba8f123142b49bedfc9;hpb=48f7a89be9d34f1930a1f863e608235cc27184c5;p=jalview.git diff --git a/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java b/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java index 214337f..4b9c673 100644 --- a/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java +++ b/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java @@ -7,7 +7,7 @@ // Copyright (C) 2000-2001 Washington University School of Medicine // and Howard Hughes Medical Institute // All rights reserved -// +// // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either @@ -17,13 +17,13 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. -// +// // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // 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; @@ -129,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; }