X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fevoinference%2Fdistance%2FNeighborJoiningR.java;h=209b93fd97788050086a8932f963b7e096ca639c;hb=88718609970e490e94727d12ebbca1270ba2c0a7;hp=be180183d6b102e124b1e5692ddaa2fa55d82ce5;hpb=6b13ba9c7a74f37fd06abe5a7e52defc3d563861;p=jalview.git

diff --git a/forester/java/src/org/forester/evoinference/distance/NeighborJoiningR.java b/forester/java/src/org/forester/evoinference/distance/NeighborJoiningR.java
index be18018..209b93f 100644
--- a/forester/java/src/org/forester/evoinference/distance/NeighborJoiningR.java
+++ b/forester/java/src/org/forester/evoinference/distance/NeighborJoiningR.java
@@ -120,7 +120,7 @@ public final class NeighborJoiningR {
             if ( _verbose ) {
                 System.out.println( "" );
                 System.out
-                        .println( "----------------------------------------------------------------------------------" );
+                .println( "----------------------------------------------------------------------------------" );
                 System.out.println( "" );
             }
         }
@@ -183,12 +183,12 @@ public final class NeighborJoiningR {
         }
         double new_d;
         if ( otu1 < mj ) {
-            new_d = ( _d_values[ otu1 ][ mj ] + getDvalue( j, otu2 ) - d ) / 2;
+            new_d = ( ( _d_values[ otu1 ][ mj ] + getDvalue( j, otu2 ) ) - d ) / 2;
             _s.addPairing( new_d, otu1, mj );
             _d_values[ otu1 ][ mj ] = new_d;
         }
         else {
-            new_d = ( _d_values[ mj ][ otu1 ] + getDvalue( j, otu2 ) - d ) / 2;
+            new_d = ( ( _d_values[ mj ][ otu1 ] + getDvalue( j, otu2 ) ) - d ) / 2;
             _s.addPairing( new_d, mj, otu1 );
             _d_values[ mj ][ otu1 ] = new_d;
         }
@@ -259,9 +259,9 @@ public final class NeighborJoiningR {
                 + " ("
                 + ( ForesterUtil.isEmpty( n.getChildNode1().getName() ) ? n.getChildNode1().getId() : n.getChildNode1()
                         .getName() )
-                + "+"
-                + ( ForesterUtil.isEmpty( n.getChildNode2().getName() ) ? n.getChildNode2().getId() : n.getChildNode2()
-                        .getName() ) + ")";
+                        + "+"
+                        + ( ForesterUtil.isEmpty( n.getChildNode2().getName() ) ? n.getChildNode2().getId() : n.getChildNode2()
+                                .getName() ) + ")";
     }
 
     // only the values in the lower triangle are used.