From: jprocter Date: Fri, 7 Dec 2012 15:51:28 +0000 (+0000) Subject: use new secstructure process algorithm X-Git-Tag: Jalview_2_9~221^2^2~8^2~25 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=63d6bdbbe0626fa30497577faf6b3edc9d48abc6;p=jalview.git use new secstructure process algorithm --- diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java index ea13922..02446c4 100755 --- a/src/jalview/datamodel/AlignmentAnnotation.java +++ b/src/jalview/datamodel/AlignmentAnnotation.java @@ -18,6 +18,8 @@ package jalview.datamodel; import jalview.analysis.Rna; +import jalview.analysis.SecStrConsensus.SimpleBP; + import jalview.analysis.WUSSParseException; import java.util.ArrayList; @@ -55,6 +57,7 @@ public class AlignmentAnnotation + public ArrayList bps=null; /** * RNA secondary structure contact positions */ @@ -73,13 +76,15 @@ public class AlignmentAnnotation */ private void _updateRnaSecStr(CharSequence RNAannot) { - try - { - _rnasecstr = Rna.GetBasePairs(RNAannot); - invalidrnastruc = -1; - } catch (WUSSParseException px) + try { + _rnasecstr = Rna.GetBasePairs(RNAannot); + bps = Rna.GetModeleBP(RNAannot); + invalidrnastruc=-1; + } + catch (WUSSParseException px) { - invalidrnastruc = px.getProblemPos(); + // DEBUG System.out.println(px); + invalidrnastruc=px.getProblemPos(); } if (invalidrnastruc > -1) {