X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FAAFrequency.java;h=0e055e450a3ae6983946062d4e28bf56c39ab551;hb=679e63aab1a22d128bf429a07514eb15f8b288e1;hp=e682e2ca2091f5e82a41f70737953503c042cbba;hpb=41c34ccf7054239554932deca6f64042231977b5;p=jalview.git diff --git a/src/jalview/analysis/AAFrequency.java b/src/jalview/analysis/AAFrequency.java index e682e2c..0e055e4 100755 --- a/src/jalview/analysis/AAFrequency.java +++ b/src/jalview/analysis/AAFrequency.java @@ -20,6 +20,10 @@ */ package jalview.analysis; +import java.util.Arrays; +import java.util.Hashtable; +import java.util.List; + import jalview.datamodel.AlignedCodonFrame; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; @@ -37,10 +41,6 @@ import jalview.util.Format; import jalview.util.MappingUtils; import jalview.util.QuickSort; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.List; - /** * Takes in a vector or array of sequences and column start and column end and * returns a new Hashtable[] of size maxSeqLength, if Hashtable not supplied. @@ -67,8 +67,8 @@ public class AAFrequency } } - public static final ProfilesI calculate(List list, - int start, int end) + public static final ProfilesI calculate(List list, int start, + int end) { return calculate(list, start, end, false); } @@ -303,7 +303,6 @@ public class AAFrequency public static void completeGapAnnot(AlignmentAnnotation consensus, ProfilesI profiles, int startCol, int endCol, long nseq) { - // long now = System.currentTimeMillis(); if (consensus == null || consensus.annotations == null || consensus.annotations.length < endCol) { @@ -331,12 +330,11 @@ public class AAFrequency final int gapped = profile.getGapped(); - String description = "" + gapped; + String description = String.valueOf(gapped); - consensus.annotations[i] = new Annotation(gapped); + consensus.annotations[i] = new Annotation("", description, '0', + gapped); } - // long elapsed = System.currentTimeMillis() - now; - // System.out.println(-elapsed); } /** @@ -408,8 +406,7 @@ public class AAFrequency * calculations * @return */ - public static int[] extractProfile(ProfileI profile, - boolean ignoreGaps) + public static int[] extractProfile(ProfileI profile, boolean ignoreGaps) { int[] rtnval = new int[64]; ResidueCount counts = profile.getCounts();