X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsdi%2FRIOn.java;h=058e10fc1371c1f487a8a4778093fa446d63d64d;hb=e9ca0dc1764303d53fc6b9b087f33cdee53726ea;hp=78554735ef308a39975122eb77551c6eecadc6cb;hpb=48f7a89be9d34f1930a1f863e608235cc27184c5;p=jalview.git diff --git a/forester/java/src/org/forester/sdi/RIOn.java b/forester/java/src/org/forester/sdi/RIOn.java index 7855473..058e10f 100644 --- a/forester/java/src/org/forester/sdi/RIOn.java +++ b/forester/java/src/org/forester/sdi/RIOn.java @@ -5,7 +5,7 @@ // Copyright (C) 2008-2009 Christian M. Zmasek // Copyright (C) 2008-2009 Burnham Institute for Medical Research // 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 @@ -15,7 +15,7 @@ // 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 @@ -45,7 +45,7 @@ public class RIOn { GeneralTable _super_orthologs = null; GeneralTable _ultra_paralogs = null; - private void doInferOrthologs( final Phylogeny gene_tree, final Phylogeny species_tree ) { + private void doInferOrthologs( final Phylogeny gene_tree, final Phylogeny species_tree ) throws SDIException { final SDIR sdiunrooted = new SDIR(); final Phylogeny assigned_tree = sdiunrooted.infer( gene_tree, species_tree, @@ -64,7 +64,7 @@ public class RIOn { if ( i != j ) { final PhylogenyNode node_i = external_nodes.get( i ); final PhylogenyNode node_j = external_nodes.get( j ); - final PhylogenyNode lca = methods.obtainLCA( node_i, node_j ); + final PhylogenyNode lca = PhylogenyMethods.calculateLCA( node_i, node_j ); final Event event = lca.getNodeData().getEvent(); final String node_i_name = node_i.getNodeData().getSequence().getName(); final String node_j_name = node_j.getNodeData().getSequence().getName();