git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-4235 JAL-3599 Try and report Eclipse Product Version for jalviewjsTranspile....
[jalview.git]
/
src
/
jalview
/
analysis
/
NJTree.java
diff --git
a/src/jalview/analysis/NJTree.java
b/src/jalview/analysis/NJTree.java
index
040b7b6
..
9a39ac0
100644
(file)
--- a/
src/jalview/analysis/NJTree.java
+++ b/
src/jalview/analysis/NJTree.java
@@
-22,14
+22,12
@@
package jalview.analysis;
import jalview.api.analysis.ScoreModelI;
import jalview.api.analysis.SimilarityParamsI;
import jalview.api.analysis.ScoreModelI;
import jalview.api.analysis.SimilarityParamsI;
-import jalview.datamodel.SequenceNode;
+import jalview.datamodel.BinaryNode;
import jalview.viewmodel.AlignmentViewport;
/**
import jalview.viewmodel.AlignmentViewport;
/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision$
+ * This class implements distance calculations used in constructing a Neighbour
+ * Joining tree
*/
public class NJTree extends TreeBuilder
{
*/
public class NJTree extends TreeBuilder
{
@@
-49,13
+47,10
@@
public class NJTree extends TreeBuilder
}
/**
}
/**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * {@inheritDoc}
*/
@Override
*/
@Override
- protected
- double findMinDistance()
+ protected double findMinDistance()
{
double min = Double.MAX_VALUE;
{
double min = Double.MAX_VALUE;
@@
-83,36
+78,26
@@
public class NJTree extends TreeBuilder
}
/**
}
/**
- * DOCUMENT ME!
- *
- * @param tmpi
- * DOCUMENT ME!
- * @param tmpj
- * DOCUMENT ME!
- * @param dist
- * DOCUMENT ME!
+ * {@inheritDoc}
*/
@Override
*/
@Override
- protected
- void findNewDistances(SequenceNode tmpi, SequenceNode tmpj, double dist)
+ protected void findNewDistances(BinaryNode nodei, BinaryNode nodej,
+ double dist)
{
{
+ nodei.dist = ((dist + ri) - rj) / 2;
+ nodej.dist = (dist - nodei.dist);
- tmpi.dist = ((dist + ri) - rj) / 2;
- tmpj.dist = (dist - tmpi.dist);
-
- if (tmpi.dist < 0)
+ if (nodei.dist < 0)
{
{
- tmpi.dist = 0;
+ nodei.dist = 0;
}
}
- if (tmpj.dist < 0)
+ if (nodej.dist < 0)
{
{
- tmpj.dist = 0;
+ nodej.dist = 0;
}
}
}
}
-
-
/**
* Calculates and saves the distance between the combination of cluster(i) and
* cluster(j) and all other clusters. The new distance to cluster k is
/**
* Calculates and saves the distance between the combination of cluster(i) and
* cluster(j) and all other clusters. The new distance to cluster k is
@@
-123,25
+108,25
@@
public class NJTree extends TreeBuilder
* @param j
*/
@Override
* @param j
*/
@Override
- protected
- void findClusterDistance(int i, int j)
+ protected void findClusterDistance(int i, int j)
{
// New distances from cluster i to others
double[] newdist = new double[noseqs];
{
// New distances from cluster i to others
double[] newdist = new double[noseqs];
-
+
double ijDistance = distances.getValue(i, j);
for (int l = 0; l < noseqs; l++)
{
if ((l != i) && (l != j))
{
double ijDistance = distances.getValue(i, j);
for (int l = 0; l < noseqs; l++)
{
if ((l != i) && (l != j))
{
- newdist[l] = (distances.getValue(i, l) + distances.getValue(j, l) - ijDistance) / 2;
+ newdist[l] = (distances.getValue(i, l) + distances.getValue(j, l)
+ - ijDistance) / 2;
}
else
{
newdist[l] = 0;
}
}
}
else
{
newdist[l] = 0;
}
}
-
+
for (int ii = 0; ii < noseqs; ii++)
{
distances.setValue(i, ii, newdist[ii]);
for (int ii = 0; ii < noseqs; ii++)
{
distances.setValue(i, ii, newdist[ii]);