[TeamTalk 221]: [757] trunk/TeamTalk: Name changes zap2->TeamTalk

tk@edam.speech.cs.cmu.edu tk at edam.speech.cs.cmu.edu
Fri Sep 21 00:49:24 EDT 2007


An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20070921/291fd8e6/attachment-0001.html
-------------- next part --------------
Modified: trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDialogTask.cpp
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDialogTask.cpp	2007-09-21 04:35:26 UTC (rev 756)
+++ trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDialogTask.cpp	2007-09-21 04:49:24 UTC (rev 757)
@@ -35,9 +35,9 @@
 
 //-----------------------------------------------------------------------------
 // 
-// ZAP2DIALOGTASK.CPP - This module contains the description of the dialog 
+// TeamTalkDIALOGTASK.CPP - This module contains the description of the dialog 
 //                          task, (i.e. all the user defined agencies, etc)
-//                          for the zap2 system
+//                          for the TeamTalk system
 // 
 // ----------------------------------------------------------------------------
 // 
@@ -223,9 +223,9 @@
 //-----------------------------------------------------------------------------
  
 //-----------------------------------------------------------------------------
-// /zap2
+// /TeamTalk
 //-----------------------------------------------------------------------------
-DEFINE_AGENCY(Czap2,
+DEFINE_AGENCY(CTeamTalk,
 	IS_MAIN_TOPIC()
     DEFINE_CONCEPTS(
         STRING_USER_CONCEPT(current_addressee, "")
@@ -246,13 +246,13 @@
 )	
 
 //-----------------------------------------------------------------------------
-// /zap2/Welcome
+// /TeamTalk/Welcome
 //-----------------------------------------------------------------------------
 //DEFINE_INFORM_AGENT( CWelcome,
 //    PROMPT(":non-interruptable inform welcome"))
 
 //-----------------------------------------------------------------------------
-// /zap2/GetCurrentAddressee
+// /TeamTalk/GetCurrentAddressee
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY( CGetCurrentAddressee, 
 	// This agency consists of an expect agent which binds the value of the slot 
@@ -277,29 +277,29 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/GetCurrentAddressee/ExpectAddressee
+// /TeamTalk/GetCurrentAddressee/ExpectAddressee
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT( CExpectAddressee, 
 	EXPECT_CONCEPT(current_addressee)
-    GRAMMAR_MAPPING("@(/zap2)[RobotName]")
+    GRAMMAR_MAPPING("@(/TeamTalk)[RobotName]")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/GetCurrentAddressee/ExpectAddressee
+// /TeamTalk/GetCurrentAddressee/ExpectAddressee
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformAddresseeChange, 
 	PROMPT(":select_bot inform select_bot <current_addressee")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/GetCurrentAddressee/ExecuteReopenAddressee
+// /TeamTalk/GetCurrentAddressee/ExecuteReopenAddressee
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT( CExecuteReopenAddressee, 
 	EXECUTE(C("current_addressee").ReOpen())
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task
+// /TeamTalk/Task
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY( CTask,
 	IS_MAIN_TOPIC()
@@ -348,7 +348,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/RequestWaitForCommands
+// /TeamTalk/Task/RequestWaitForCommands
 //-----------------------------------------------------------------------------
 DEFINE_REQUEST_AGENT( CRequestWaitForCommands, 
 	// PROMPT("request idle <robot_name")
@@ -356,7 +356,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Report
+// /TeamTalk/Task/Report
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CReport,
  	PRECONDITION(IS_TRUE(report_command_issued) &&
@@ -369,7 +369,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Report/ExpectReportCommand
+// /TeamTalk/Task/Report/ExpectReportCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectReportCommand,
 	EXPECT_CONCEPT(report_command_issued)
@@ -377,14 +377,14 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Report/InformReport
+// /TeamTalk/Task/Report/InformReport
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformReport, 
 	PROMPT("inform my_report <robot_name")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/QueryLocation
+// /TeamTalk/QueryLocation
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CQueryLocation,
 	DEFINE_CONCEPTS(
@@ -400,7 +400,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/QueryLocation/ExpectQueryLocationCommand
+// /TeamTalk/Task/QueryLocation/ExpectQueryLocationCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectQueryLocationCommand,
 	EXPECT_CONCEPT(report_location_command_issued)
@@ -411,14 +411,14 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/QueryLocation/ExecuteGetLocation
+// /TeamTalk/Task/QueryLocation/ExecuteGetLocation
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecuteGetLocation,
 	CALL("gal_be.launch_query query=location_query <robot_name")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/ReportLocation
+// /TeamTalk/ReportLocation
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CReportLocation,
 	PRECONDITION(UPDATED(location_report) &&
@@ -431,7 +431,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/ReportLocation/ExpectReportLocationCommand
+// /TeamTalk/Task/ReportLocation/ExpectReportLocationCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectReportLocationCommand,
 	EXPECT_CONCEPT(location_report)
@@ -442,14 +442,14 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/ReportLocation/InformLocation
+// /TeamTalk/Task/ReportLocation/InformLocation
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformLocation,
 	PROMPT("inform report_location <robot_name location<location_report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/MoveCardinal
+// /TeamTalk/Task/MoveCardinal
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CMoveCardinal,
 	DEFINE_CONCEPTS(
@@ -472,7 +472,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/CommandMoveRelative
+// /TeamTalk/Task/CommandMoveRelative
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CCommandMoveRelative,
 	DEFINE_CONCEPTS(
@@ -495,7 +495,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/MoveCardinal/ExpectMoveCardinalCommand
+// /TeamTalk/Task/MoveCardinal/ExpectMoveCardinalCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectMoveCardinalCommand,
 	EXPECT_CONCEPT(move_cardinal_command_issued)
@@ -505,7 +505,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/MoveRelative/ExpectMoveRelativeCommand
+// /TeamTalk/Task/MoveRelative/ExpectMoveRelativeCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectMoveRelativeCommand,
 	EXPECT_CONCEPT(move_relative_command_issued)
@@ -515,7 +515,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Move/RequestCardinalDirection
+// /TeamTalk/Task/Move/RequestCardinalDirection
 //-----------------------------------------------------------------------------
 DEFINE_REQUEST_AGENT(CRequestCardinalDirection,
 	REQUEST_CONCEPT(direction)
@@ -526,7 +526,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Move/RequestMoveDirection
+// /TeamTalk/Task/Move/RequestMoveDirection
 //-----------------------------------------------------------------------------
 DEFINE_REQUEST_AGENT(CRequestMoveDirection,
 	REQUEST_CONCEPT(direction)
@@ -537,7 +537,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Move/RequestDistance	
+// /TeamTalk/Task/Move/RequestDistance	
 //-----------------------------------------------------------------------------
 DEFINE_REQUEST_AGENT(CRequestDistance,
 	REQUEST_CONCEPT(distance)
@@ -548,7 +548,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Move/RequestRelativeDistance	
+// /TeamTalk/Task/Move/RequestRelativeDistance	
 //-----------------------------------------------------------------------------
 DEFINE_REQUEST_AGENT(CRequestRelativeDistance,
 	REQUEST_CONCEPT(distance)
@@ -559,7 +559,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Move/ExecuteMove
+// /TeamTalk/Task/Move/ExecuteMove
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecuteMove,
 	PRECONDITION(AVAILABLE(direction) && AVAILABLE(distance))
@@ -567,7 +567,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Move/ExecuteRelativeMove
+// /TeamTalk/Task/Move/ExecuteRelativeMove
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecuteRelativeMove,
 	PRECONDITION(AVAILABLE(direction) && AVAILABLE(distance))
@@ -575,7 +575,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/ReportMove
+// /TeamTalk/Task/ReportMove
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CReportMove,
 	PRECONDITION(UPDATED(move_report) &&
@@ -588,7 +588,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/ReportMove/ExpectReportMove
+// /TeamTalk/Task/ReportMove/ExpectReportMove
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectReportMove,
 	EXPECT_CONCEPT(move_report)
@@ -599,21 +599,21 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/ReportMove/InformMove
+// /TeamTalk/Task/ReportMove/InformMove
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformMove,
 	PROMPT("inform report_move_status <robot_name <move_report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Move/InformReaction2Move
+// /TeamTalk/Task/Move/InformReaction2Move
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformReaction2Move,
 	PROMPT("inform report_move_relative <robot_name <direction <distance <report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal
+// /TeamTalk/Task/MoveToGoal
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CMoveToGoal,
 	DEFINE_CONCEPTS(
@@ -637,7 +637,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal/ExpectMoveToGoalCommand
+// /TeamTalk/Task/MoveToGoal/ExpectMoveToGoalCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectMoveToGoalCommand,
 	EXPECT_CONCEPT(move_to_goal_command_issued)
@@ -647,24 +647,24 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal/ExpectRelDist
+// /TeamTalk/Task/MoveToGoal/ExpectRelDist
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectRelDist,
 	EXPECT_CONCEPT(relDist)
 	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
 	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
 	GRAMMAR_MAPPING(
-		"[MoveToGoal.RelativeDistance.ZapAll]>1,"\
-		"[MoveToGoal.RelativeDistance.ZapHalf]>2,"\
-		"[MoveToGoal.RelativeDistance.ZapThird]>3,"\
-		"[MoveToGoal.RelativeDistance.ZapOneQuarter]>4,"\
-		"[MoveToGoal.RelativeDistance.ZapTwoThird]>5,"\
-		"[MoveToGoal.RelativeDistance.ZapThreeQuarter]>6"
+		"[MoveToGoal.RelativeDistance.TeamTalkAll]>1,"\
+		"[MoveToGoal.RelativeDistance.TeamTalkHalf]>2,"\
+		"[MoveToGoal.RelativeDistance.TeamTalkThird]>3,"\
+		"[MoveToGoal.RelativeDistance.TeamTalkOneQuarter]>4,"\
+		"[MoveToGoal.RelativeDistance.TeamTalkTwoThird]>5,"\
+		"[MoveToGoal.RelativeDistance.TeamTalkThreeQuarter]>6"
 	)
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal/ExpectDir
+// /TeamTalk/Task/MoveToGoal/ExpectDir
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectDir,
 	EXPECT_CONCEPT(dir)
@@ -674,7 +674,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal/ExpectOrdinal
+// /TeamTalk/Task/MoveToGoal/ExpectOrdinal
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectOrdinal,
 	EXPECT_CONCEPT(ordinal)
@@ -684,7 +684,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal/ExecuteMoveToGoal
+// /TeamTalk/Task/MoveToGoal/ExecuteMoveToGoal
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecuteMoveToGoal,
     PRECONDITION(AVAILABLE(ordinal))
@@ -692,14 +692,14 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal/InformMoveToGoalReport
+// /TeamTalk/Task/MoveToGoal/InformMoveToGoalReport
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformMoveToGoalReport,
 	PROMPT("inform report_move_to_goal <robot_name <ordinal <report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search
+// /TeamTalk/Task/Search
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CSearch,
 	DEFINE_CONCEPTS(
@@ -757,7 +757,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectSearchCommand
+// /TeamTalk/Task/Search/ExpectSearchCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectSearchCommand,
 	EXPECT_CONCEPT(search_command_issued)
@@ -767,7 +767,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX1
+// /TeamTalk/Task/Search/ExpectX1
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectX1,
 	EXPECT_CONCEPT(x1)
@@ -777,7 +777,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX2
+// /TeamTalk/Task/Search/ExpectX2
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectX2,
 	EXPECT_CONCEPT(x2)
@@ -787,7 +787,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX3
+// /TeamTalk/Task/Search/ExpectX3
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectX3,
 	EXPECT_CONCEPT(x3)
@@ -797,7 +797,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX4
+// /TeamTalk/Task/Search/ExpectX4
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectX4,
 	EXPECT_CONCEPT(x4)
@@ -807,7 +807,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX5
+// /TeamTalk/Task/Search/ExpectX5
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectX5,
 	EXPECT_CONCEPT(x5)
@@ -817,7 +817,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX6
+// /TeamTalk/Task/Search/ExpectX6
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectX6,
 	EXPECT_CONCEPT(x6)
@@ -827,7 +827,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX7
+// /TeamTalk/Task/Search/ExpectX7
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectX7,
 	EXPECT_CONCEPT(x7)
@@ -837,7 +837,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX8
+// /TeamTalk/Task/Search/ExpectX8
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectX8,
 	EXPECT_CONCEPT(x8)
@@ -847,7 +847,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX9
+// /TeamTalk/Task/Search/ExpectX9
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectX9,
 	EXPECT_CONCEPT(x9)
@@ -857,7 +857,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX10
+// /TeamTalk/Task/Search/ExpectX10
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectX10,
 	EXPECT_CONCEPT(x10)
@@ -867,7 +867,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY1
+// /TeamTalk/Task/Search/ExpectY1
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectY1,
 	EXPECT_CONCEPT(y1)
@@ -877,7 +877,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY2
+// /TeamTalk/Task/Search/ExpectY2
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectY2,
 	EXPECT_CONCEPT(y2)
@@ -887,7 +887,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY3
+// /TeamTalk/Task/Search/ExpectY3
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectY3,
 	EXPECT_CONCEPT(y3)
@@ -897,7 +897,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY4
+// /TeamTalk/Task/Search/ExpectY4
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectY4,
 	EXPECT_CONCEPT(y4)
@@ -907,7 +907,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY5
+// /TeamTalk/Task/Search/ExpectY5
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectY5,
 	EXPECT_CONCEPT(y5)
@@ -917,7 +917,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY6
+// /TeamTalk/Task/Search/ExpectY6
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectY6,
 	EXPECT_CONCEPT(y6)
@@ -927,7 +927,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY7
+// /TeamTalk/Task/Search/ExpectY7
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectY7,
 	EXPECT_CONCEPT(y7)
@@ -937,7 +937,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY8
+// /TeamTalk/Task/Search/ExpectY8
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectY8,
 	EXPECT_CONCEPT(y8)
@@ -947,7 +947,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY9
+// /TeamTalk/Task/Search/ExpectY9
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectY9,
 	EXPECT_CONCEPT(y9)
@@ -957,7 +957,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY10
+// /TeamTalk/Task/Search/ExpectY10
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectY10,
 	EXPECT_CONCEPT(y10)
@@ -967,21 +967,21 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExecuteSearch
+// /TeamTalk/Task/Search/ExecuteSearch
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecuteSearch,
     CALL("gal_be.launch_query query=search_command <robot_name <x1 <x2 <x3 <x4 <x5 <x6 <x7 <x8 <x9 <x10 <y1 <y2 <y3 <y4 <y5 <y6 <y7 <y8 <y9 <y10 >report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Search/InformSearchReport
+// /TeamTalk/Task/Search/InformSearchReport
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformSearchReport,
 	PROMPT("inform report_search <robot_name <x1 <x2 <x3 <x4 <x5 <x6 <x7 <x8 <x9 <x10 <y1 <y2 <y3 <y4 <y5 <y6 <y7 <y8 <y9 <y10 <report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore
+// /TeamTalk/Task/Explore
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CExplore,
 	DEFINE_CONCEPTS(
@@ -1039,7 +1039,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreCommand
+// /TeamTalk/Task/Explore/ExpectExploreCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreCommand,
 	EXPECT_CONCEPT(explore_command_issued)
@@ -1049,7 +1049,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX1
+// /TeamTalk/Task/Explore/ExpectExploreX1
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreX1,
 	EXPECT_CONCEPT(x1)
@@ -1059,7 +1059,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX2
+// /TeamTalk/Task/Explore/ExpectExploreX2
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreX2,
 	EXPECT_CONCEPT(x2)
@@ -1069,7 +1069,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX3
+// /TeamTalk/Task/Explore/ExpectExploreX3
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreX3,
 	EXPECT_CONCEPT(x3)
@@ -1079,7 +1079,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX4
+// /TeamTalk/Task/Explore/ExpectExploreX4
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreX4,
 	EXPECT_CONCEPT(x4)
@@ -1089,7 +1089,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX5
+// /TeamTalk/Task/Explore/ExpectExploreX5
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreX5,
 	EXPECT_CONCEPT(x5)
@@ -1099,7 +1099,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX6
+// /TeamTalk/Task/Explore/ExpectExploreX6
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreX6,
 	EXPECT_CONCEPT(x6)
@@ -1109,7 +1109,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX7
+// /TeamTalk/Task/Explore/ExpectExploreX7
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreX7,
 	EXPECT_CONCEPT(x7)
@@ -1119,7 +1119,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX8
+// /TeamTalk/Task/Explore/ExpectExploreX8
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreX8,
 	EXPECT_CONCEPT(x8)
@@ -1129,7 +1129,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX9
+// /TeamTalk/Task/Explore/ExpectExploreX9
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreX9,
 	EXPECT_CONCEPT(x9)
@@ -1139,7 +1139,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX10
+// /TeamTalk/Task/Explore/ExpectExploreX10
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreX10,
 	EXPECT_CONCEPT(x10)
@@ -1149,7 +1149,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreY1
+// /TeamTalk/Task/Explore/ExpectExploreY1
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreY1,
 	EXPECT_CONCEPT(y1)
@@ -1159,7 +1159,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreY2
+// /TeamTalk/Task/Explore/ExpectExploreY2
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreY2,
 	EXPECT_CONCEPT(y2)
@@ -1169,7 +1169,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreY3
+// /TeamTalk/Task/Explore/ExpectExploreY3
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreY3,
 	EXPECT_CONCEPT(y3)
@@ -1179,7 +1179,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreY4
+// /TeamTalk/Task/Explore/ExpectExploreY4
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreY4,
 	EXPECT_CONCEPT(y4)
@@ -1189,7 +1189,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreY5
+// /TeamTalk/Task/Explore/ExpectExploreY5
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreY5,
 	EXPECT_CONCEPT(y5)
@@ -1199,7 +1199,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreY6
+// /TeamTalk/Task/Explore/ExpectExploreY6
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreY6,
 	EXPECT_CONCEPT(y6)
@@ -1209,7 +1209,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreY7
+// /TeamTalk/Task/Explore/ExpectExploreY7
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreY7,
 	EXPECT_CONCEPT(y7)
@@ -1219,7 +1219,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreY8
+// /TeamTalk/Task/Explore/ExpectExploreY8
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreY8,
 	EXPECT_CONCEPT(y8)
@@ -1229,7 +1229,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreY9
+// /TeamTalk/Task/Explore/ExpectExploreY9
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreY9,
 	EXPECT_CONCEPT(y9)
@@ -1239,7 +1239,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreY10
+// /TeamTalk/Task/Explore/ExpectExploreY10
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectExploreY10,
 	EXPECT_CONCEPT(y10)
@@ -1249,21 +1249,21 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExecuteExplore
+// /TeamTalk/Task/Explore/ExecuteExplore
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecuteExplore,
     CALL("gal_be.launch_query query=explore_command <robot_name <x1 <x2 <x3 <x4 <x5 <x6 <x7 <x8 <x9 <x10 <y1 <y2 <y3 <y4 <y5 <y6 <y7 <y8 <y9 <y10 >report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Explore/InformExploreReport
+// /TeamTalk/Task/Explore/InformExploreReport
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformExploreReport,
 	PROMPT("inform report_explore <robot_name <x1 <x2 <x3 <x4 <x5 <x6 <x7 <x8 <x9 <x10 <y1 <y2 <y3 <y4 <y5 <y6 <y7 <y8 <y9 <y10 <report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Halt
+// /TeamTalk/Task/Halt
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CHalt,
 	DEFINE_CONCEPTS(
@@ -1280,7 +1280,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Halt/ExpectHaltCommand
+// /TeamTalk/Task/Halt/ExpectHaltCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectHaltCommand,
 	EXPECT_CONCEPT(halt_command_issued)
@@ -1290,21 +1290,21 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Halt/ExecuteHalt
+// /TeamTalk/Task/Halt/ExecuteHalt
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecuteHalt,
     CALL("gal_be.launch_query query=halt_command <robot_name >report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Halt/InformHalt
+// /TeamTalk/Task/Halt/InformHalt
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformHalt,
 	PROMPT("inform report_halt <robot_name <report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Follow
+// /TeamTalk/Task/Follow
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CFollow,
 	DEFINE_CONCEPTS(
@@ -1323,7 +1323,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Follow/ExpectFollowCommand
+// /TeamTalk/Task/Follow/ExpectFollowCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectFollowCommand,
 	EXPECT_CONCEPT(follow_command_issued)
@@ -1333,7 +1333,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Follow/ExpectFollowee
+// /TeamTalk/Task/Follow/ExpectFollowee
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectFollowee,
 	EXPECT_CONCEPT(followee)
@@ -1343,21 +1343,21 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Follow/ExecuteFollow
+// /TeamTalk/Task/Follow/ExecuteFollow
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecuteFollow,
     CALL("gal_be.launch_query query=follow_command <robot_name <followee >report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Follow/InformFollow
+// /TeamTalk/Task/Follow/InformFollow
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformFollow,
 	PROMPT("inform report_follow <robot_name <followee <report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Pause
+// /TeamTalk/Task/Pause
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CPause,
 	DEFINE_CONCEPTS(
@@ -1375,7 +1375,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Follow/ExpectPauseCommand
+// /TeamTalk/Task/Follow/ExpectPauseCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectPauseCommand,
 	EXPECT_CONCEPT(pause_command_issued)
@@ -1385,21 +1385,21 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Follow/ExecutePause
+// /TeamTalk/Task/Follow/ExecutePause
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecutePause,
     CALL("gal_be.launch_query query=pause_command <robot_name >report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Follow/InformPause
+// /TeamTalk/Task/Follow/InformPause
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformPause,
 	PROMPT("inform report_pause <robot_name <report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Continue
+// /TeamTalk/Task/Continue
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CContinue,
 	DEFINE_CONCEPTS(
@@ -1416,7 +1416,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Follow/ExpectContinueCommand
+// /TeamTalk/Task/Follow/ExpectContinueCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectContinueCommand,
 	EXPECT_CONCEPT(continue_command_issued)
@@ -1426,21 +1426,21 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Follow/ExecuteContinue
+// /TeamTalk/Task/Follow/ExecuteContinue
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecuteContinue,
     CALL("gal_be.launch_query query=continue_command <robot_name >report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Follow/InformContinue
+// /TeamTalk/Task/Follow/InformContinue
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformContinue,
 	PROMPT("inform report_continue <robot_name <report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn
+// /TeamTalk/Task/Turn
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CTurn,
 	DEFINE_CONCEPTS(
@@ -1462,7 +1462,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/ExpectTurnCommand
+// /TeamTalk/Task/Turn/ExpectTurnCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectTurnCommand,
 	EXPECT_CONCEPT(turn_command_issued)
@@ -1472,7 +1472,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/RequestTurnDirection
+// /TeamTalk/Task/Turn/RequestTurnDirection
 //-----------------------------------------------------------------------------
 DEFINE_REQUEST_AGENT(CRequestTurnDirection,
 	REQUEST_CONCEPT(direction)
@@ -1483,7 +1483,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/ExpectTurnIncrement
+// /TeamTalk/Task/Turn/ExpectTurnIncrement
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectTurnIncrement,
 	EXPECT_CONCEPT(increment)
@@ -1493,21 +1493,21 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/ExecuteTurn
+// /TeamTalk/Task/Turn/ExecuteTurn
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecuteTurn,
     CALL("gal_be.launch_query query=turn_command <robot_name <direction <increment >report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/InformTurn
+// /TeamTalk/Task/Turn/InformTurn
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformTurn,
 	PROMPT("inform report_turn <robot_name <direction <report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/SetPose
+// /TeamTalk/Task/SetPose
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CSetPose,
 	DEFINE_CONCEPTS(
@@ -1531,7 +1531,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/ExpectSetPoseCommand
+// /TeamTalk/Task/Turn/ExpectSetPoseCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectSetPoseCommand,
 	EXPECT_CONCEPT(set_pose_command_issued)
@@ -1541,7 +1541,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/ExpectSetPoseX
+// /TeamTalk/Task/Turn/ExpectSetPoseX
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectSetPoseX,
 	EXPECT_CONCEPT(x)
@@ -1551,7 +1551,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/ExpectSetPoseY
+// /TeamTalk/Task/Turn/ExpectSetPoseY
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectSetPoseY,
 	EXPECT_CONCEPT(y)
@@ -1561,7 +1561,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/ExpectSetPoseAngle
+// /TeamTalk/Task/Turn/ExpectSetPoseAngle
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectSetPoseAngle,
 	EXPECT_CONCEPT(angle)
@@ -1571,21 +1571,21 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/ExecuteSetPose
+// /TeamTalk/Task/Turn/ExecuteSetPose
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecuteSetPose,
     CALL("gal_be.launch_query query=setpos <robot_name <x <y <angle >report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/InformSetPose
+// /TeamTalk/Task/Turn/InformSetPose
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformSetPose,
 	//PROMPT("inform report_turn <robot_name <x <report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/CancelTask
+// /TeamTalk/Task/CancelTask
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY(CCancelTask,
 	DEFINE_CONCEPTS(
@@ -1605,7 +1605,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/ExpectCancelTaskCommand
+// /TeamTalk/Task/Turn/ExpectCancelTaskCommand
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectCancelTaskCommand,
 	EXPECT_CONCEPT(cancel_task_command_issued)
@@ -1615,7 +1615,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/ExpectCancelTaskTaskid
+// /TeamTalk/Task/Turn/ExpectCancelTaskTaskid
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectCancelTaskTaskid,
 	EXPECT_CONCEPT(taskid)
@@ -1625,21 +1625,21 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/ExecuteCancelTask
+// /TeamTalk/Task/Turn/ExecuteCancelTask
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT(CExecuteCancelTask,
     CALL("gal_be.launch_query query=cancel_task <robot_name <taskid >report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/Turn/InformCancelTask
+// /TeamTalk/Task/Turn/InformCancelTask
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT(CInformCancelTask,
 	//PROMPT("inform report_turn <robot_name <x <report")
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/ExpectCancel
+// /TeamTalk/ExpectCancel
 //-----------------------------------------------------------------------------
 DEFINE_EXPECT_AGENT(CExpectCancel,
 	EXPECT_CONCEPT(cancel)
@@ -1649,7 +1649,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/AllDoneDummy
+// /TeamTalk/Task/AllDoneDummy
 //-----------------------------------------------------------------------------
 DEFINE_EXECUTE_AGENT( CAllDoneDummy, 
 	// whenever one (or more) of the subagents of PerformTask get executed 
@@ -1660,7 +1660,7 @@
 )
 
       /*
-// /zap2/Task/GetQuery
+// /TeamTalk/Task/GetQuery
 DEFINE_AGENCY( CGetQuery,
 	IS_MAIN_TOPIC()
     DEFINE_CONCEPTS(
@@ -1686,7 +1686,7 @@
             (int)(C("room_query.date_time.time.start_time")))
 )
 
-// /zap2/Task/GetQuery/HowMayIHelpYou
+// /TeamTalk/Task/GetQuery/HowMayIHelpYou
 DEFINE_REQUEST_AGENT( CHowMayIHelpYou, 
     PRECONDITION(NOT_AVAILABLE(room_query) && !A("..").WasReset())
     PROMPT(":non-interruptable request how_may_i_help_you")
@@ -1695,7 +1695,7 @@
     MAX_ATTEMPTS(2)
 )
 
-// /zap2/Task/GetQuery/HowMayIHelpYouAgain
+// /TeamTalk/Task/GetQuery/HowMayIHelpYouAgain
 DEFINE_REQUEST_AGENT( CHowMayIHelpYouAgain, 
     PRECONDITION(NOT_AVAILABLE(room_query) && A("..").WasReset())
     PROMPT("request how_may_i_help_you_again")
@@ -1703,7 +1703,7 @@
     MAX_ATTEMPTS(2)
 )
 
-// /zap2/Task/GetQuery/RequestDateTime
+// /TeamTalk/Task/GetQuery/RequestDateTime
 DEFINE_AGENCY( CRequestDateTime,	
     DEFINE_SUBAGENTS(
         SUBAGENT(RequestWhen, CRequestWhen, request_default)
@@ -1723,44 +1723,44 @@
         C("room_query.date_time.time.start_time") < C("room_query.date_time.time.end_time"))
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/RequestWhen
+// /TeamTalk/Task/GetQuery/RequestDateTime/RequestWhen
 DEFINE_REQUEST_AGENT( CRequestWhen, 
     PRECONDITION(!IS_TRUE(room_query.date_time.date.valid_date) &&
                  !(AVAILABLE(room_query.date_time.time.start_time) ||
                    AVAILABLE(room_query.date_time.time.end_time)))
 	REQUEST_CONCEPT(room_query.date_time)
 	PROMPT("request room_when")
-    GRAMMAR_MAPPING("@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.date_time]>:datetime,"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[DateTimeSpec.date_time]>:datetime")
+    GRAMMAR_MAPPING("@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.date_time]>:datetime,"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[DateTimeSpec.date_time]>:datetime")
     SUCCEEDS_WHEN(IS_TRUE(room_query.date_time.date.valid_date))
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/RequestDay
+// /TeamTalk/Task/GetQuery/RequestDateTime/RequestDay
 DEFINE_REQUEST_AGENT( CRequestDay, 
     PRECONDITION(!IS_TRUE(room_query.date_time.date.valid_date) &&
                  (AVAILABLE(room_query.date_time.time.start_time) ||
                   AVAILABLE(room_query.date_time.time.end_time)))
 	REQUEST_CONCEPT(room_query.date_time)
 	PROMPT("request room_day")
-    GRAMMAR_MAPPING("@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.date_time]>:datetime,"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[DateTimeSpec.date_time]>:datetime")
+    GRAMMAR_MAPPING("@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.date_time]>:datetime,"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[DateTimeSpec.date_time]>:datetime")
     SUCCEEDS_WHEN(IS_TRUE(room_query.date_time.date.valid_date))
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/RequestTime
+// /TeamTalk/Task/GetQuery/RequestDateTime/RequestTime
 DEFINE_REQUEST_AGENT( CRequestTime,	
     PRECONDITION(!IS_TRUE(room_query.date_time.time.valid_time))
 	REQUEST_CONCEPT(room_query.date_time)
 	PROMPT("request what_time")
-    GRAMMAR_MAPPING("@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.date_time]>:datetime,"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[DateTimeSpec.date_time]>:datetime")
+    GRAMMAR_MAPPING("@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.date_time]>:datetime,"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[DateTimeSpec.date_time]>:datetime")
     SUCCEEDS_WHEN(
         AVAILABLE(room_query.date_time.time.start_time) ||
         AVAILABLE(room_query.date_time.time.end_time) ||
         AVAILABLE(room_query.date_time.time.timeperiod_spec))
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/RequestSpecificTimes
+// /TeamTalk/Task/GetQuery/RequestDateTime/RequestSpecificTimes
 DEFINE_REQUEST_AGENT( CRequestSpecificTimes,
     PRECONDITION(SAME_AS_TRIGGER)
     TRIGGERED_BY(AVAILABLE(room_query.date_time.time.timeperiod_spec) &&
@@ -1768,14 +1768,14 @@
                  NOT_AVAILABLE(room_query.date_time.time.end_time))
 	REQUEST_CONCEPT(room_query.date_time)
 	PROMPT("request what_specific_time <room_query.date_time.time.timeperiod_spec")
-    GRAMMAR_MAPPING("@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.date_time]>:datetime,"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[DateTimeSpec.date_time]>:datetime")
+    GRAMMAR_MAPPING("@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.date_time]>:datetime,"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[DateTimeSpec.date_time]>:datetime")
     SUCCEEDS_WHEN(
         AVAILABLE(room_query.date_time.time.start_time) ||
         AVAILABLE(room_query.date_time.time.end_time))
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/RequestStartTime
+// /TeamTalk/Task/GetQuery/RequestDateTime/RequestStartTime
 DEFINE_REQUEST_AGENT( CRequestStartTime,
     PRECONDITION(NOT_AVAILABLE(room_query.date_time.time.start_time))
 	REQUEST_CONCEPT(room_query.date_time)
@@ -1785,7 +1785,7 @@
     SUCCEEDS_WHEN(AVAILABLE(room_query.date_time.time.start_time))
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/RequestEndTime
+// /TeamTalk/Task/GetQuery/RequestDateTime/RequestEndTime
 DEFINE_REQUEST_AGENT( CRequestEndTime,
     PRECONDITION(
         NOT_AVAILABLE(room_query.date_time.time.end_time) && 
@@ -1800,7 +1800,7 @@
         (C("room_query.date_time.time.start_time") <= C("room_query.date_time.time.end_time")))
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/DisambiguateDate
+// /TeamTalk/Task/GetQuery/RequestDateTime/DisambiguateDate
 DEFINE_AGENCY( CDisambiguateDate, 
     PRECONDITION(SAME_AS_TRIGGER)
     TRIGGERED_BY(IS_TRUE(room_query.date_time.date.ambiguous))
@@ -1816,7 +1816,7 @@
     RESET_ON_COMPLETION
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/DisambiguateDate/RequestUnambiguousDate
+// /TeamTalk/Task/GetQuery/RequestDateTime/DisambiguateDate/RequestUnambiguousDate
 DEFINE_REQUEST_AGENT( CRequestUnambiguousDate,
     REQUEST_CONCEPT(disambiguated_date_time)
     PROMPT("request disambiguated_date_time date_choice<room_query.date_time.date.date_choice")
@@ -1829,13 +1829,13 @@
     )
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/DisambiguateDate/NeitherDate
+// /TeamTalk/Task/GetQuery/RequestDateTime/DisambiguateDate/NeitherDate
 DEFINE_EXECUTE_AGENT( CNeitherDate, 
     TRIGGERED_BY_COMMANDS("@(..)[Neither]", none)
     EXECUTE(CLEAR(room_query.date_time.date))
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/DisambiguateDate/FirstDate
+// /TeamTalk/Task/GetQuery/RequestDateTime/DisambiguateDate/FirstDate
 DEFINE_EXECUTE_AGENT( CFirstDate, 
     TRIGGERED_BY_COMMANDS("@(..)[FirstOne]", none)
     CALL("gal_be.launch_query query=disambiguate_date "
@@ -1843,7 +1843,7 @@
          "date>disambiguated_date_time.date")
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/DisambiguateDate/SecondDate
+// /TeamTalk/Task/GetQuery/RequestDateTime/DisambiguateDate/SecondDate
 DEFINE_EXECUTE_AGENT( CSecondDate, 
     TRIGGERED_BY_COMMANDS("@(..)[SecondOne]", none)
     CALL("gal_be.launch_query query=disambiguate_date "
@@ -1851,7 +1851,7 @@
          "date>disambiguated_date_time.date")
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/PastDate
+// /TeamTalk/Task/GetQuery/RequestDateTime/PastDate
 DEFINE_INFORM_AGENT( CPastDate, 
     PRECONDITION(SAME_AS_TRIGGER)
     TRIGGERED_BY(IS_TRUE(room_query.date_time.date.past_date))
@@ -1862,7 +1862,7 @@
     )
 )       
 
-// /zap2/Task/GetQuery/RequestDateTime/WrongTimeOrder
+// /TeamTalk/Task/GetQuery/RequestDateTime/WrongTimeOrder
 DEFINE_INFORM_AGENT( CWrongTimeOrder,
 	PRECONDITION(SAME_AS_TRIGGER)
     TRIGGERED_BY(
@@ -1884,7 +1884,7 @@
         CLEAR(room_query.date_time.time.end_time))
 )
 
-// /zap2/Task/GetQuery/RequestDateTime/ComputeEndTimeFromDuration
+// /TeamTalk/Task/GetQuery/RequestDateTime/ComputeEndTimeFromDuration
 DEFINE_EXECUTE_AGENT( CComputeEndTimeFromDuration, 
     PRECONDITION(SAME_AS_TRIGGER)
     TRIGGERED_BY(
@@ -1898,85 +1898,85 @@
     )
 )
 
-// /zap2/Task/GetQuery/ExpectRoomNumber
+// /TeamTalk/Task/GetQuery/ExpectRoomNumber
 DEFINE_EXPECT_AGENT( CExpectRoomNumber,	
 	EXPECT_CONCEPT(room_query.room_number)
     GRAMMAR_MAPPING(
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.4625]>4625,"\
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.4623]>4623,"\
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.7220]>7220,"\
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.8220]>8220,"\
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.4632]>4632,"\
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.4513]>4513,"\
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.3509]>3509,"\
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.1505]>1505,"\
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.1507]>1507,"\
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.2507]>2507,"\
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.3001]>3001,"\
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.3305]>3305,"\
-        "@(..;/zap2/AnythingElse)[NeedRoom.room.room_number.3501]>3501")
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.4625]>4625,"\
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.4623]>4623,"\
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.7220]>7220,"\
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.8220]>8220,"\
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.4632]>4632,"\
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.4513]>4513,"\
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.3509]>3509,"\
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.1505]>1505,"\
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.1507]>1507,"\
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.2507]>2507,"\
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.3001]>3001,"\
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.3305]>3305,"\
+        "@(..;/TeamTalk/AnythingElse)[NeedRoom.room.room_number.3501]>3501")
 )
 
-// /zap2/Task/GetQuery/ExpectRoomLocation
+// /TeamTalk/Task/GetQuery/ExpectRoomLocation
 DEFINE_EXPECT_AGENT( CExpectRoomLocation,	
 	EXPECT_CONCEPT(room_query.room_location)
-	GRAMMAR_MAPPING("@(/zap2/Task;/zap2/AnythingElse)[RoomLocationSpec.location],"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.location],"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.room.location]")
+	GRAMMAR_MAPPING("@(/TeamTalk/Task;/TeamTalk/AnythingElse)[RoomLocationSpec.location],"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.location],"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.room.location]")
 )
 
-// /zap2/Task/GetQuery/ExpectRoomSize
+// /TeamTalk/Task/GetQuery/ExpectRoomSize
 DEFINE_EXPECT_AGENT( CExpectRoomSize,	
 	EXPECT_CONCEPT(room_query.room_size)
-    GRAMMAR_MAPPING("@(/zap2/Task;/zap2/AnythingElse)[RoomSizeSpec.room_size.number]>:number,"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.room_size.number]>:number")
+    GRAMMAR_MAPPING("@(/TeamTalk/Task;/TeamTalk/AnythingElse)[RoomSizeSpec.room_size.number]>:number,"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.room_size.number]>:number")
 )
 
-// /zap2/Task/GetQuery/ExpectRoomSizeSpec
+// /TeamTalk/Task/GetQuery/ExpectRoomSizeSpec
 DEFINE_EXPECT_AGENT( CExpectRoomSizeSpec,	
 	EXPECT_CONCEPT(room_query.room_size_spec)
-    GRAMMAR_MAPPING("@(/zap2/Task;/zap2/AnythingElse)[RoomSizeSpec.room_size_spec.rss_large]>large,"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.room_size_spec.rss_large]>large,"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[RoomSizeSpec.room_size_spec.rss_small]>small,"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.room_size_spec.rss_small]>small")
+    GRAMMAR_MAPPING("@(/TeamTalk/Task;/TeamTalk/AnythingElse)[RoomSizeSpec.room_size_spec.rss_large]>large,"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.room_size_spec.rss_large]>large,"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[RoomSizeSpec.room_size_spec.rss_small]>small,"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.room_size_spec.rss_small]>small")
 )
 
-// /zap2/Task/GetQuery/ExpectRoomProjector
+// /TeamTalk/Task/GetQuery/ExpectRoomProjector
 DEFINE_EXPECT_AGENT( CExpectRoomProjector,	
 	EXPECT_CONCEPT(room_query.room_projector)
-	GRAMMAR_MAPPING("@(/zap2/Task;/zap2/AnythingElse)[ProjectorSpec.projector]>true,"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.projector]>true")
+	GRAMMAR_MAPPING("@(/TeamTalk/Task;/TeamTalk/AnythingElse)[ProjectorSpec.projector]>true,"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.projector]>true")
 )
 
-// /zap2/Task/GetQuery/ExpectRoomNetwork
+// /TeamTalk/Task/GetQuery/ExpectRoomNetwork
 DEFINE_EXPECT_AGENT( CExpectRoomNetwork,	
 	EXPECT_CONCEPT(room_query.room_network)
-	GRAMMAR_MAPPING("@(/zap2/Task;/zap2/AnythingElse)[NetworkingSpec.networking]>true,"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.networking]>true")
+	GRAMMAR_MAPPING("@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NetworkingSpec.networking]>true,"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.networking]>true")
 )
 
-// /zap2/Task/GetQuery/ExpectRoomWhiteboard
+// /TeamTalk/Task/GetQuery/ExpectRoomWhiteboard
 DEFINE_EXPECT_AGENT( CExpectRoomWhiteboard,	
 	EXPECT_CONCEPT(room_query.room_whiteboard)
-	GRAMMAR_MAPPING("@(/zap2/Task;/zap2/AnythingElse)[WhiteboardSpec.whiteboard]>true,"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.whiteboard]>true")
+	GRAMMAR_MAPPING("@(/TeamTalk/Task;/TeamTalk/AnythingElse)[WhiteboardSpec.whiteboard]>true,"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.whiteboard]>true")
 )
 
-// /zap2/Task/GetQuery/ExpectRoomComputer
+// /TeamTalk/Task/GetQuery/ExpectRoomComputer
 DEFINE_EXPECT_AGENT( CExpectRoomComputer,	
 	EXPECT_CONCEPT(room_query.room_computer)
-	GRAMMAR_MAPPING("@(/zap2/Task;/zap2/AnythingElse)[ComputerSpec.computer]>true,"\
-                    "@(/zap2/Task;/zap2/AnythingElse)[NeedRoom.computer]>true")
+	GRAMMAR_MAPPING("@(/TeamTalk/Task;/TeamTalk/AnythingElse)[ComputerSpec.computer]>true,"\
+                    "@(/TeamTalk/Task;/TeamTalk/AnythingElse)[NeedRoom.computer]>true")
 )
 
-// /zap2/Task/GetQuery/ExpectNeedRoom
+// /TeamTalk/Task/GetQuery/ExpectNeedRoom
 DEFINE_EXPECT_AGENT( CExpectNeedRoom,	
 	EXPECT_CONCEPT(need_room)
-	GRAMMAR_MAPPING("@(/zap2/Task/GetQuery;/zap2/AnythingElse)[NeedRoom]>true,"\
-                    "@(/zap2/Task/GetQuery;/zap2/AnythingElse)[ListRooms]>true")
+	GRAMMAR_MAPPING("@(/TeamTalk/Task/GetQuery;/TeamTalk/AnythingElse)[NeedRoom]>true,"\
+                    "@(/TeamTalk/Task/GetQuery;/TeamTalk/AnythingElse)[ListRooms]>true")
 )
 
-// /zap2/Task/PerformQuery
+// /TeamTalk/Task/PerformQuery
 DEFINE_EXECUTE_AGENT( CPerformQuery,
 	PRECONDITION(COMPLETED(../GetQuery))
 	CALL("gal_be.launch_query query=room_query <room_query >results >suggested_refine")
@@ -1987,7 +1987,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/DiscussResults
+// /TeamTalk/Task/DiscussResults
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY( CDiscussResults,
     DEFINE_CONCEPTS(
@@ -2002,7 +2002,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/DiscussResults/PresentResults
+// /TeamTalk/Task/DiscussResults/PresentResults
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY( CPresentResults,
 	DEFINE_SUBAGENTS(
@@ -2013,7 +2013,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/DiscussResults/PresentResults/NoResults
+// /TeamTalk/Task/DiscussResults/PresentResults/NoResults
 //-----------------------------------------------------------------------------
 DEFINE_INFORM_AGENT( CNoResults,
     PRECONDITION(SIZE(results) == 0)
@@ -2022,7 +2022,7 @@
 )
 
 //-----------------------------------------------------------------------------
-// /zap2/Task/DiscussResults/PresentResults/SingleResult
+// /TeamTalk/Task/DiscussResults/PresentResults/SingleResult
 //-----------------------------------------------------------------------------
 DEFINE_AGENCY( CSingleResult,
     IS_MAIN_TOPIC()
@@ -2042,20 +2042,20 @@
                             "{inform room_details room_details<results.0}")
 )
 
-// /zap2/Task/DiscussResults/PresentResults/SingleResult/InformSingleResult
+// /TeamTalk/Task/DiscussResults/PresentResults/SingleResult/InformSingleResult
 DEFINE_INFORM_AGENT( CInformSingleResult,
     PROMPT("{inform single_result <results <room_query.-1}"\
            "{inform room_details room_details<results.0}")
 )
 
-// /zap2/Task/DiscussResults/PresentResults/SingleResult/RequestWantReservation
+// /TeamTalk/Task/DiscussResults/PresentResults/SingleResult/RequestWantReservation
 DEFINE_REQUEST_AGENT( CRequestWantReservation,
     REQUEST_CONCEPT(want_reservation_single)
     PROMPT("request want_reservation_single <results.0")
     GRAMMAR_MAPPING("![Yes]>true, ![No]>false")
 )
 
-// /zap2/Task/DiscussResults/PresentResults/SingleResult/QuerySingleRoomDetails
+// /TeamTalk/Task/DiscussResults/PresentResults/SingleResult/QuerySingleRoomDetails
 DEFINE_INFORM_AGENT( CQuerySingleRoomDetails,
 	PRECONDITION(FALSE)
 	TRIGGERED_BY_COMMANDS("[QueryRoomDetails], [QueryProjector], [QueryWhiteboard],"\
@@ -2064,7 +2064,7 @@
 	RESET_ON_COMPLETION
 )
 
-// /zap2/Task/DiscussResults/PresentResults/SingleResult/QueryOtherRooms
+// /TeamTalk/Task/DiscussResults/PresentResults/SingleResult/QueryOtherRooms
 DEFINE_INFORM_AGENT( CQueryOtherRooms, 
 	PRECONDITION(FALSE)
 	TRIGGERED_BY_COMMANDS("[QueryOtherRooms], [ListRooms], "\
@@ -2073,13 +2073,13 @@
 	RESET_ON_COMPLETION
 )
 
-// /zap2/Task/DiscussResults/PresentResults/SingleResult/RecordReservation

@@ Diff output truncated at 60000 characters. @@


More information about the TeamTalk-developers mailing list