X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fphylogeny%2FPhylogenyNode.java;h=819ba7a6b21a62aa805a22afed295f7b1f7da972;hb=5b11e68cf46c363bd5ae256f794871c194776bd7;hp=45c1adab4873d80f10bed7d2f595498855b09bc6;hpb=ecfa899d355303acc65e93601e00922aad822883;p=jalview.git

diff --git a/forester/java/src/org/forester/phylogeny/PhylogenyNode.java b/forester/java/src/org/forester/phylogeny/PhylogenyNode.java
index 45c1ada..819ba7a 100644
--- a/forester/java/src/org/forester/phylogeny/PhylogenyNode.java
+++ b/forester/java/src/org/forester/phylogeny/PhylogenyNode.java
@@ -47,8 +47,11 @@ import org.forester.util.ForesterUtil;
  * to unexpected behavior.
  *
  */
-public final class PhylogenyNode implements PhylogenyNodeI, Comparable<PhylogenyNode> {
+public final class PhylogenyNode implements Comparable<PhylogenyNode> {
 
+    public enum NH_CONVERSION_SUPPORT_VALUE_STYLE {
+        NONE, IN_SQUARE_BRACKETS, AS_INTERNAL_NODE_NAMES;
+    }
     private static int               _node_count      = 0;
     private byte                     _indicator;
     private int                      _id;
@@ -88,9 +91,8 @@ public final class PhylogenyNode implements PhylogenyNodeI, Comparable<Phylogeny
      * @param n
      *            the PhylogenyNode to add
      */
-    @Override
-    final public void addAsChild( final PhylogenyNodeI node ) {
-        final PhylogenyNode n = ( PhylogenyNode ) node;
+    final public void addAsChild( final PhylogenyNode node ) {
+        final PhylogenyNode n = node;
         addChildNode( n );
         n.setParent( this );
     }
@@ -281,7 +283,6 @@ public final class PhylogenyNode implements PhylogenyNodeI, Comparable<Phylogeny
      * @throws IllegalArgumentException
      *             if n is out of bounds
      */
-    @Override
     final public PhylogenyNode getChildNode( final int i ) {
         if ( isExternal() ) {
             throw new UnsupportedOperationException( "attempt to get the child node of an external node." );
@@ -356,7 +357,6 @@ public final class PhylogenyNode implements PhylogenyNodeI, Comparable<Phylogeny
      * Returns the length of the branch leading to the _parent of this
      * PhylogenyNode (double).
      */
-    @Override
     final public double getDistanceToParent() {
         return _distance_parent;
     }
@@ -461,7 +461,7 @@ public final class PhylogenyNode implements PhylogenyNodeI, Comparable<Phylogeny
             previous_node = current_node;
             current_node = current_node.getParent();
         }
-        if ( index < current_node.getNumberOfDescendants() - 1 ) {
+        if ( index < ( current_node.getNumberOfDescendants() - 1 ) ) {
             current_node = current_node.getChildNode( index + 1 );
         }
         while ( current_node.isInternal() && !current_node.isCollapse() ) {
@@ -487,15 +487,10 @@ public final class PhylogenyNode implements PhylogenyNodeI, Comparable<Phylogeny
     /**
      * Returns the ID (int) of this PhylogenyNode.
      */
-    @Override
     final public int getId() {
         return _id;
     }
 
-    /**
-     * Returns the name of this node.
-     */
-    @Override
     final public String getName() {
         return getNodeData().getNodeName();
     }
@@ -738,6 +733,28 @@ public final class PhylogenyNode implements PhylogenyNodeI, Comparable<Phylogeny
         return true;
     }
 
+    public final int calculateDepth() {
+        PhylogenyNode n = this;
+        int steps = 0;
+        while ( n._parent != null ) {
+            steps++;
+            n = n._parent;
+        }
+        return steps;
+    }
+
+    public final double calculateDistanceToRoot() {
+        PhylogenyNode n = this;
+        double d = 0.0;
+        while ( n._parent != null ) {
+            if ( n._distance_parent > 0.0 ) {
+                d += n._distance_parent;
+            }
+            n = n._parent;
+        }
+        return d;
+    }
+
     /**
      * Checks whether this PhylogenyNode is a root.
      * 
@@ -841,7 +858,6 @@ public final class PhylogenyNode implements PhylogenyNodeI, Comparable<Phylogeny
      * Sets the length of the branch leading to the _parent of this
      * PhylogenyNode to double d.
      */
-    @Override
     final public void setDistanceToParent( final double d ) {
         _distance_parent = d;
     }
@@ -878,7 +894,6 @@ public final class PhylogenyNode implements PhylogenyNodeI, Comparable<Phylogeny
     /**
      * Sets the name of this node.
      */
-    @Override
     final public void setName( final String node_name ) {
         getNodeData().setNodeName( node_name );
     }
@@ -898,7 +913,6 @@ public final class PhylogenyNode implements PhylogenyNodeI, Comparable<Phylogeny
     /**
      * Sets the _parent PhylogenyNode of this PhylogenyNode to n.
      */
-    @Override
     final public void setParent( final PhylogenyNode n ) {
         _parent = n;
     }
@@ -1061,16 +1075,12 @@ public final class PhylogenyNode implements PhylogenyNodeI, Comparable<Phylogeny
     @Override
     final public String toString() {
         final StringBuilder sb = new StringBuilder();
-        if ( !ForesterUtil.isEmpty( getName() ) ) {
-            sb.append( getName() );
-            sb.append( " " );
-        }
         if ( getNodeData().isHasTaxonomy() ) {
             if ( !ForesterUtil.isEmpty( getNodeData().getTaxonomy().getScientificName() ) ) {
                 sb.append( getNodeData().getTaxonomy().getScientificName() );
                 sb.append( " " );
             }
-            else if ( !ForesterUtil.isEmpty( getNodeData().getTaxonomy().getTaxonomyCode() ) ) {
+            else if ( ( sb.length() <= 1 ) && !ForesterUtil.isEmpty( getNodeData().getTaxonomy().getTaxonomyCode() ) ) {
                 sb.append( getNodeData().getTaxonomy().getTaxonomyCode() );
                 sb.append( " " );
             }
@@ -1084,15 +1094,19 @@ public final class PhylogenyNode implements PhylogenyNodeI, Comparable<Phylogeny
                 sb.append( getNodeData().getSequence().getName() );
                 sb.append( " " );
             }
-            else if ( !ForesterUtil.isEmpty( getNodeData().getSequence().getSymbol() ) ) {
+            if ( !ForesterUtil.isEmpty( getNodeData().getSequence().getSymbol() ) ) {
                 sb.append( getNodeData().getSequence().getSymbol() );
                 sb.append( " " );
             }
-            else if ( getNodeData().getSequence().getAccession() != null ) {
-                sb.append( getNodeData().getTaxonomy().getIdentifier().toString() );
+            if ( getNodeData().getSequence().getAccession() != null ) {
+                sb.append( getNodeData().getSequence().getAccession().toString() );
                 sb.append( " " );
             }
         }
+        if ( ( sb.length() <= 1 ) && !ForesterUtil.isEmpty( getName() ) ) {
+            sb.append( getName() );
+            sb.append( " " );
+        }
         if ( sb.length() <= 1 ) {
             sb.append( "[" );
             sb.append( getId() );
@@ -1133,24 +1147,24 @@ public final class PhylogenyNode implements PhylogenyNodeI, Comparable<Phylogeny
 
     public static PhylogenyNode createInstanceFromNhxString( final String nhx ) throws NHXFormatException,
             PhyloXmlDataFormatException {
-        return new PhylogenyNode( nhx, PhylogenyMethods.TAXONOMY_EXTRACTION.NO, false );
+        return new PhylogenyNode( nhx, NHXParser.TAXONOMY_EXTRACTION.NO, false );
     }
 
     public static PhylogenyNode createInstanceFromNhxString( final String nhx,
-                                                             final PhylogenyMethods.TAXONOMY_EXTRACTION taxonomy_extraction )
+                                                             final NHXParser.TAXONOMY_EXTRACTION taxonomy_extraction )
             throws NHXFormatException, PhyloXmlDataFormatException {
         return new PhylogenyNode( nhx, taxonomy_extraction, false );
     }
 
     public static PhylogenyNode createInstanceFromNhxString( final String nhx,
-                                                             final PhylogenyMethods.TAXONOMY_EXTRACTION taxonomy_extraction,
+                                                             final NHXParser.TAXONOMY_EXTRACTION taxonomy_extraction,
                                                              final boolean replace_underscores )
             throws NHXFormatException, PhyloXmlDataFormatException {
         return new PhylogenyNode( nhx, taxonomy_extraction, replace_underscores );
     }
 
     private PhylogenyNode( final String nhx,
-                           final PhylogenyMethods.TAXONOMY_EXTRACTION taxonomy_extraction,
+                           final NHXParser.TAXONOMY_EXTRACTION taxonomy_extraction,
                            final boolean replace_underscores ) throws NHXFormatException, PhyloXmlDataFormatException {
         //  init();
         NHXParser.parseNHX( nhx, this, taxonomy_extraction, replace_underscores );