Changeset 2313

Timestamp:

2001-04-14T12:37:34+12:00 (23 years ago)

Author:

daven

Message:

added method for sorting the term frequency
Map so that we display them in descending order,
most frequent first. I suppose this could be a preference

• but someone else can do that :-)

Location:

trunk/java-client/org/nzdl/gsdl/service

Files:

• NzdlResponse.java (modified) (3 diffs)
• NzdlResultSet.java (modified) (4 diffs)

trunk/java-client/org/nzdl/gsdl/service/NzdlResponse.java

@@ -22 +22 @@
 
 import java.util.HashMap;
+import java.util.TreeMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -49 +50 @@
   private corbaFilterResponse m_response = null;
   private NzdlResultSet m_resultSet = null;
-  private Map m_frequencies = null;
+  private TreeMap m_frequencies = null;
   private List m_queryTerms = null;
 
@@ -173 +174 @@
   private void parseTermsInfo( corbaTermInfo [] _termsInfo ) {
     String term = null;
-    m_frequencies = new HashMap();
+    m_frequencies = new TreeMap();
     m_queryTerms = new ArrayList();
     for (int i=0; i<_termsInfo.length; i++) {

trunk/java-client/org/nzdl/gsdl/service/NzdlResultSet.java

@@ -25 +25 @@
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Map.*;
 import java.util.HashMap;
+import java.util.TreeMap;
+import java.util.SortedMap;
+import java.util.TreeSet;
 import java.util.HashSet;
 import java.util.ListIterator;
 import java.util.Iterator;
+import java.util.Comparator;
 
 /**
@@ -48 +53 @@
 
   /* The key is the query term, the value its frequency */
-  private Map m_frequencies = null;
+  private TreeMap m_frequencies = null;
 
   /*
@@ -67 +72 @@
 
   public String getTermFrequencyString() {
-    StringBuffer buf = new StringBuffer();
-    Iterator iter = m_frequencies.keySet().iterator();
-    while(iter.hasNext()) {
-      Object next = iter.next();
-      buf.append(' ').append(next).append(':').
-    append(m_frequencies.get(next));
-    }
-    return buf.toString();
-  }
+      return constructTermFrequencyString(null);
+  }
+
+    /* 
+     * display term frequency results in descending frequency order 
+     */
+
+    public String getOrderedTermFrequencyString() {
+     class DescendingOrder implements Comparator {
+        public int compare(Object o1, Object o2) {
+        return -((Comparable)o1).compareTo(o2);
+        }
+    }
+    return constructTermFrequencyString(new DescendingOrder());
+    }
+
+
+    private String constructTermFrequencyString(Comparator comparator) {
+
+    TreeMap freqOrder = new TreeMap(comparator);
+    Iterator iter = m_frequencies.entrySet().iterator();
+    while (iter.hasNext()) {
+        Map.Entry mapEntry = (Map.Entry) iter.next();
+        freqOrder.put( mapEntry.getValue(), mapEntry.getKey());
+    }
+
+    StringBuffer buf = new StringBuffer();
+    iter = freqOrder.keySet().iterator();
+    while(iter.hasNext()) {
+        Object next = iter.next();
+        System.err.println("" + next);
+        buf.append(freqOrder.get(next)).append(':').append(next).append(' ').append(' ');
+    }
+    return buf.toString();
+    }
 
   /**
@@ -121 +152 @@
    * @param freqs a map of the term frequencies. The map key is the query term.
    */
-  public void setTermFrequencies( Map _freqs ) {
+  public void setTermFrequencies( TreeMap _freqs ) {
     m_frequencies = _freqs;
   }