2.3 release

Agent-Core-New/config/managers.xml

@@ -87,9 +87,17 @@ Managers: A template can contain one or multiple managers, and for each managers
 	<manager id="008" name="PersonalityManager" interval="100">
 		<class classname="eu.aria.dialogue.managers.SocialManager">
 		</class>
+		<!-- <templates> -->
+			<!-- <template path="../templates/Personalities/Alice.xml"/> -->
+			<!-- <template path="../templates/emotion-agent.xml"/> -->
+		<!-- </templates> -->
+	</manager>
+
+	<manager id="009" name="InteractionStateManager" interval="100">
 		<templates>
-			<template path="../templates/Personalities/Alice.xml"/>
-			<template path="../templates/emotion-agent.xml"/>
+			<template path="../templates/interaction-state.xml"/>
+			<!-- <template path="../templates/floor-states.xml"/>  -->
+			<!-- <template path="../templates/talking-states.xml"/> -->
 		</templates>
 	</manager>
 </managers>

Agent-Core-New/data/alice_questions.xml

@@ -1,4 +1,5 @@
 <qa_root>
+
 <dialog id="0000">
 <answerlist>
 <answer type="uncertain">
@@ -21,11 +22,9 @@ Hey
 <question>
 Goodday
 </question>
-<question>
-Goodnight
-</question>
 </questionlist>
 </dialog>
+
 <dialog id="0001">
 <answerlist>
 <answer type="uncertain">
@@ -130,6 +129,9 @@ It all started when I was getting tired of sitting by my sister on the river ban
 But I don't know the story.
 </question>
 <question>
+What is your story
+</question>
+<question>
 Tell me the story from the beginning please
 </question>
 <question>

Agent-Core-New/defaultanswers.txt

@@ -0,0 +1,3 @@
+What?
+Huh?
+Sorry?

Agent-Core-New/run.sh

@@ -16,4 +16,4 @@ mainclass=hmi.winger.Main
 # echo java -cp "$mainjar:$modulespaths" $mainclass
 
 # java -cp "$mainjar:$modulespaths" $mainclass
-java -cp "$modulespaths" $mainclass
+java -cp $modulespaths $mainclass

Agent-Core-New/templates/Examples/tutorial2.xml

@@ -45,7 +45,7 @@ FML-templates:
 			<argument name="template" value="inform_statement_y_02"/>
 			<!-- this parameter has to be set in this template. it can be inform (value=1) or opinion (value=2) -->
 			<argument name="alt.inform" value="1"/>
-			<!-- set the variant of the utterance as defined in the template, in this case variant 1 will be set to the utterance.value (which we set earlier) -->
+			<!-- set the variant of the utterance as defined in the template, in this case variant1 will be set to the utterance.value (which we set earlier) -->
 			<argument name="var.var1" value="$agentstates.utterance.value"/>
 			<!-- set the emootion value for the agent utterance, in this case the type will be set to 'happy' -->
 			<argument name="em1.type" value="happy"/>

Agent-Core-New/templates/qa-template.xml

@@ -1,4 +1,4 @@
-<behaviourtemplates xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/hmi-utwente/FlipperMMDS D:\GitHub\Flipper\resource\template.xsd">
+<behaviourtemplates xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/hmi-utwente/FlipperMMDS C:\Users\WaterschootJB\Documents\GitHub\ARIA-DialogueManagement\dist\data\template.xsd">
 
 
 	<!-- QA example -->
@@ -8,6 +8,7 @@
 		</preconditions>
 		<effects>
 			<update name="$agentstates.utterance.previousAnswer" value=" "/>
+			<remove name="$agentstates.utterance.bestAnswer" />
 		</effects>
 	</template>
 
@@ -26,5 +27,32 @@
 		</behaviour>
 	</template>
 
+	<!-- <template id="interrupt" name="interruption">
+		<preconditions>
+			<compare value1="$agentstates.is_talking" value2="true"/>
+			<compare value1="$userstates.is_talking" value2="true"/>
+		</preconditions>
+		<effects>
+			<update name="$agentstates.interrupted" value="true"/>
+		</effects>
+		<behaviour class="eu.aria.dialogue.behaviours.FMLGenerator">
+			<argument name="template" value="feedback_empty_n_01.xml"/>
+			<argument name="emotion" value="angry"/>
+		</behaviour>
+	</template>
+
+	<template id="longSentence" name="longSentence">
+		<preconditions>
+			<compare value1="$agentstates.is_talking" value2="false"/>
+			<compare value1="$userstates.is_talking" value2="false"/>
+		</preconditions>
+		<effects>
+			<update name="$agentstates.interrupted" value="false"/>
+		</effects>
+		<behaviour class="eu.aria.dialogue.behaviours.FMLGenerator">
+			<argument name="template" value="long_answer.xml"/>
+		</behaviour>
+	</template> -->
+
 
 </behaviourtemplates>