X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdatamodel%2Falphafold%2FPAEContactMatrix.java;h=ce072e06a0477b8b3245154dae6548758618a568;hb=beb2fee66dde629e3bbb7febb38d0116e1a64df2;hp=22dd7fbe591a83509b5855bcf303f46789670857;hpb=0c08a3e1a37eca3a7c011a56f0c353258b0e8020;p=jalview.git diff --git a/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java b/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java index 22dd7fb..ce072e0 100644 --- a/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java +++ b/src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java @@ -11,54 +11,46 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.json.simple.JSONObject; import jalview.analysis.AverageDistanceEngine; import jalview.bin.Console; +import jalview.datamodel.Annotation; import jalview.datamodel.BinaryNode; import jalview.datamodel.ContactListI; import jalview.datamodel.ContactListImpl; import jalview.datamodel.ContactListProviderI; import jalview.datamodel.ContactMatrixI; +import jalview.datamodel.GroupSet; +import jalview.datamodel.GroupSetI; +import jalview.datamodel.Mapping; import jalview.datamodel.SequenceDummy; import jalview.datamodel.SequenceI; import jalview.io.DataSourceType; import jalview.io.FileFormatException; import jalview.io.FileParse; +import jalview.util.MapList; import jalview.util.MapUtils; import jalview.ws.dbsources.EBIAlfaFold; -public class PAEContactMatrix implements ContactMatrixI +public class PAEContactMatrix extends + MappableContactMatrix implements ContactMatrixI { - SequenceI refSeq = null; - - /** - * the length that refSeq is expected to be (excluding gaps, of course) - */ - int length; int maxrow = 0, maxcol = 0; - int[] indices1, indices2; float[][] elements; float maxscore; - private void setRefSeq(SequenceI _refSeq) - { - refSeq = _refSeq; - while (refSeq.getDatasetSequence() != null) - { - refSeq = refSeq.getDatasetSequence(); - } - length = _refSeq.getEnd() - _refSeq.getStart() + 1; - } @SuppressWarnings("unchecked") - public PAEContactMatrix(SequenceI _refSeq, Map pae_obj) throws FileFormatException + public PAEContactMatrix(SequenceI _refSeq, Map pae_obj) + throws FileFormatException { setRefSeq(_refSeq); // convert the lists to primitive arrays and store @@ -105,6 +97,22 @@ public class PAEContactMatrix implements ContactMatrixI } /** + * new matrix with specific mapping to a reference sequence + * + * @param newRefSeq + * @param newFromMapList + * @param elements2 + * @param grps2 + */ + public PAEContactMatrix(SequenceI newRefSeq, MapList newFromMapList, + float[][] elements2, GroupSet grps2) + { + this(newRefSeq, elements2); + toSeq = newFromMapList; + grps = grps2; + } + + /** * parse a sane JSON representation of the pAE * * @param pae_obj @@ -133,7 +141,6 @@ public class PAEContactMatrix implements ContactMatrixI while (scores.hasNext()) { Object d = scores.next(); - if (d instanceof Double) { elements[row][col++] = ((Double) d).longValue(); @@ -142,7 +149,7 @@ public class PAEContactMatrix implements ContactMatrixI { elements[row][col++] = (float) ((Long) d).longValue(); } - + if (maxscore < elements[row][col - 1]) { maxscore = elements[row][col - 1]; @@ -209,9 +216,9 @@ public class PAEContactMatrix implements ContactMatrixI } @Override - public ContactListI getContactList(final int _column) + public ContactListI getContactList(final int column) { - if (_column < 0 || _column >= elements.length) + if (column < 0 || column >= elements.length) { return null; } @@ -221,7 +228,7 @@ public class PAEContactMatrix implements ContactMatrixI @Override public int getPosition() { - return _column; + return column; } @Override @@ -231,55 +238,50 @@ public class PAEContactMatrix implements ContactMatrixI } @Override - public double getContactAt(int column) + public double getContactAt(int mcolumn) { - if (column < 0 || column >= elements[_column].length) + if (mcolumn < 0 || mcolumn >= elements[column].length) { return -1; } - return elements[_column][column]; + return elements[column][mcolumn]; } }); } @Override - public float getMin() - { - return 0; - } - - @Override - public float getMax() + protected double getElementAt(int _column, int i) { - return maxscore; + return elements[_column][i]; } @Override - public boolean hasReferenceSeq() + public float getMin() { - return (refSeq != null); + return 0; } @Override - public SequenceI getReferenceSeq() + public float getMax() { - return refSeq; + return maxscore; } @Override public String getAnnotDescr() { - return "Predicted Alignment Error"+((refSeq==null) ? "" : (" for " + refSeq.getName())); + return "Predicted Alignment Error" + + ((refSeq == null) ? "" : (" for " + refSeq.getName())); } @Override public String getAnnotLabel() { StringBuilder label = new StringBuilder("PAE Matrix"); - //if (this.getReferenceSeq() != null) - //{ - // label.append(":").append(this.getReferenceSeq().getDisplayId(false)); - //} + // if (this.getReferenceSeq() != null) + // { + // label.append(":").append(this.getReferenceSeq().getDisplayId(false)); + // } return label.toString(); } @@ -302,146 +304,41 @@ public class PAEContactMatrix implements ContactMatrixI { return length; } - List groups=null; - @Override - public boolean hasGroups() - { - return groups!=null; - } - String newick=null; - @Override - public String getNewick() - { - return newick; - } - @Override - public boolean hasTree() - { - return newick!=null && newick.length()>0; - } - boolean abs; - double thresh; - String treeType=null; - public void makeGroups(float thresh,boolean abs) + public static void validateContactMatrixFile(String fileName) + throws FileFormatException, IOException { - AverageDistanceEngine clusterer = new AverageDistanceEngine(null, null, this); - double height = clusterer.findHeight(clusterer.getTopNode()); - newick = new jalview.io.NewickFile(clusterer.getTopNode(),false,true).print(); - treeType = "UPGMA"; - Console.trace("Newick string\n"+newick); - - List nodegroups; - if (abs ? height > thresh : 0 < thresh && thresh < 1) + FileInputStream infile = null; + try { - float cut = abs ? (float) (thresh / height) : thresh; - Console.debug("Threshold "+cut+" for height="+height); - - nodegroups = clusterer.groupNodes(cut); - } - else + infile = new FileInputStream(new File(fileName)); + } catch (Throwable t) { - nodegroups = new ArrayList(); - nodegroups.add(clusterer.getTopNode()); + new IOException("Couldn't open " + fileName, t); } - this.abs=abs; - this.thresh=thresh; - groups = new ArrayList<>(); - for (BinaryNode root:nodegroups) + JSONObject paeDict = null; + try { - BitSet gpset=new BitSet(); - for (BinaryNode leaf:clusterer.findLeaves(root)) - { - gpset.set((Integer)leaf.element()); - } - groups.add(gpset); - } - } - @Override - public void updateGroups(List colGroups) - { - if (colGroups!=null) + paeDict = EBIAlfaFold.parseJSONtoPAEContactMatrix(infile); + } catch (Throwable t) { - groups=colGroups; - } - } - @Override - public BitSet getGroupsFor(int column) - { - for (BitSet gp:groups) { - if (gp.get(column)) - { - return gp; - } + new FileFormatException("Couldn't parse " + fileName + + " as a JSON dict or array containing a dict"); } - return ContactMatrixI.super.getGroupsFor(column); - } - HashMap colorMap = new HashMap<>(); - @Override - public Color getColourForGroup(BitSet bs) - { - if (bs==null) { - return Color.white; - } - Color groupCol=colorMap.get(bs); - if (groupCol==null) + PAEContactMatrix matrix = new PAEContactMatrix( + new SequenceDummy("Predicted"), (Map) paeDict); + if (matrix.getWidth() <= 0) { - return Color.white; + throw new FileFormatException( + "No data in PAE matrix read from '" + fileName + "'"); } - return groupCol; - } - @Override - public void setColorForGroup(BitSet bs,Color color) - { - colorMap.put(bs,color); - } - public void restoreGroups(List newgroups, String treeMethod, - String tree, double thresh2) - { - treeType=treeMethod; - groups = newgroups; - thresh=thresh2; - newick =tree; - - } - @Override - public boolean hasCutHeight() { - return groups!=null && thresh!=0; } @Override - public double getCutHeight() + protected PAEContactMatrix newMappableContactMatrix(SequenceI newRefSeq, + MapList newFromMapList) { - return thresh; + PAEContactMatrix pae = new PAEContactMatrix(newRefSeq, newFromMapList, + elements, new GroupSet(grps)); + return pae; } - @Override - public String getTreeMethod() - { - return treeType; - } - - public static void validateContactMatrixFile(String fileName) throws FileFormatException,IOException - { - FileInputStream infile=null; - try { - infile = new FileInputStream(new File(fileName)); - } catch (Throwable t) - { - new IOException("Couldn't open "+fileName,t); - } - - - JSONObject paeDict=null; - try { - paeDict = EBIAlfaFold.parseJSONtoPAEContactMatrix(infile); - } catch (Throwable t) - { - new FileFormatException("Couldn't parse "+fileName+" as a JSON dict or array containing a dict"); - } - - PAEContactMatrix matrix = new PAEContactMatrix(new SequenceDummy("Predicted"), (Map)paeDict); - if (matrix.getWidth()<=0) - { - throw new FileFormatException("No data in PAE matrix read from '"+fileName+"'"); - } - } }