X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJnetAnnotationMaker.java;h=8c841a885423a6d5fb69f90c15de07bfb83f3cdf;hb=96f41aa46d3e568f8734834ab36fdc9ad8e54ac1;hp=bb34548616321d93f7bd4f8bc16be437998f4af8;hpb=60f2d6c034560415fd0139c8bc7df0c19cae1186;p=jalview.git

diff --git a/src/jalview/io/JnetAnnotationMaker.java b/src/jalview/io/JnetAnnotationMaker.java
index bb34548..8c841a8 100755
--- a/src/jalview/io/JnetAnnotationMaker.java
+++ b/src/jalview/io/JnetAnnotationMaker.java
@@ -1,21 +1,21 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
+ * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
+ * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
+ */
 package jalview.io;
 
 import jalview.datamodel.*;
@@ -23,23 +23,30 @@ import jalview.datamodel.*;
 public class JnetAnnotationMaker
 {
   public static void add_annotation(JPredFile prediction, AlignmentI al,
-                                    int firstSeq, boolean noMsa)
-      throws Exception
+          int firstSeq, boolean noMsa) throws Exception
   {
-    JnetAnnotationMaker.add_annotation(prediction, al, firstSeq, noMsa, (int[])null);
+    JnetAnnotationMaker.add_annotation(prediction, al, firstSeq, noMsa,
+            (int[]) null);
   }
 
   /**
    * adds the annotation parsed by prediction to al.
-   * @param prediction JPredFile
-   * @param al AlignmentI
-   * @param firstSeq int the index of the sequence to attach the annotation to (usually zero)
-   * @param noMsa boolean
-   * @param delMap mapping from columns in JPredFile prediction to residue number in al.getSequence(firstSeq)
+   * 
+   * @param prediction
+   *                JPredFile
+   * @param al
+   *                AlignmentI
+   * @param firstSeq
+   *                int the index of the sequence to attach the annotation to
+   *                (usually zero)
+   * @param noMsa
+   *                boolean
+   * @param delMap
+   *                mapping from columns in JPredFile prediction to residue
+   *                number in al.getSequence(firstSeq)
    */
   public static void add_annotation(JPredFile prediction, AlignmentI al,
-                                    int firstSeq, boolean noMsa, int[] delMap)
-      throws Exception
+          int firstSeq, boolean noMsa, int[] delMap) throws Exception
   {
     int i = 0;
     SequenceI[] preds = prediction.getSeqsAsArray();
@@ -48,16 +55,16 @@ public class JnetAnnotationMaker
     SequenceI seqRef = al.getSequenceAt(firstSeq);
     int width = preds[0].getSequence().length;
     int[] gapmap = al.getSequenceAt(firstSeq).gapMap();
-    if ( (delMap != null && delMap.length > width) ||
-        (delMap == null && gapmap.length != width))
+    if ((delMap != null && delMap.length > width)
+            || (delMap == null && gapmap.length != width))
     {
-      throw (new Exception(
-          "Number of residues in " + (delMap == null ? "" : " mapped ") +
-          "supposed query sequence ('" +
-          al.getSequenceAt(firstSeq).getName() + "'\n" +
-          al.getSequenceAt(firstSeq).getSequenceAsString() +
-          ")\ndiffer from number of prediction sites in prediction (" + width +
-          ")"));
+      throw (new Exception("Number of residues in "
+              + (delMap == null ? "" : " mapped ")
+              + "supposed query sequence ('"
+              + al.getSequenceAt(firstSeq).getName() + "'\n"
+              + al.getSequenceAt(firstSeq).getSequenceAsString()
+              + ")\ndiffer from number of prediction sites in prediction ("
+              + width + ")"));
     }
 
     AlignmentAnnotation annot;
@@ -73,25 +80,24 @@ public class JnetAnnotationMaker
     {
       String id = preds[i].getName().toUpperCase();
 
-      if (id.startsWith("LUPAS") || id.startsWith("JNET") ||
-          id.startsWith("JPRED"))
+      if (id.startsWith("LUPAS") || id.startsWith("JNET")
+              || id.startsWith("JPRED"))
       {
         annotations = new Annotation[al.getWidth()];
-        /*        if (delMap!=null) {
-          for (int j=0; j<annotations.length; j++)
-            annotations[j] = new Annotation("","",'',0);
-                 }
+        /*
+         * if (delMap!=null) { for (int j=0; j<annotations.length; j++)
+         * annotations[j] = new Annotation("","",'',0); }
          */
-        if (id.equals("JNETPRED") || id.equals("JNETPSSM") ||
-            id.equals("JNETFREQ") || id.equals("JNETHMM") ||
-            id.equals("JNETALIGN") || id.equals("JPRED"))
+        if (id.equals("JNETPRED") || id.equals("JNETPSSM")
+                || id.equals("JNETFREQ") || id.equals("JNETHMM")
+                || id.equals("JNETALIGN") || id.equals("JPRED"))
         {
           if (delMap == null)
           {
             for (int j = 0; j < width; j++)
             {
-              annotations[gapmap[j]] = new Annotation("", "",
-                  preds[i].getCharAt(j), 0);
+              annotations[gapmap[j]] = new Annotation("", "", preds[i]
+                      .getCharAt(j), 0);
             }
           }
           else
@@ -99,7 +105,7 @@ public class JnetAnnotationMaker
             for (int j = 0; j < width; j++)
             {
               annotations[gapmap[delMap[j]]] = new Annotation("", "",
-                  preds[i].getCharAt(j), 0);
+                      preds[i].getCharAt(j), 0);
             }
           }
         }
@@ -109,23 +115,21 @@ public class JnetAnnotationMaker
           {
             for (int j = 0; j < width; j++)
             {
-              float value = new Float(preds[i].getCharAt(
-                  j) + "").floatValue();
-              annotations[gapmap[j]] = new Annotation(preds[i].getCharAt(
-                  j) + "", "", preds[i].getCharAt(j),
-                  value);
+              float value = new Float(preds[i].getCharAt(j) + "")
+                      .floatValue();
+              annotations[gapmap[j]] = new Annotation(preds[i].getCharAt(j)
+                      + "", "", preds[i].getCharAt(j), value);
             }
           }
           else
           {
             for (int j = 0; j < width; j++)
             {
-              float value = new Float(preds[i].getCharAt(
-                  j) + "").floatValue();
-              annotations[gapmap[delMap[j]]] = new Annotation(preds[i].
-                  getCharAt(
-                      j) + "", "", preds[i].getCharAt(j),
-                  value);
+              float value = new Float(preds[i].getCharAt(j) + "")
+                      .floatValue();
+              annotations[gapmap[delMap[j]]] = new Annotation(preds[i]
+                      .getCharAt(j)
+                      + "", "", preds[i].getCharAt(j), value);
             }
           }
         }
