import javax.swing.*;
import javax.swing.event.*;
+import jalview.analysis.AlignSeq;
import jalview.commands.*;
import jalview.datamodel.*;
import jalview.jbgui.*;
}
height = originalSequences.length;
-
- redundancy = new float[height];
- for (int i = 0; i < height; i++)
- {
- redundancy[i] = 0f;
- }
-
if (ap.av.hasHiddenColumns())
{
omitHidden = ap.av.getViewAsString(sg != null);
}
-
- // long start = System.currentTimeMillis();
-
- float pid;
- String seqi, seqj;
- for (int i = 0; i < height; i++)
- {
-
- for (int j = 0; j < i; j++)
- {
- if (i == j)
- {
- continue;
- }
-
- if (omitHidden == null)
- {
- seqi = originalSequences[i].getSequenceAsString(start, end);
- seqj = originalSequences[j].getSequenceAsString(start, end);
- }
- else
- {
- seqi = omitHidden[i];
- seqj = omitHidden[j];
- }
-
- pid = Comparison.PID(seqi, seqj);
-
- if (seqj.length() < seqi.length())
- {
- redundancy[j] = Math.max(pid, redundancy[j]);
- }
- else
- {
- redundancy[i] = Math.max(pid, redundancy[i]);
- }
-
- }
- }
+ redundancy = AlignSeq.computeRedundancyMatrix(originalSequences, omitHidden, start, end, false);
progress.setIndeterminate(false);
progress.setVisible(false);