Changeset 70 for collected/trunk/java-dsu/src/com/bitstructures/DSU.java

Timestamp:

03/25/08 20:32:12 (10 months ago)

Author:

simon

Message:

Some refactoring. Added The Odyssey as test data.

Files:

• collected/trunk/java-dsu/src/com/bitstructures/DSU.java (modified) (1 diff)

collected/trunk/java-dsu/src/com/bitstructures/DSU.java

@@ -7 +7 @@
 
 public class DSU {
-        private static class DecoratedObject<T,V extends Comparable<V>> {
+        private static class DecoratedObject<T,C extends Comparable<C>> {
                 public T obj;
-                public V comparable;
+                public C comparable;
         }
 
-/*
-        private static Comparator<DecoratedObject> comparator = new Comparator<DecoratedObject>() {
-                public int compare(DecoratedObject o1, DecoratedObject o2) {
-                        return o1.comparable.compareTo(o2.comparable);
-                }
-        };
-*/
-        private static class DecoratedObjectComparator<T,V extends Comparable<V>> implements Comparator<DecoratedObject<T,V>> {
-                public int compare(DecoratedObject<T,V> o1, DecoratedObject<T,V> o2) {
+        private static class DecoratedComparator<T,C extends Comparable<C>>
+                        implements Comparator<DecoratedObject<T,C>> {
+                public int compare(DecoratedObject<T,C> o1, DecoratedObject<T,C> o2) {
                         return o1.comparable.compareTo(o2.comparable);
                 }
         }
 
-        public static <T,V extends Comparable<V>> void sort(List<T> list, ComparableExtractor<T,V> extractor) {
+        public static <T,C extends Comparable<C>> void sort(List<T> list,
+                        SortKey<T,C> key) {
                 // decorate
                 int size = list.size();
-                DecoratedObject<T,V>[] decorated = (DecoratedObject<T,V>[]) new DecoratedObject[size];
+                DecoratedObject<T,C>[] decorated
+                                = (DecoratedObject<T,C>[]) new DecoratedObject[size];
                 for (int i = 0; i < size; i++) {
-                        decorated[i] = new DecoratedObject<T,V>();
+                        decorated[i] = new DecoratedObject<T,C>();
                         decorated[i].obj = list.get(i);
-                        decorated[i].comparable = extractor.extract(list.get(i));
+                        decorated[i].comparable = key.getValue(list.get(i));
                 }
                 // sort
-                DecoratedObjectComparator<T,V> comparator = new DecoratedObjectComparator<T,V>();
+                DecoratedComparator<T,C> comparator = new DecoratedComparator<T,C>();
                 Arrays.sort(decorated, comparator);
                 // undecorate