X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fevoinference%2Fmatrix%2Fdistance%2FBasicSymmetricalDistanceMatrix.java;h=14d7e971ece01884bbf2048b31c9730e72be88af;hb=aff0b302cc19e0ee3e73bc4a87884b4591ac5f08;hp=fdf2ec4ea4ebc757f152a0ecada2e21e785b093e;hpb=2eb16fa8fc6fa40a6f9829a5d624ada26b026fcc;p=jalview.git diff --git a/forester/java/src/org/forester/evoinference/matrix/distance/BasicSymmetricalDistanceMatrix.java b/forester/java/src/org/forester/evoinference/matrix/distance/BasicSymmetricalDistanceMatrix.java index fdf2ec4..14d7e97 100644 --- a/forester/java/src/org/forester/evoinference/matrix/distance/BasicSymmetricalDistanceMatrix.java +++ b/forester/java/src/org/forester/evoinference/matrix/distance/BasicSymmetricalDistanceMatrix.java @@ -39,18 +39,14 @@ public final class BasicSymmetricalDistanceMatrix implements DistanceMatrix { // NumberFormat nf1 = NumberFormat.getInstance(); private final static NumberFormat PHYLIP_FORMATTER = new DecimalFormat( "0.000000" ); - final double[][] _values; final String[] _identifiers; + final double[][] _values; public BasicSymmetricalDistanceMatrix( final int size ) { _values = new double[ size ][ size ]; _identifiers = new String[ size ]; } - public final double[][] getValues() { - return _values; - } - @Override public final String getIdentifier( final int i ) { return _identifiers[ i ]; @@ -85,6 +81,10 @@ public final class BasicSymmetricalDistanceMatrix implements DistanceMatrix { return _values[ col ][ row ]; } + public final double[][] getValues() { + return _values; + } + public final void randomize( final long seed ) { final java.util.Random r = new java.util.Random( seed ); for( int j = 0; j < getSize(); ++j ) { @@ -122,6 +122,21 @@ public final class BasicSymmetricalDistanceMatrix implements DistanceMatrix { _values[ col ][ row ] = d; } + @Override + public final String toString() { + return toPhylip().toString(); + } + + @Override + public final StringBuffer toStringBuffer( final Format format ) { + switch ( format ) { + case PHYLIP: + return toPhylip(); + default: + throw new IllegalArgumentException( "Unknown format:" + format ); + } + } + public final void write( final Writer w ) throws IOException { w.write( " " ); w.write( getSize() + "" ); @@ -179,19 +194,4 @@ public final class BasicSymmetricalDistanceMatrix implements DistanceMatrix { } return sb; } - - @Override - public final String toString() { - return toPhylip().toString(); - } - - @Override - public final StringBuffer toStringBuffer( final Format format ) { - switch ( format ) { - case PHYLIP: - return toPhylip(); - default: - throw new IllegalArgumentException( "Unknown format:" + format ); - } - } }