X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=datamodel%2Fcompbio%2Fdata%2Fsequence%2FScore.java;h=8a110eea95f59e43f2732ffe6da58b44298a5f7b;hb=8033a51860de2200a54e64add0809d6780f5b092;hp=98ba06a5947da4fe3359bbc0b5b6048612ef5f8e;hpb=b413eee53fa3cc22a6bd4e03c9ac64bf26b7c834;p=jabaws.git

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