@@ -135,17 +139,17 @@ public class JnetAnnotationMaker
           {
             for (int j = 0; j < width; j++)
             {
-              annotations[gapmap[j]] = new Annotation(preds[i].getCharAt(
-                  j) + "", "", ' ', 0);
+              annotations[gapmap[j]] = new Annotation(preds[i].getCharAt(j)
+                      + "", "", ' ', 0);
             }
           }
           else
           {
             for (int j = 0; j < width; j++)
             {
-              annotations[gapmap[delMap[j]]] = new Annotation(preds[i].
-                  getCharAt(
-                      j) + "", "", ' ', 0);
+              annotations[gapmap[delMap[j]]] = new Annotation(preds[i]
+                      .getCharAt(j)
+                      + "", "", ' ', 0);
             }
           }
         }
@@ -153,14 +157,13 @@ public class JnetAnnotationMaker
         if (id.equals("JNETCONF"))
         {
           annot = new AlignmentAnnotation(preds[i].getName(),
-                                          "JNet Output", annotations, 0f,
-                                          10f,
-                                          AlignmentAnnotation.BAR_GRAPH);
+                  "JNet Output", annotations, 0f, 10f,
+                  AlignmentAnnotation.BAR_GRAPH);
         }
         else
         {
           annot = new AlignmentAnnotation(preds[i].getName(),
-                                          "JNet Output", annotations);
+                  "JNet Output", annotations);
         }
 
         if (seqRef != null)
@@ -170,9 +173,8 @@ public class JnetAnnotationMaker
         }
 
         al.addAnnotation(annot);
-        al.setAnnotationIndex(annot,
-                              al.getAlignmentAnnotation().
-                              length - existingAnnotations - 1);
+        al.setAnnotationIndex(annot, al.getAlignmentAnnotation().length
+                - existingAnnotations - 1);
 
         if (noMsa)
         {
@@ -183,16 +185,17 @@ public class JnetAnnotationMaker
       i++;
     }
 
-    //Hashtable scores = prediction.getScores();
-
-    /*  addFloatAnnotations(al, gapmap,  (Vector)scores.get("JNETPROPH"),
-                          "JnetpropH", "Jnet Helix Propensity", 0f,1f,1);
-
-      addFloatAnnotations(al, gapmap,  (Vector)scores.get("JNETPROPB"),
-     "JnetpropB", "Jnet Beta Sheet Propensity", 0f,1f,1);
-
-      addFloatAnnotations(al, gapmap,  (Vector)scores.get("JNETPROPC"),
-                          "JnetpropC", "Jnet Coil Propensity", 0f,1f,1);
+    // Hashtable scores = prediction.getScores();
+
+    /*
+     * addFloatAnnotations(al, gapmap, (Vector)scores.get("JNETPROPH"),
+     * "JnetpropH", "Jnet Helix Propensity", 0f,1f,1);
+     * 
+     * addFloatAnnotations(al, gapmap, (Vector)scores.get("JNETPROPB"),
+     * "JnetpropB", "Jnet Beta Sheet Propensity", 0f,1f,1);
+     * 
+     * addFloatAnnotations(al, gapmap, (Vector)scores.get("JNETPROPC"),
+     * "JnetpropC", "Jnet Coil Propensity", 0f,1f,1);
      */
 
   }