X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fhmmer%2FHMMSearch.java;h=a06f186ad0df70dc3547913e16a40c3a4c255e67;hb=8d2c4f1719e83f64cabdc294b3e051b7417a77e1;hp=248af16de3b57a7c0212b90b76d72be575cc4aa5;hpb=5b552cc983ae304b23b696498e869dd6724fd1a5;p=jalview.git diff --git a/src/jalview/hmmer/HMMSearch.java b/src/jalview/hmmer/HMMSearch.java index 248af16..a06f186 100644 --- a/src/jalview/hmmer/HMMSearch.java +++ b/src/jalview/hmmer/HMMSearch.java @@ -491,10 +491,11 @@ public class HMMSearch extends HmmerCommand while (!" ------ inclusion threshold ------".equals(line) && !"".equals(line)) { - SequenceI seq = seqs[index]; Scanner scanner = new Scanner(line); String evalue = scanner.next(); String score = scanner.next(); + checkSequenceOrder(index, scanner); + SequenceI seq = seqs[index]; addScoreAnnotations(evalue, score, seq); scanner.close(); line = br.readLine(); @@ -536,4 +537,29 @@ public class HMMSearch extends HmmerCommand } } + private void checkSequenceOrder(int index, Scanner scanner) + { + String seqName = null; + + for (int i = 0; i < 8; i++) + { + seqName = scanner.next(); + } + + if (!seqs[index].getName().equals(seqName)) + { + SequenceI temp = seqs[index]; + + for (int j = 0; j < seqs.length; j++) + { + if (seqs[j].getName().equals(seqName)) + { + seqs[index] = seqs[j]; + seqs[j] = temp; + break; + } + } + } + } + }