Merge pull request #40 from ccasbre27/master

Function to get the expressions in a collection (ordered) - Android

Author: lightfrenzy

Emotion/Android/ClientLibrary/lib/src/main/java/com/microsoft/projectoxford/emotion/contract/Order.java

@@ -0,0 +1,3 @@
+public enum Order {
+	ASCENDING,DESCENDING
+}

Emotion/Android/ClientLibrary/lib/src/main/java/com/microsoft/projectoxford/emotion/contract/Scores.java

@@ -32,6 +32,14 @@
 //
 package com.microsoft.projectoxford.emotion.contract;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 public class Scores {
     public double anger;
     public double contempt;
@@ -41,4 +49,54 @@ public class Scores {
     public double neutral;
     public double sadness;
     public double surprise;
+    
+    public List<Map.Entry<String, Double>> ToRankedList(Order order)
+    {
+		
+         // create a Map to store each entry
+	 Map<String, Double> collection = new HashMap<String, Double>() ;
+		
+	 // add each entry with its own key and value
+	 collection.put("ANGER",anger);
+	 collection.put("CONTEMPT",contempt);
+	 collection.put("DISGUST",disgust);
+	 collection.put("FEAR",fear);
+	 collection.put("HAPPINESS",happiness);
+	 collection.put("NEUTRAL",neutral);
+	 collection.put("SADNESS",sadness);
+	 collection.put("SURPRISE",surprise);
+
+	 // create a list with the entries
+	 List<Map.Entry<String, Double>> list = new ArrayList<Map.Entry<String, Double>>(collection.entrySet());
+		
+	 // we are going to create a comparator according to the value of the enum order
+	 switch (order) 
+	 {
+	      case ASCENDING:
+	           Collections.sort(list, new Comparator<Map.Entry<String, Double>>() {
+		        @Override
+			public int compare(Entry<String, Double> first, Entry<String, Double> second) {
+		             // we should compare the value of the first entry and the value of the second entry
+			     return first.getValue().compareTo(second.getValue());
+			}
+		     });
+		     break;
+			
+		case DESCENDING:
+		     // for ordering descending we should create a reverse order comparator 
+		     Collections.sort(list, Collections.reverseOrder(new Comparator<Map.Entry<String, Double>>() {
+		          @Override
+			  public int compare(Entry<String, Double> first, Entry<String, Double> second) {
+			       return first.getValue().compareTo(second.getValue());
+			  }
+		     })); 
+		     break;
+				
+		default:
+		     break;
+	}
+
+        return list;
+        
+    }
 }

Emotion/Android/README.md

@@ -31,8 +31,22 @@ To do add the client library dependency from Android Studio:
 6. Type "com.microsoft.projectoxford" and hit the search icon from "Choose Library Dependency" dialog
 7. Pick the Project Oxford client library that you intend to use.
 8. Click "OK" to add the new dependency
+ 
+Order expressions
+============
 
+You can call the function ToRankedList from the Scores class, for example:
 
+ASCENDING
+```
+List<Map.Entry<String, Double>> collection = scores.ToRankedList(Order.ASCENDING);
+```
+
+DESCENDING
+```
+List<Map.Entry<String, Double>> collection = scores.ToRankedList(Order.DESCENDING);
+		
+```
 
 The sample
 ==========
@@ -79,6 +93,8 @@ Microsoft will receive the images you upload and may use them to improve Emotion
 API and related services. By submitting an image, you confirm you have consent
 from everyone in it.
 
+If you want to know what is the name of the expression with more value then you might call getExpressionName() from the Score class
+
 Contributing
 ============
 We welcome contributions and are always looking for new SDKs, input, and

Emotion/Windows/README.md

@@ -8,6 +8,15 @@ The easiest way to use this client library is to get microsoft.projectoxford.emo
 
 Please go to [Emotion API Package in nuget](https://www.nuget.org/packages/Microsoft.ProjectOxford.Emotion/) for more details.
 
+Order expressions
+============
+
+You can call the function ToRankedList from the Scores class, for example:
+
+```
+IEnumerable<KeyValuePair<string, float>> collection = myScores.ToRankedList();
+```
+
 The sample
 ==========