Changeset 70 for collected/trunk/java-dsu/src/com/bitstructures/DSUExample2.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/DSUExample2.java (modified) (4 diffs)

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");
         }
 }