- private final void updateDvalue( final int otu1, final int otu2, final int j, final float d ) {
- final float new_d = ( getDvalueUnmapped( otu1, _mappings[ j ] ) + getDvalue( j, otu2 ) - d ) / 2;
- System.out.println( "\nnew d value: " + DF.format( new_d ) );
- if ( otu1 < _mappings[ j ] ) {
- System.out.println( " otu1=" + otu1 );
- System.out.println( " otu2=" + otu2 );
- System.out.println( "motu1=" + _mappings[ otu1 ] );
- System.out.println( "motu2=" + _mappings[ otu2 ] );
- System.out.println( " j=" + j );
- System.out.println( "mj=" + _mappings[ j ] );
- System.out.println( "d=" + DF.format( getDvalueUnmapped( otu1, _mappings[ j ] ) ) );
- _s.removePairing( getDvalueUnmapped( otu1, _mappings[ j ] ), otu1, _mappings[ j ] );
+ private final void updateDvalue( final int otu1, final int otu2, final int j, final double d ) {
+ final int mj = _mappings[ j ];
+ // final double new_d = ( getDvalueUnmapped( otu1, _mappings[ j ] ) + getDvalue( j, otu2 ) - d ) / 2;
+ // System.out.println( "\nnew d value: " + DF.format( new_d ) );
+ if ( otu1 < mj ) {
+ _s.removePairing( _d_values[ otu1 ][ mj ], otu1, mj );