X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fapplication%2Fnj.java;h=f21005894253ab7e10a0ccd9fbdef2dbaacb1973;hb=b5fe992f707cdad84255eb85040effbee97d61b3;hp=0f1ef3eeba8c5e88601b341718870f637a767eba;hpb=656be28debec520e0e35a8b311114398a40ea366;p=jalview.git diff --git a/forester/java/src/org/forester/application/nj.java b/forester/java/src/org/forester/application/nj.java index 0f1ef3e..f210058 100644 --- a/forester/java/src/org/forester/application/nj.java +++ b/forester/java/src/org/forester/application/nj.java @@ -33,7 +33,6 @@ import java.util.Date; import java.util.List; import org.forester.evoinference.distance.NeighborJoining; -import org.forester.evoinference.matrix.distance.BasicSymmetricalDistanceMatrix; import org.forester.evoinference.matrix.distance.DistanceMatrix; import org.forester.io.parsers.SymmetricalDistanceMatrixParser; import org.forester.io.writers.PhylogenyWriter; @@ -119,10 +118,10 @@ public class nj { + matrices[ 0 ].getSize() ); } final List ps = new ArrayList(); - final NeighborJoining nj = NeighborJoining.createInstance( verbose ); + final NeighborJoining nj = NeighborJoining.createInstance( verbose, 6 ); final long start_time = new Date().getTime(); for( final DistanceMatrix matrix : matrices ) { - ps.add( nj.execute( ( BasicSymmetricalDistanceMatrix ) matrix ) ); + ps.add( nj.execute( ( DistanceMatrix ) matrix ) ); } final long end_time = new Date().getTime(); final PhylogenyWriter w = new PhylogenyWriter(); @@ -142,7 +141,7 @@ public class nj { System.out.println( "Usage:" ); System.out.println(); System.out.println( "% java -cp forester.jar org.forester.applications." + PRG_NAME - + " [options] " ); + + " [options] " ); System.out.println(); System.out.println( " Options: " ); System.out.println( VERBOSE_OPTION + ": verbose on" );