Use 0f rather than NaN to specify non-valued annotation elements.

[jalview.git] / src / jalview / io / JPredFile.java

diff --git a/src/jalview/io/JPredFile.java b/src/jalview/io/JPredFile.java
index a7e4e70..dfe1ecf 100755 (executable)
--- a/src/jalview/io/JPredFile.java
+++ b/src/jalview/io/JPredFile.java
@@ -36,8 +36,8 @@ import jalview.datamodel.*;
  * Automagic translation happens for annotation called 'JNETPRED' (translated to Secondary Structure Prediction), or 'JNETCONF' (translates to 'Prediction Confidence').
  * Numeric scores are differentiated from symbolic by being parseable into a float vector. They are put in Scores.
  * Symscores gets the others.
- * JNetAnnotationMaker translates the data parsed by this object into annotation on an alignment.
- *
+ * JNetAnnotationMaker translates the data parsed by this object into annotation on an alignment. It is automatically called
+ * but can be used to transfer the annotation onto a sequence in another alignment (and insert gaps where necessary)
  * @author jprocter
  * @version $Revision$
  */
@@ -63,7 +63,10 @@ public class JPredFile
   {
     super(inFile, type);
   }
-
+  public JPredFile(FileParse source) throws IOException
+  {
+    super(source);
+  }
   /**
    * DOCUMENT ME!
    *
@@ -293,6 +296,25 @@ public class JPredFile
 
       seqs.addElement(newSeq);
     }
+    if (seqs.size()>0)
+    {
+      // try to make annotation for a prediction only input (default if no alignment is given)
+      Alignment tal = new Alignment(this.getSeqsAsArray());
+      try {
+        JnetAnnotationMaker.add_annotation(this, tal, QuerySeqPosition, true);
+      } catch (Exception e)
+      {
+        tal = null;
+        IOException ex = new IOException("Couldn't parse concise annotation for prediction profile.\n"+e);
+        throw ex;
+      }
+      this.annotations = new Vector();
+      AlignmentAnnotation[] aan = tal.getAlignmentAnnotation();
+      for (int aai = 0; aan!=null && aai<aan.length; aai++)
+      {
+        annotations.addElement(aan[aai]);
+      }
+    } 
   }
 
   /**
@@ -327,7 +349,7 @@ public class JPredFile
     catch (java.io.IOException e)
     {
       System.err.println("Exception " + e);
-      e.printStackTrace();
+      // e.printStackTrace(); not java 1.1 compatible!
     }
   }