Remove Annotated and MuptiAnnotated Sequence use Score instead

[jabaws.git] / datamodel / compbio / data / sequence / Score.java

diff --git a/datamodel/compbio/data/sequence/Score.java b/datamodel/compbio/data/sequence/Score.java
index 98ba06a..8a110ee 100644 (file)
--- a/datamodel/compbio/data/sequence/Score.java
+++ b/datamodel/compbio/data/sequence/Score.java
@@ -34,7 +34,7 @@ public class Score {
                NUMBER_FORMAT.setMaximumFractionDigits(3);\r
        }\r
 \r
-       private ConservationMethod method;\r
+       private Enum<?> method;\r
 \r
        private List<Float> scores;\r
 \r
@@ -52,17 +52,29 @@ public class Score {
         *            the actual conservation values for each column of the\r
         *            alignment\r
         */\r
-       public Score(ConservationMethod method, List<Float> scores) {\r
+       public Score(Enum<?> method, List<Float> scores) {\r
                this.method = method;\r
                this.scores = new ArrayList<Float>(scores);\r
        }\r
 \r
+       public Score(Enum<?> method, float[] scores) {\r
+               this.method = method;\r
+               this.scores = toList(scores);\r
+       }\r
+\r
+       private List<Float> toList(float[] values) {\r
+               List<Float> vlist = new ArrayList<Float>();\r
+               for (float v : values) {\r
+                       vlist.add(new Float(v));\r
+               }\r
+               return vlist;\r
+       }\r
        /**\r
         * Returns the ConservationMethod\r
         * \r
         * @return the ConservationMethod\r
         */\r
-       public ConservationMethod getMethod() {\r
+       public Enum<?> getMethod() {\r
                return method;\r
        }\r
 \r