From: cmzmasek Date: Thu, 13 Mar 2014 19:02:19 +0000 (+0000) Subject: in progress X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=68e831d62c7a1d78d1b489c147682c29ef9c2664;hp=0ccf8b41a889edccde310d55377e1db2351f46e6;p=jalview.git in progress --- diff --git a/forester/java/src/org/forester/evoinference/distance/NeighborJoining.java b/forester/java/src/org/forester/evoinference/distance/NeighborJoining.java index 14553ce..b4f42ea 100644 --- a/forester/java/src/org/forester/evoinference/distance/NeighborJoining.java +++ b/forester/java/src/org/forester/evoinference/distance/NeighborJoining.java @@ -138,19 +138,27 @@ public final class NeighborJoining { if ( otu1 < i ) { if ( otu2 > i ) { _d_values[ m_otu1 ][ m_i ] = ( _d_values[ m_otu1 ][ m_i ] + _d_values[ m_i ][ m_otu2 ] - d ) / 2; + System.out.print( DF.format( _d_values[ m_otu1 ][ m_i ] ) ); } else { _d_values[ m_otu1 ][ m_i ] = ( _d_values[ m_otu1 ][ m_i ] + _d_values[ m_otu2 ][ m_i ] - d ) / 2; + System.out.print( DF.format( _d_values[ m_otu1 ][ m_i ] ) ); + } } else { if ( otu2 > i ) { _d_values[ m_i ][ m_otu1 ] = ( _d_values[ m_i ][ m_otu1 ] + _d_values[ m_i ][ m_otu2 ] - d ) / 2; + System.out.print( DF.format( _d_values[ m_i ][ m_otu1 ] ) ); + } else { _d_values[ m_i ][ m_otu1 ] = ( _d_values[ m_i ][ m_otu1 ] + _d_values[ m_otu2 ][ m_i ] - d ) / 2; + System.out.print( DF.format( _d_values[ m_otu1 ][ m_i ] ) ); + } } + System.out.print( " " ); } }