Alifold results are now parsed and stored in a ScoreManager object

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

diff --git a/datamodel/compbio/data/sequence/Range.java b/datamodel/compbio/data/sequence/Range.java
index c2ccc43..9ade348 100644 (file)
--- a/datamodel/compbio/data/sequence/Range.java
+++ b/datamodel/compbio/data/sequence/Range.java
@@ -40,11 +40,17 @@ public class Range implements Comparable<Range> {
                this.from = Integer.parseInt(twoElementAr[0].trim());\r
                this.to = Integer.parseInt(twoElementAr[1].trim());\r
        }\r
-\r
+       \r
+       // Daniel Check these get methods are ok with Jim\r
+       public int getFrom() { return from; }\r
+       public int getTo() { return to; }\r
+       \r
+       \r
        @Override\r
        public String toString() {\r
                return from + "-" + to;\r
        }\r
+       \r
 \r
        @Override\r
        public int hashCode() {\r
@@ -70,11 +76,24 @@ public class Range implements Comparable<Range> {
                return true;\r
        }\r
 \r
+       // daniel wants to mess with method. this is how it was\r
+//     @Override\r
+//     public int compareTo(Range o) {\r
+//             if (o == null)\r
+//                     return 1;\r
+//             return new Integer(this.from).compareTo(new Integer(o.from));\r
+//     }\r
+       \r
        @Override\r
        public int compareTo(Range o) {\r
                if (o == null)\r
                        return 1;\r
-               return new Integer(this.from).compareTo(new Integer(o.from));\r
+               if (new Integer(this.from).compareTo(new Integer(o.from)) != 0) {\r
+                       return new Integer(this.from).compareTo(new Integer(o.from));\r
+               }\r
+               else {\r
+                       return new Integer(this.to).compareTo(new Integer(o.to));\r
+               }\r
        }\r
 \r
 }\r