Changeset 70 for collected/trunk

Timestamp:

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

Author:

simon

Message:

Some refactoring. Added The Odyssey as test data.

Location:

collected/trunk/java-dsu

Files:

• dyssy08a.txt (added)
• src/com/bitstructures/DSU.java (modified) (1 diff)
• src/com/bitstructures/DSUExample1.java (modified) (1 diff)
• src/com/bitstructures/DSUExample2.java (modified) (4 diffs)
• src/com/bitstructures/SortKey.java (moved) (moved from collected/trunk/java-dsu/src/com/bitstructures/ComparableExtractor.java) (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

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

@@ -9 +9 @@
         public static void main(String[] args) {
                 List<String> a = Arrays.asList("This is a test string from Andrew".split("\\s"));
-                DSU.sort(a, new ComparableExtractor<String,String>() {
-                        public String extract(String s) {
+                DSU.sort(a, new SortKey<String,String>() {
+                        public String getValue(String s) {
                                 return s.toLowerCase();
                         }

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

@@ -22 +22 @@
                 String line = r.readLine();
                 while(line != null) {
-                        String[] wordsThisLine = line.split("\\s");
+                        String[] wordsThisLine = line.split("\\s+");
                         for (String word : wordsThisLine) {
-                                words.add(word);
+                                if (!word.trim().equals("")) {
+                                        words.add(word);
+                                }
                         }
                         line = r.readLine();
@@ -35 +37 @@
                 List<String> a = readWords(filename);
                 long t1 = System.currentTimeMillis();
-                DSU.sort(a, new ComparableExtractor<String,String>() {
-                        public String extract(String s) {
+                DSU.sort(a, new SortKey<String,String>() {
+                        public String getValue(String s) {
                                 c.increment();
                                 return s.toLowerCase();
@@ -45 +47 @@
 //                      System.out.println(s);
 //              }
-System.out.println("DSU");
-System.out.println("called " + c.i + " times");
-System.out.println((t2 - t1) + " millis");
+                System.out.println("DSU");
+                System.out.println("called " + c.i + " times");
+                System.out.println((t2 - t1) + " millis");
         }
 
@@ -64 +66 @@
 //                      System.out.println(s);
 //              }
-System.out.println("Collections.sort");
-System.out.println("called " + c.i + " times");
-System.out.println((t2 - t1) + " millis");
+                System.out.println("Collections.sort");
+                System.out.println("called " + c.i + " times");
+                System.out.println((t2 - t1) + " millis");
         }
 
         public static void main(String[] args) throws IOException {
-                dsu("10940.txt");
-                withComparator("10940.txt");
+                dsu("dyssy08a.txt");
+                withComparator("dyssy08a.txt");
         }
 }

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

@@ -3 +3 @@
 import java.lang.Comparable;
 
-public interface ComparableExtractor<T,V extends Comparable<V>> {
-        public V extract(T obj);
+public interface SortKey<T,C extends Comparable<C>> {
+        public C getValue(T obj);
 }