JAL-1950 transfer posterior probability onto hit sequences

diff --git a/src/jalview/ws/ebi/HmmerJSONProcessor.java b/src/jalview/ws/ebi/HmmerJSONProcessor.java
index 4d30b3b..731df91 100644 (file)
--- a/src/jalview/ws/ebi/HmmerJSONProcessor.java
+++ b/src/jalview/ws/ebi/HmmerJSONProcessor.java
@@ -2,6 +2,7 @@ package jalview.ws.ebi;
 
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
+import jalview.datamodel.Annotation;
 import jalview.datamodel.SequenceI;
 import jalview.io.FileParse;
 
@@ -123,30 +124,83 @@ public class HmmerJSONProcessor
     double evalue = Double.valueOf("" + hmmrhit.get("evalue"));
     for (Object domainhit : ((JSONArray) hmmrhit.get("domains")))
     {
-      JSONObject dhit=(JSONObject) domainhit;
+      JSONObject dhit = (JSONObject) domainhit;
       // dhit.get(key)
 
       // alihmmfrom,alihmmto alimodel
+      long alihmmfrom = (long) dhit.get("alihmmfrom"), alihmmto = (long) dhit
+              .get("alihmmto"), alisqfrom = (long) dhit.get("alisqfrom"), alisqto = (long) dhit
+              .get("alisqto");
+
       // alisqfrom,alisqto,aliaseq
+
       // alippline
-      // 
+      String aliaseq = (String) dhit.get("aliaseq"), alimodel = (String) dhit
+              .get("alimodel"), ppline = (String) dhit.get("alippline");
+      AlignmentAnnotation alipp = parsePosteriorProb(ppline);
+      //
+      int found = 0;
       for (SequenceI hitseq : hits)
       {
         // match alisqfrom,alisqto,seq
-        // overlay ppline as seqannotation
-        // ievalue
-        // cevalue
-        // 
-
-        AlignmentAnnotation pval = new AlignmentAnnotation("p-value",
-                "hmmer3 pvalue", pvalue);
-        AlignmentAnnotation eval = new AlignmentAnnotation("e-value",
-                "hmmer3 evalue", evalue);
-        hitseq.addAlignmentAnnotation(pval);
-        hitseq.addAlignmentAnnotation(eval);
-        
+        if (hitseq.getStart() == alisqfrom && hitseq.getEnd() == alisqto)
+        {
+          found++; // annotated a sequence
+          AlignmentAnnotation pval = new AlignmentAnnotation("p-value",
+                  "hmmer3 pvalue", pvalue);
+          AlignmentAnnotation eval = new AlignmentAnnotation("e-value",
+                  "hmmer3 evalue", evalue);
+          pval.setCalcId("HMMER3");
+          eval.setCalcId("HMMER3");
+          alipp.setCalcId("HMMER3");
+          hitseq.addAlignmentAnnotation(pval);
+          hitseq.addAlignmentAnnotation(eval);
+          alipp.createSequenceMapping(hitseq, hitseq.getStart(), false);
+          hitseq.addAlignmentAnnotation(alipp);
+          alipp.adjustForAlignment();
+          resultAl.addAnnotation(pval);
+          resultAl.addAnnotation(eval);
+          resultAl.addAnnotation(alipp);
+          alipp.validateRangeAndDisplay();
+        }
+      }
+      if (found == 0)
+      {
+        System.err.println("Warn - no match for json hit " + sname + "/"
+                + alisqfrom + "-" + alisqto);
+      }
+      if (found > 1)
+      {
+        System.err.println("Warn - multiple matches for json hit " + sname
+                + "/" + alisqfrom + "-" + alisqto);
+      }
+    }
+  }
 
+  private AlignmentAnnotation parsePosteriorProb(String ppline)
+  {
+    Annotation[] ae = new Annotation[ppline.length()];
+    int spos = 0;
+    for (int i = 0, iSize = ppline.length(); i < iSize; i++)
+    {
+      char pp = ppline.charAt(i);
+      if (pp == '*')
+      {
+        ae[spos++] = new Annotation(10f);
+      }
+      else
+      {
+        if (pp >= '0' && pp <= '9')
+        {
+          ae[spos++] = new Annotation(Integer.valueOf("" + pp));
+        }
       }
     }
+    AlignmentAnnotation pprob = new AlignmentAnnotation(
+            "Posterior Probability",
+            "Likelihood of HMM fit at each hit position.", ae);
+    pprob.graph = pprob.BAR_GRAPH;
+    pprob.visible = false;
+    return pprob;
   }
 }