From d661f9b745799091601cd49af93bf719492d45df Mon Sep 17 00:00:00 2001
From: Pierre Lison <plison@ifi.uio.no>
Date: Tue, 5 Apr 2016 11:13:26 +0200
Subject: [PATCH] preparing for next release

---
 build.gradle                                  | 6 +++---
 src/opendial/DialogueSystem.java              | 2 +-
 src/opendial/gui/GUIFrame.java                | 2 +-
 src/opendial/plugins/MaryTTS.java             | 4 +++-
 test/opendial/domains/TemplateStringTest.java | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1f6bf7d8..6d9421b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ sourceSets {
 		java {
 			srcDirs 'src'
 			exclude 'opendial/plugins/GoogleASR.java'
-			exclude 'opendial/plugins/Nao*'
+	//		exclude 'opendial/plugins/Nao*'
 	    }
 	} 
 	test {
@@ -62,10 +62,10 @@ dependencies {
  //	compile group: 'de.dfki.mary', name: 'voice-cmu-slt-hsmm', version: '5.2-beta2'
     compile group: 'org.apache.commons', name: 'commons-math3', version: '3.2'
     compile group: 'edu.cmu.sphinx', name: 'sphinx4-core', version:'5prealpha-SNAPSHOT'
- //   compile group: 'edu.cmu.sphinx', name: 'sphinx4-data', version:'5prealpha-SNAPSHOT'
+//    compile group: 'edu.cmu.sphinx', name: 'sphinx4-data', version:'5prealpha-SNAPSHOT'
     compile group: 'org.maltparser', name: 'maltparser', version:'1.8.1'
     compile group: 'edu.stanford.nlp', name: 'stanford-corenlp', version:'3.5.2'
-	compile name: 'att-codekit'
+//	compile name: 'qimessaging'
 	compile name: 'exp4j' 
 	testCompile group:'junit', name: 'junit',  version: '4.+'
  }
diff --git a/src/opendial/DialogueSystem.java b/src/opendial/DialogueSystem.java
index 2710b3b5..e5db0f3e 100644
--- a/src/opendial/DialogueSystem.java
+++ b/src/opendial/DialogueSystem.java
@@ -74,7 +74,7 @@
  *
  * @author Pierre Lison (plison@ifi.uio.no)
  *
- */
+ */ 
 public class DialogueSystem {
 
 	// logger
diff --git a/src/opendial/gui/GUIFrame.java b/src/opendial/gui/GUIFrame.java
index d4d6d49d..2d2c364e 100644
--- a/src/opendial/gui/GUIFrame.java
+++ b/src/opendial/gui/GUIFrame.java
@@ -540,7 +540,7 @@ public void saveDomain(File fileToWrite) {
 	 */
 	public void resetInteraction() {
 		chatTab.reset();
-		addComment("Reinitialiting interaction...");
+		addComment("Reinitialising interaction...");
 		system.changeDomain(system.getDomain());
 		refresh();
 		stateMonitorTab.reset(system.getState());
diff --git a/src/opendial/plugins/MaryTTS.java b/src/opendial/plugins/MaryTTS.java
index 183e2321..38d2dc63 100644
--- a/src/opendial/plugins/MaryTTS.java
+++ b/src/opendial/plugins/MaryTTS.java
@@ -70,12 +70,14 @@ public MaryTTS(DialogueSystem system) {
 			tts = new LocalMaryInterface();
 		}
 		catch (MaryConfigurationException e) {
+			e.printStackTrace();
 			throw new RuntimeException("Cannot start Mary TTS: " + e);
+			
 		}
 		this.system = system;
 		system.enableSpeech(true);
 	}
-
+ 
 	/**
 	 * Starts the TTS engine.
 	 */
diff --git a/test/opendial/domains/TemplateStringTest.java b/test/opendial/domains/TemplateStringTest.java
index e1203d8f..7c77e75f 100644
--- a/test/opendial/domains/TemplateStringTest.java
+++ b/test/opendial/domains/TemplateStringTest.java
@@ -341,7 +341,7 @@ public void functionsTest() {
 	public void realFunctionTest() {
 		Function<List<String>, Value> add = l -> ValueFactory
 				.create(l.stream().mapToDouble(v -> Double.parseDouble(v)).sum());
-		Settings.addFunction("add", add, 1);
+		Settings.addFunction("add", add);
 
 		Function<List<String>, Value> substract = l -> {
 			double result = Double.parseDouble(l.get(0));
@@ -350,7 +350,7 @@ public void realFunctionTest() {
 			}
 			return ValueFactory.create(result);
 		};
-		Settings.addFunction("substract", substract, 1);
+		Settings.addFunction("substract", substract);
 
 		Template t = Template.create("add({X},{Y})");