Merge branch 'features/r2_11_2_alphafold/JAL-629' into features/JAL-3858_PAEsInProjects

[jalview.git] / src / jalview / ws / datamodel / alphafold / PAEContactMatrix.java

diff --git a/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java b/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
index 79ad458..0349417 100644 (file)
--- a/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
+++ b/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
@@ -29,17 +29,21 @@ public class PAEContactMatrix implements ContactMatrixI
 
   float maxscore;
 
-  @SuppressWarnings("unchecked")
-  public PAEContactMatrix(SequenceI _refSeq, Map<String, Object> pae_obj)
+  private void setRefSeq(SequenceI _refSeq)
   {
     refSeq = _refSeq;
     while (refSeq.getDatasetSequence() != null)
     {
       refSeq = refSeq.getDatasetSequence();
     }
-    // convert the lists to primitive arrays and store
     length = _refSeq.getEnd() - _refSeq.getStart() + 1;
-
+  }
+  @SuppressWarnings("unchecked")
+  public PAEContactMatrix(SequenceI _refSeq, Map<String, Object> pae_obj)
+  {
+    setRefSeq(_refSeq);
+    // convert the lists to primitive arrays and store
+    
     if (!MapUtils.containsAKey(pae_obj, "predicted_aligned_error", "pae"))
     {
       parse_version_1_pAE(pae_obj);
@@ -50,12 +54,40 @@ public class PAEContactMatrix implements ContactMatrixI
       parse_version_2_pAE(pae_obj);
     }
   }
+  /**
+   * construct a sequence associated PAE matrix directly from a float array
+   * @param _refSeq
+   * @param matrix
+   */
+  public PAEContactMatrix(SequenceI _refSeq, float[][] matrix)
+  {
+    setRefSeq(_refSeq);
+    maxcol=0;
+    for (float[] row:matrix)
+    {
+      if (row.length>maxcol)
+      {
+        maxcol=row.length;
+      }
+      maxscore=row[0];
+      for (float f:row)
+      {
+        if (maxscore<f) {
+          maxscore=f;
+        }
+      }
+    }
+    maxrow=matrix.length;
+    elements = matrix;
+    
+  }
 
   /**
    * parse a sane JSON representation of the pAE
    * 
    * @param pae_obj
    */
+  @SuppressWarnings("unchecked")
   private void parse_version_2_pAE(Map<String, Object> pae_obj)
   {
     elements = new float[length][length];
@@ -71,7 +103,11 @@ public class PAEContactMatrix implements ContactMatrixI
       Iterator<Long> scores = scoreRows.next().iterator();
       while (scores.hasNext())
       {
-        elements[row][col++] = scores.next();
+        Object d = scores.next();
+        if (d instanceof Double)
+          elements[row][col++] = ((Double) d).longValue();
+        else
+          elements[row][col++] = (float) d;
       }
       row++;
       col = 0;
@@ -86,6 +122,7 @@ public class PAEContactMatrix implements ContactMatrixI
    * 
    * @param pae_obj
    */
+  @SuppressWarnings("unchecked")
   private void parse_version_1_pAE(Map<String, Object> pae_obj)
   {
     // assume indices are with respect to range defined by _refSeq on the
@@ -135,7 +172,7 @@ public class PAEContactMatrix implements ContactMatrixI
       @Override
       public int getContactHeight()
       {
-        return maxcol - 1;
+        return maxcol-1;
       }
 
       @Override
@@ -145,7 +182,6 @@ public class PAEContactMatrix implements ContactMatrixI
         {
           return -1;
         }
-        // TODO Auto-generated method stub
         return elements[_column][column];
       }
     });
@@ -193,4 +229,14 @@ public class PAEContactMatrix implements ContactMatrixI
   {
     return PAEMATRIX;
   }
+  @Override
+  public int getWidth()
+  {
+    return length;
+  }
+  @Override
+  public int getHeight()
+  {
+    return length;
+  }
 }