X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fevoinference%2FTestPhylogenyReconstruction.java;h=9ff84578d1447248ac08601f027dd1138e3d1b4f;hb=cfda6a6b1a23304bdcdac75f629e9ce4beb9cd9a;hp=77267350f4a1ab2827750b99847735c81a881a9f;hpb=eee996a6476a1e3d84c07f8f690dcde3ff4b2ef5;p=jalview.git diff --git a/forester/java/src/org/forester/evoinference/TestPhylogenyReconstruction.java b/forester/java/src/org/forester/evoinference/TestPhylogenyReconstruction.java index 7726735..9ff8457 100644 --- a/forester/java/src/org/forester/evoinference/TestPhylogenyReconstruction.java +++ b/forester/java/src/org/forester/evoinference/TestPhylogenyReconstruction.java @@ -1925,7 +1925,6 @@ public class TestPhylogenyReconstruction { m.setIdentifier( 4, "E" ); m.setIdentifier( 5, "F" ); final NeighborJoining nj = NeighborJoining.createInstance(); - nj.setVerbose( false ); nj.execute( m ); m = new BasicSymmetricalDistanceMatrix( 7 ); m.setIdentifier( 0, "Bovine" ); @@ -2347,10 +2346,14 @@ public class TestPhylogenyReconstruction { private static void timeNeighborJoining() { final NeighborJoining nj = NeighborJoining.createInstance(); - for( int n = 3; n <= 12; ++n ) { + for( int n = 3; n <= 13; ++n ) { final int x = ( int ) Math.pow( 2, n ); final BasicSymmetricalDistanceMatrix mt = new BasicSymmetricalDistanceMatrix( x ); mt.randomize( new Date().getTime() ); + // for( int i = 0; i < mt.getSize(); i++ ) { + // mt.setIdentifier( i, i + "i" ); + // } + // System.out.println( mt.toStringBuffer( Format.PHYLIP ) ); final long start_time = new Date().getTime(); nj.execute( mt ); System.out.println( "Size: " + x + " -> " + ( new Date().getTime() - start_time ) + "ms." );