Merge branch 'develop' into feature-vrTrainingMimeType

Author: mediumTaj

CHANGELOG.md

@@ -1,5 +1,18 @@
 Change Log
 ==========
+## Version 0.11.0
+_2016_10_27_
+* New: Abstracted `Speech to Text` customization methods.
+
+## Version 0.10.0
+_2016_09_23_
+
+* New: Added `similarity search` to the `Visual Recognition` service.
+* Fix: `Touch Widget` improvmements.
+* Fix: Disabled 3rd Party plugin warnings.
+* Fix: Removed `Conversation` Message overload method that takes only input and conversationID.
+* Fix: Rewrote `Conversation` example script to show how to create MessageRequest object.
+
 ## Version 0.9.0
 _2016-08-26_
 

Examples/ServiceExamples/Scripts/ExampleConversation.cs

@@ -16,48 +16,66 @@
 */
 
 using UnityEngine;
-using System.Collections;
 using IBM.Watson.DeveloperCloud.Services.Conversation.v1;
 using IBM.Watson.DeveloperCloud.Utilities;
 using IBM.Watson.DeveloperCloud.Logging;
+using System;
 
 public class ExampleConversation : MonoBehaviour
 {
 	private Conversation m_Conversation = new Conversation();
     private string m_WorkspaceID;
-	private string m_Input = "Can you unlock the door?";
+	private bool m_UseAlternateIntents = true;
+	private string[] questionArray = { "can you turn up the AC", "can you turn on the wipers", "can you turn off the wipers", "can you turn down the ac", "can you unlock the door"};
 
 	void Start () {
         LogSystem.InstallDefaultReactors();
         m_WorkspaceID = Config.Instance.GetVariableValue("ConversationV1_ID");
-        Debug.Log("User: " + m_Input);
 
-        //  Message with input only
-        //m_Conversation.Message(OnMessage, m_WorkspaceID, m_Input);
+        Debug.Log("**********User: Hello!");
+		MessageWithOnlyInput("Hello!");
+    }
 
-        //  Message by creating message request
-        //MessageRequest messageRequest = new MessageRequest();
-        //messageRequest.inputText = m_Input;
-        //m_Conversation.Message(OnMessage, m_WorkspaceID, messageRequest);
+	private void MessageWithOnlyInput(string input)
+	{
+		if (string.IsNullOrEmpty(input))
+			throw new ArgumentNullException("input");
+
+		m_Conversation.Message(OnMessageWithOnlyInput, m_WorkspaceID, input);
+	}
+	
+	
+	private void OnMessageWithOnlyInput(MessageResponse resp, string customData)
+	{
+		if (resp != null)
+		{
+			foreach (Intent mi in resp.intents)
+				Debug.Log("intent: " + mi.intent + ", confidence: " + mi.confidence);
+
+			if (resp.output != null && resp.output.text.Length > 0)
+				foreach (string txt in resp.output.text)
+					Debug.Log("output: " + txt);
+
+			string questionStr = questionArray[UnityEngine.Random.Range(0, questionArray.Length - 1)];
+			Debug.Log(string.Format("**********User: {0}", questionStr));
+
+			MessageRequest messageRequest = new MessageRequest();
+			messageRequest.InputText = questionStr;
+			messageRequest.alternate_intents = m_UseAlternateIntents;
+			messageRequest.ContextData = resp.context;
 
-        //  Message by passing input, alternate intents and conversationID
-        m_Conversation.Message(OnMessage, m_WorkspaceID, m_Input, false, null);
+			MessageWithFullMessageRequest(messageRequest);
+		}
+		else
+		{
+			Debug.Log("Failed to invoke Message();");
+		}
 	}
 
-	void OnMessage (MessageResponse resp, string customData)
+	private void MessageWithFullMessageRequest(MessageRequest messageRequest)
 	{
-        if(resp != null)
-        {
-    		foreach(Intent mi in resp.intents)
-    			Debug.Log("intent: " + mi.intent + ", confidence: " + mi.confidence);
-    		
-            if(resp.output != null && resp.output.text.Length > 0)
-                foreach(string txt in resp.output.text)
-    		        Debug.Log("output: " + txt);
-        }
-        else
-        {
-            Debug.Log("Failed to invoke Message();");
-        }
+		if (messageRequest == null)
+			throw new ArgumentNullException("messageRequest");
+		m_Conversation.Message(OnMessageWithOnlyInput, m_WorkspaceID, messageRequest);
 	}
 }