X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FMappedFeatures.java;h=57c8c375b4d65c651d37379bd03c84935c67bc9d;hp=f7263d2a3dc760fee73a42320ea07e81826f6a48;hb=c6018dc0dc12720e13b75850a5303279ac7094b7;hpb=eca14f3239efc539413d3c4bc334de80710dd86c diff --git a/src/jalview/datamodel/MappedFeatures.java b/src/jalview/datamodel/MappedFeatures.java index f7263d2..57c8c37 100644 --- a/src/jalview/datamodel/MappedFeatures.java +++ b/src/jalview/datamodel/MappedFeatures.java @@ -1,57 +1,83 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview 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 3 + * of the License, or (at your option) any later version. + * + * Jalview 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 Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.datamodel; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import jalview.io.gff.Gff3Helper; import jalview.schemes.ResidueProperties; +import jalview.util.MapList; import jalview.util.MappingUtils; import jalview.util.StringUtils; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * A data bean to hold a list of mapped sequence features (e.g. CDS features - * mapped from protein), and the mapping between the sequences + * mapped from protein), and the mapping between the sequences. It also provides + * a method to derive peptide variants from codon variants. * * @author gmcarstairs */ public class MappedFeatures { + /* + * VEP CSQ:HGVSp (if present) is a short-cut to the protein variant consequence + */ private static final String HGV_SP = "HGVSp"; private static final String CSQ = "CSQ"; /* - * the mapping from one sequence to another + * the sequence the mapped features are on */ - public final Mapping mapping; + private final SequenceI featureSequence; - /** - * the sequence mapped to + /* + * the mapping between sequences; + * NB this could be in either sense (from or to featureSequence) */ - public final SequenceI fromSeq; + private final Mapping mapping; /* - * the residue position in the sequence mapped from + * features on featureSequence that overlap the mapped positions */ - public final int fromPosition; + public final List features; /* - * the residue at fromPosition + * the residue position in the sequence mapped to */ - public final char fromResidue; + private final int toPosition; /* - * features on the sequence mapped to that overlap the mapped positions + * the residue at toPosition */ - public final List features; + private final char toResidue; /* - * if the mapping is 1:3 (peptide to CDS), this holds the + * if the mapping is 3:1 or 1:3 (peptide to CDS), this holds the * mapped positions i.e. codon base positions in CDS; to * support calculation of peptide variants from alleles */ - public final int[] codonPos; + private final int[] codonPos; private final char[] baseCodon; @@ -59,36 +85,49 @@ public class MappedFeatures * Constructor * * @param theMapping + * sequence mapping (which may be either to, or from, the sequence + * holding the linked features) + * @param featureSeq + * the sequence hosting the virtual features * @param pos + * the residue position in the sequence mapped to * @param res + * the residue character at position pos * @param theFeatures + * list of mapped features found in the 'featureSeq' sequence at the + * mapped position(s) */ - public MappedFeatures(Mapping theMapping, SequenceI from, int pos, - char res, - List theFeatures) + public MappedFeatures(Mapping theMapping, SequenceI featureSeq, int pos, + char res, List theFeatures) { mapping = theMapping; - fromSeq = from; - fromPosition = pos; - fromResidue = res; + featureSequence = featureSeq; + toPosition = pos; + toResidue = res; features = theFeatures; /* * determine codon positions and canonical codon * for a peptide-to-CDS mapping */ - codonPos = MappingUtils.flattenRanges( - mapping.getMap().locateInFrom(fromPosition, fromPosition)); - if (codonPos.length == 3) + int[] codonIntervals = mapping.getMap().locateInFrom(toPosition, toPosition); + int[] codonPositions = codonIntervals == null ? null + : MappingUtils.flattenRanges(codonIntervals); + if (codonPositions != null && codonPositions.length == 3) { + codonPos = codonPositions; baseCodon = new char[3]; - int cdsStart = fromSeq.getStart(); - baseCodon[0] = fromSeq.getCharAt(codonPos[0] - cdsStart); - baseCodon[1] = fromSeq.getCharAt(codonPos[1] - cdsStart); - baseCodon[2] = fromSeq.getCharAt(codonPos[2] - cdsStart); + int cdsStart = featureSequence.getStart(); + baseCodon[0] = Character + .toUpperCase(featureSequence.getCharAt(codonPos[0] - cdsStart)); + baseCodon[1] = Character + .toUpperCase(featureSequence.getCharAt(codonPos[1] - cdsStart)); + baseCodon[2] = Character + .toUpperCase(featureSequence.getCharAt(codonPos[2] - cdsStart)); } else { + codonPos = null; baseCodon = null; } } @@ -96,8 +135,14 @@ public class MappedFeatures /** * Computes and returns comma-delimited HGVS notation peptide variants derived * from codon allele variants. If no variants are found, answers an empty - * string. + * string. The peptide variant is either simply read from the "CSQ:HGVSp" + * attribute if present, else computed based on the "alleles" attribute if + * present. If neither attribute is found, no variant (empty string) is + * returned. * + * @param sf + * a sequence feature (which must be one of those held in this + * object) * @return */ public String findProteinVariants(SequenceFeature sf) @@ -107,26 +152,26 @@ public class MappedFeatures return ""; } - StringBuilder vars = new StringBuilder(); - /* * VCF data may already contain the protein consequence */ String hgvsp = sf.getValueAsString(CSQ, HGV_SP); if (hgvsp != null) { - int colonPos = hgvsp.indexOf(':'); + int colonPos = hgvsp.lastIndexOf(':'); if (colonPos >= 0) { String var = hgvsp.substring(colonPos + 1); - return var; + if (var.contains("p.")) // sanity check + { + return var; + } } } /* * otherwise, compute codon and peptide variant */ - // todo avoid duplication of code in AlignmentUtils.buildDnaVariantsMap int cdsPos = sf.getBegin(); if (cdsPos != sf.getEnd()) { @@ -147,7 +192,7 @@ public class MappedFeatures } String from3 = StringUtils.toSentenceCase( - ResidueProperties.aa2Triplet.get(String.valueOf(fromResidue))); + ResidueProperties.aa2Triplet.get(String.valueOf(toResidue))); /* * make a peptide variant for each SNP allele @@ -155,6 +200,8 @@ public class MappedFeatures */ Set variantPeptides = new HashSet<>(); String[] alleles = alls.toUpperCase().split(","); + StringBuilder vars = new StringBuilder(); + for (String allele : alleles) { allele = allele.trim().toUpperCase(); @@ -168,30 +215,101 @@ public class MappedFeatures variantCodon[2] = baseCodon[2]; /* - * poke variant base into canonical codon + * poke variant base into canonical codon; + * ignore first 'allele' (canonical base) */ - int i = cdsPos == codonPos[0] ? 0 : (cdsPos == codonPos[1] ? 1 : 2); + final int i = cdsPos == codonPos[0] ? 0 + : (cdsPos == codonPos[1] ? 1 : 2); variantCodon[i] = allele.toUpperCase().charAt(0); + if (variantCodon[i] == baseCodon[i]) + { + continue; + } String codon = new String(variantCodon); String peptide = ResidueProperties.codonTranslate(codon); - if (fromResidue != peptide.charAt(0)) + boolean synonymous = toResidue == peptide.charAt(0); + StringBuilder var = new StringBuilder(); + if (synonymous) + { + /* + * synonymous variant notation e.g. c.1062C>A(p.=) + */ + var.append("c.").append(String.valueOf(cdsPos)) + .append(String.valueOf(baseCodon[i])).append(">") + .append(String.valueOf(variantCodon[i])) + .append("(p.=)"); + } + else { - String to3 = ResidueProperties.STOP.equals(peptide) ? "STOP" + /* + * missense variant notation e.g. p.Arg355Met + */ + String to3 = ResidueProperties.STOP.equals(peptide) ? "Ter" : StringUtils.toSentenceCase( ResidueProperties.aa2Triplet.get(peptide)); - String var = "p." + from3 + fromPosition + to3; - if (!variantPeptides.contains(peptide)) // duplicate consequence + var.append("p.").append(from3).append(String.valueOf(toPosition)) + .append(to3); + } + if (!variantPeptides.contains(peptide)) // duplicate consequence + { + variantPeptides.add(peptide); + if (vars.length() > 0) { - variantPeptides.add(peptide); - if (vars.length() > 0) - { - vars.append(","); - } - vars.append(var); + vars.append(","); } + vars.append(var); } } return vars.toString(); } + + /** + * Answers the name of the linked sequence holding any mapped features + * + * @return + */ + public String getLinkedSequenceName() + { + return featureSequence == null ? null : featureSequence.getName(); + } + + /** + * Answers the mapped ranges (as one or more [start, end] positions) which + * correspond to the given [begin, end] range of the linked sequence. + * + *
+   * Example: MappedFeatures with CDS features mapped to peptide 
+   * CDS/200-220 gtc aac TGa acGt att AAC tta
+   * mapped to PEP/6-7 WN by mapping [206, 207, 210, 210, 215, 217] to [6, 7]
+   * getMappedPositions(206, 206) should return [6, 6]
+   * getMappedPositions(200, 214) should return [6, 6]
+   * getMappedPositions(210, 215) should return [6, 7]
+   * 
+ * + * @param begin + * @param end + * @return + */ + public int[] getMappedPositions(int begin, int end) + { + MapList map = mapping.getMap(); + return mapping.to == featureSequence ? map.getOverlapsInFrom(begin, end) + : map.getOverlapsInTo(begin, end); + } + + /** + * Answers true if the linked features are on coding sequence, false if on + * peptide + * + * @return + */ + public boolean isFromCds() + { + if (mapping.getMap().getFromRatio() == 3) + { + return mapping.to != featureSequence; + } + return mapping.to == featureSequence; + } }