X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsdi%2FGSDI.java;h=4ab6395af79a9f6928d9863cf88723acbf5770e5;hb=3b40e07c1b3964dee89b5d24209946ac54a5e21f;hp=fa7a52c8baa3db2ab8cbb8fd08d0e88967cd533c;hpb=b819fa043cac2722618af63f0d4752ffa1a40890;p=jalview.git diff --git a/forester/java/src/org/forester/sdi/GSDI.java b/forester/java/src/org/forester/sdi/GSDI.java index fa7a52c..4ab6395 100644 --- a/forester/java/src/org/forester/sdi/GSDI.java +++ b/forester/java/src/org/forester/sdi/GSDI.java @@ -152,10 +152,10 @@ public final class GSDI implements GSDII { * Preconditions: Mapping M for external nodes must have been calculated and * the species tree must be labeled in preorder. *

- * @param transfer_taxonomy - * @return - * @throws SDIException - * + * @param transfer_taxonomy + * @return + * @throws SDIException + * */ final static GSDIsummaryResult geneTreePostOrderTraversal( final Phylogeny gene_tree, final boolean most_parsimonious_duplication_model, @@ -166,7 +166,7 @@ public final class GSDI implements GSDII { if ( g.isInternal() ) { if ( g.getNumberOfDescendants() != 2 ) { throw new SDIException( "gene tree contains internal node with " + g.getNumberOfDescendants() - + " descendents" ); + + " descendents" ); } PhylogenyNode s1 = g.getChildNode1().getLink(); PhylogenyNode s2 = g.getChildNode2().getLink(); @@ -197,7 +197,7 @@ public final class GSDI implements GSDII { if ( g.isInternal() ) { if ( g.getNumberOfDescendants() != 2 ) { throw new SDIException( "gene tree contains internal node with " + g.getNumberOfDescendants() - + " descendents" ); + + " descendents" ); } PhylogenyNode s1 = g.getChildNode1().getLink(); PhylogenyNode s2 = g.getChildNode2().getLink(); @@ -234,8 +234,8 @@ public final class GSDI implements GSDII { * This allows for linking of internal nodes of the species tree (as opposed * to just external nodes, as in the method it overrides. * If TaxonomyComparisonBase is null, it will try to determine it. - * @throws SDIException - * + * @throws SDIException + * */ final static NodesLinkingResult linkNodesOfG( final Phylogeny gene_tree, final Phylogeny species_tree, @@ -299,7 +299,7 @@ public final class GSDI implements GSDII { } else { throw new SDIException( "taxonomy \"" + g.getNodeData().getTaxonomy() - + "\" not present in species tree" ); + + "\" not present in species tree" ); } } else {