X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fevoinference%2Fdistance%2FNeighborJoiningR.java;h=209b93fd97788050086a8932f963b7e096ca639c;hb=c0439ed8b088887ffea2faf11bc7897333287cb3;hp=c92fd5453f94dcea6684d45fbb8d5bc64db133e3;hpb=dd04eb6f09074d32b99879cbe5f6bb5aa7db0ce6;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 c92fd54..209b93f 100644
--- a/forester/java/src/org/forester/evoinference/distance/NeighborJoiningR.java
+++ b/forester/java/src/org/forester/evoinference/distance/NeighborJoiningR.java
@@ -29,7 +29,6 @@ import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Set;
 
 import org.forester.evoinference.matrix.distance.BasicSymmetricalDistanceMatrix;
 import org.forester.phylogeny.Phylogeny;
@@ -49,7 +48,7 @@ public final class NeighborJoiningR {
     private final boolean                  _verbose;
     private int                            _min_i;
     private int                            _min_j;
-    private S                              _s;
+    private Sarray                         _s;
     private double                         _d_min;                             //TODO remove me
     private int[]                          _rev_mappings;
     private double                         _umax;
@@ -121,7 +120,7 @@ public final class NeighborJoiningR {
             if ( _verbose ) {
                 System.out.println( "" );
                 System.out
-                        .println( "----------------------------------------------------------------------------------" );
+                .println( "----------------------------------------------------------------------------------" );
                 System.out.println( "" );
             }
         }
@@ -184,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;
         }
@@ -260,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.
@@ -274,7 +273,7 @@ public final class NeighborJoiningR {
         _mappings = new int[ _n ];
         _rev_mappings = new int[ _n ];
         _d_values = distances.getValues();
-        _s = new S();
+        _s = new Sarray();
         _s.initialize( distances );
         initExternalNodes();
         if ( _verbose ) {
@@ -304,8 +303,8 @@ public final class NeighborJoiningR {
                 System.out.print( " " );
             }
             System.out.print( "\t\t" );
-            for( final Entry<Integer, Set<Integer>> entry : _s.getSentrySet( _mappings[ j ] ) ) {
-                System.out.print( DF.format( ( double ) entry.getKey() / S.FACTOR ) + "=" );
+            for( final Entry<Integer, int[]> entry : _s.getSentrySet( _mappings[ j ] ) ) {
+                System.out.print( DF.format( ( double ) entry.getKey() / Sarray.FACTOR ) + "=" );
                 boolean first = true;
                 for( final int v : entry.getValue() ) {
                     if ( !first ) {
@@ -333,7 +332,7 @@ public final class NeighborJoiningR {
         X: for( int j = 1; j < _n; ++j ) {
             final double r_j = _r[ j ];
             final int m_j = _mappings[ j ];
-            for( final Entry<Integer, Set<Integer>> entry : _s.getSentrySet( m_j ) ) {
+            for( final Entry<Integer, int[]> entry : _s.getSentrySet( m_j ) ) {
                 for( final int sorted_i : entry.getValue() ) {
                     final double m = _d_values[ sorted_i ][ m_j ]
                             - ( ( _r[ _rev_mappings[ sorted_i ] ] + r_j ) / n_minus_2 );
@@ -352,7 +351,7 @@ public final class NeighborJoiningR {
             final double r_j = _r[ j ];
             final int m_j = _mappings[ j ];
             boolean first = true;
-            for( final Entry<Integer, Set<Integer>> entry : _s.getSentrySet( m_j ) ) {
+            for( final Entry<Integer, int[]> entry : _s.getSentrySet( m_j ) ) {
                 if ( first ) {
                     first = false;
                     continue;
@@ -372,7 +371,7 @@ public final class NeighborJoiningR {
             }
             if ( _verbose ) {
                 System.out.println();
-                for( final Entry<Integer, Set<Integer>> entry : _s.getSentrySet( m_j ) ) {
+                for( final Entry<Integer, int[]> entry : _s.getSentrySet( m_j ) ) {
                     for( final int sorted_i : entry.getValue() ) {
                         System.out.print( sorted_i );
                         System.out.print( "->" );