X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fapplication%2Fnj.java;h=6bce55340938c128e1dfe92f7203421b6a752cc5;hb=fffc26ac5f8cf4eaa5faea6a7e369b94d381d859;hp=767edcaabf0409da28690045099a151ddd4b19b6;hpb=493e40b0c936b65da342134da37e8b856b9b80af;p=jalview.git diff --git a/forester/java/src/org/forester/application/nj.java b/forester/java/src/org/forester/application/nj.java index 767edca..6bce553 100644 --- a/forester/java/src/org/forester/application/nj.java +++ b/forester/java/src/org/forester/application/nj.java @@ -6,7 +6,7 @@ // Copyright (C) 2008-2009 Christian M. Zmasek // Copyright (C) 2008-2009 Burnham Institute for Medical Research // All rights reserved -// +// // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either @@ -16,7 +16,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. -// +// // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA @@ -33,6 +33,7 @@ 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; @@ -118,11 +119,10 @@ public class nj { + matrices[ 0 ].getSize() ); } final List ps = new ArrayList(); - final NeighborJoining nj = NeighborJoining.createInstance(); - nj.setVerbose( verbose ); + final NeighborJoining nj = NeighborJoining.createInstance( verbose ); final long start_time = new Date().getTime(); for( final DistanceMatrix matrix : matrices ) { - ps.add( nj.execute( matrix ) ); + ps.add( nj.execute( ( BasicSymmetricalDistanceMatrix ) matrix ) ); } final long end_time = new Date().getTime(); final PhylogenyWriter w = new PhylogenyWriter();