Microsoft Cognitive Services SDK Release - June 2016

Author: yungshinlintw

Emotion/Android/.gitignore

@@ -1,7 +1,18 @@
-.gradle
-local.properties
-.idea/
-.idea/libraries
-.DS_Store
+# Generated files
+bin/
+gen/
+out/
 build/
+
+# OS specific files
+.DS_Store
+
+# IntelliJ / Android studio configuration files
+.idea/
 *.iml
+
+# Gradle generated files
+.gradle/
+
+# Local config (e.g. sdk path)
+local.properties

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

@@ -49,13 +49,13 @@ 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);
@@ -68,9 +68,9 @@ public List<Map.Entry<String, Double>> ToRankedList(Order order)
 
 	 // 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) 
+	 switch (order)
 	 {
 	      case ASCENDING:
 	           Collections.sort(list, new Comparator<Map.Entry<String, Double>>() {
@@ -81,22 +81,22 @@ public int compare(Entry<String, Double> first, Entry<String, Double> second) {
 			}
 		     });
 		     break;
-			
+
 		case DESCENDING:
-		     // for ordering descending we should create a reverse order comparator 
+		     // 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

@@ -2,7 +2,7 @@ The client library
 ==================
 
 The Emotion API client library is a thin Java client wrapper for Microsoft Cognitive Services (formerly Project Oxford)
-Emotion REST APIs.  
+Emotion REST APIs.
 
 The easiest way to consume the client library is to add com.microsoft.projectoxford.emotion package from Maven Central Repository.
 
@@ -31,7 +31,7 @@ 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
 ============
 
@@ -45,7 +45,7 @@ List<Map.Entry<String, Double>> collection = scores.ToRankedList(Order.ASCENDING
 DESCENDING
 ```
 List<Map.Entry<String, Double>> collection = scores.ToRankedList(Order.DESCENDING);
-		
+
 ```
 
 The sample

Emotion/Android/Sample/.gitignore

@@ -307,7 +307,9 @@ protected void onPostExecute(List<RecognizeResult> result) {
                     mEditText.append("No emotion detected :(");
                 } else {
                     Integer count = 0;
-                    Canvas faceCanvas = new Canvas(mBitmap);
+                    // Covert bitmap to a mutable bitmap by copying it
+                    Bitmap bitmapCopy = mBitmap.copy(Bitmap.Config.ARGB_8888, true);
+                    Canvas faceCanvas = new Canvas(bitmapCopy);
                     faceCanvas.drawBitmap(mBitmap, 0, 0, null);
                     Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
                     paint.setStyle(Paint.Style.STROKE);

Emotion/Android/Sample/app/src/main/java/com/microsoft/projectoxford/emotionsample/RecognizeActivity.java

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Emotion/Android/Sample/build.gradle

@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Fri Jun 03 14:18:22 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

Emotion/Android/Sample/gradle/wrapper/gradle-wrapper.properties

@@ -75,7 +75,7 @@ public class Scores
         /// 
         /// </summary>
         public float Surprise { get; set; }
-        
+
         /// <summary>
         /// Create a sorted key-value pair of emotions and the corresponding scores, sorted from highest score on down.
         /// To make the ordering stable, the score is the primary key, and the name is the secondary key.

Emotion/Python/Jupyter Notebook/Emotion Analysis Example.ipynb

@@ -46,7 +46,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.ProjectOxford.Common, Version=1.0.250.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.ProjectOxford.Common, Version=1.0.250, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.ProjectOxford.Common.1.0.250\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\Microsoft.ProjectOxford.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>