in progress
authorcmzmasek@gmail.com <cmzmasek@gmail.com@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Sat, 26 May 2012 04:21:07 +0000 (04:21 +0000)
committercmzmasek@gmail.com <cmzmasek@gmail.com@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Sat, 26 May 2012 04:21:07 +0000 (04:21 +0000)
forester/java/src/org/forester/evoinference/distance/NeighborJoining.java

index 164599d..33f3f6e 100644 (file)
@@ -36,7 +36,7 @@ import org.forester.util.ForesterUtil;
 public final class NeighborJoining {
 
     private BasicSymmetricalDistanceMatrix _d;
-    private BasicSymmetricalDistanceMatrix _m;
+    // private BasicSymmetricalDistanceMatrix _m;
     private double[][]                     _d_values;
     private double[][]                     _m_values;
     private double[]                       _r;
@@ -178,11 +178,10 @@ public final class NeighborJoining {
     private final void reset( final BasicSymmetricalDistanceMatrix distances ) {
         _n = distances.getSize();
         _d = distances;
-        _m = new BasicSymmetricalDistanceMatrix( _n );
         _r = new double[ _n ];
         _mappings = new int[ _n ];
         _d_values = _d.getValues();
-        _m_values = _m.getValues();
+        _m_values = new double[ _n ][ _n ];
         initExternalNodes();
     }