[TeamTalk 215]: [751] trunk/TeamTalk: 1) Added several svn ignores for build files.

tk@edam.speech.cs.cmu.edu tk at edam.speech.cs.cmu.edu
Wed Sep 19 00:17:40 EDT 2007 

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20070919/e1b85f97/attachment-0001.html
-------------- next part --------------

Property changes on: trunk/TeamTalk
___________________________________________________________________
Name: svn:ignore
   - bin
logs
temp

   + bin
logs
temp
Ankh.Load
Ankh.Unload
*.ncb
*.suo


Modified: trunk/TeamTalk/Agents/PenDecoder/nbproject/project.properties
===================================================================
--- trunk/TeamTalk/Agents/PenDecoder/nbproject/project.properties	2007-09-18 20:02:56 UTC (rev 750)
+++ trunk/TeamTalk/Agents/PenDecoder/nbproject/project.properties	2007-09-19 04:17:39 UTC (rev 751)
@@ -16,14 +16,13 @@
 dist.dir=dist
 dist.jar=${dist.dir}/PenDecoder.jar
 dist.javadoc.dir=${dist.dir}/javadoc
-file.reference.galaxy.jar=..\\..\\Libraries\\Galaxy\\contrib\\MITRE\\bindings\\java\\lib\\galaxy.jar
 file.reference.bsh-core-2.0b4.jar=bsh-core-2.0b4.jar
 file.reference.bsh-util-2.0b4.jar=bsh-util-2.0b4.jar
-file.reference.jiu.jar=jiu.jar
+file.reference.galaxy.jar-1=../../Libraries/Galaxy/contrib/MITRE/bindings/java/lib/galaxy.jar
 file.reference.PenDecoder-src=src
 jar.compress=false
 javac.classpath=\
-    ${file.reference.galaxy.jar}:\
+    ${file.reference.galaxy.jar-1}:\
     ${file.reference.bsh-util-2.0b4.jar}:\
     ${file.reference.bsh-core-2.0b4.jar}
 # Space-separated list of extra javac options

Modified: trunk/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.vcproj
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.vcproj	2007-09-18 20:02:56 UTC (rev 750)
+++ trunk/TeamTalk/Agents/TeamTalkBackend/TeamTalkBackend.vcproj	2007-09-19 04:17:39 UTC (rev 751)
@@ -26,7 +26,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Setting up directories for executable..."
-				CommandLine="IF NOT EXIST ..\..\bin\nul mkdir ..\..\bin; IF NOT EXIST ..\..\bin\x86-nt\nul mkdir ..\..\bin\x86-nt"
+				CommandLine="IF NOT EXIST  ..\..\..\bin\x86-nt\nul mkdir ..\..\..\bin\x86-nt"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -110,8 +110,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="Make the directories to later copy the build to."
-				CommandLine="IF NOT EXIST ..\..\bin\nul mkdir ..\..\bin; IF NOT EXIST ..\..\bin\x86-nt\nul mkdir ..\..\bin\x86-nt"
+				Description="Setting up directories for executable..."
+				CommandLine="IF NOT EXIST  ..\..\..\bin\x86-nt\nul mkdir ..\..\..\bin\x86-nt"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"

Deleted: trunk/TeamTalk/Agents/TeamTalkBackend/zapBackend.vcproj
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkBackend/zapBackend.vcproj	2007-09-18 20:02:56 UTC (rev 750)
+++ trunk/TeamTalk/Agents/TeamTalkBackend/zapBackend.vcproj	2007-09-19 04:17:39 UTC (rev 751)
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="TeamTalkBackend"
-	ProjectGUID="{098CB2CB-4903-4D0E-83AA-C9781D6C1F2F}"
-	RootNamespace="zapBackend"
-	SccProjectName="SAK"
-	SccAuxPath="SAK"
-	SccLocalPath="SAK"
-	SccProvider="SAK"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ExternalLibraries\Galaxy\include;..\..\ExternalLibraries\Galaxy\contrib\MITRE\utilities\include;..\PrimitiveComm;..\boeingLib\boeing;..\boeingLib\shared"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				StructMemberAlignment="2"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib ..\..\ExternalLibraries\Galaxy\lib\x86-nt\libgalaxy_debug.lib"
-				OutputFile="$(OutDir)/TeamTalkBackend.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/zap2Backend.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy $(TargetPath) ..\..\bin\x86-nt\$(TargetName)-DEBUG.exe"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\ExternalLibraries\Galaxy\include;..\..\ExternalLibraries\Galaxy\contrib\MITRE\utilities\include;..\PrimitiveComm;..\boeingLib\boeing;..\boeingLib\shared"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="2"
-				StructMemberAlignment="3"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\ExternalLibraries\Galaxy\lib\x86-nt\libgalaxy.lib ws2_32.lib"
-				OutputFile="$(OutDir)/TeamTalkBackend.exe"
-				LinkIncremental="1"
-				IgnoreAllDefaultLibraries="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy $(TargetPath) ..\..\bin\x86-nt\$(TargetName).exe"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ClydeDebug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ExternalLibraries\Galaxy\include;..\..\ExternalLibraries\Galaxy\contrib\MITRE\utilities\include;..\PrimitiveComm;..\boeingLib\boeing;..\boeingLib\shared"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				StructMemberAlignment="2"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib ..\..\Galaxy\lib\x86-nt\libgalaxy_debug.lib"
-				OutputFile="$(OutDir)/TeamTalkBackend.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/zap2Backend.pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\gal_be.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\robot-galaxy_adapter.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\backend_server.h"
-				>
-			</File>
-			<File
-				RelativePath=".\robot-galaxy_adapter.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Modified: trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDM.vcproj
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDM.vcproj	2007-09-18 20:02:56 UTC (rev 750)
+++ trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDM.vcproj	2007-09-19 04:17:39 UTC (rev 751)
@@ -26,7 +26,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Setting up directories for executable..."
-				CommandLine="IF NOT EXIST ..\..\bin\nul mkdir ..\..\bin; IF NOT EXIST ..\..\bin\x86-nt\nul mkdir ..\..\bin\x86-nt"
+				CommandLine="IF NOT EXIST  ..\..\..\bin\x86-nt\nul mkdir ..\..\..\bin\x86-nt"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -115,8 +115,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="Make the directories to later copy the build to."
-				CommandLine="IF NOT EXIST ..\..\bin\nul mkdir ..\..\bin; IF NOT EXIST ..\..\bin\x86-nt\nul mkdir ..\..\bin\x86-nt"
+				Description="Setting up directories for executable..."
+				CommandLine="IF NOT EXIST  ..\..\..\bin\x86-nt\nul mkdir ..\..\..\bin\x86-nt"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"

Deleted: trunk/TeamTalk/Agents/TeamTalkDM/zap2DM.cfg
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkDM/zap2DM.cfg	2007-09-18 20:02:56 UTC (rev 750)
+++ trunk/TeamTalk/Agents/TeamTalkDM/zap2DM.cfg	2007-09-19 04:17:39 UTC (rev 751)
@@ -1,45 +0,0 @@
-# This is a configuration file for the zap2DM RavenClaw dialog manager
-
-# CORETHREAD_STREAM "CTH"
-# REGISTRY_STREAM "REG"
-# DMCORE_STREAM "COR"
-# EXPECTATIONAGENDA_STREAM "AGN"
-# DTTMANAGER_STREAM "DTT"
-# INPUTMANAGER_STREAM "INP"
-# OUTPUTMANAGER_STREAM "OTP"
-# OUTPUTHISTORY_STREAM "OTH"
-# STATEMANAGER_STREAM "STA"
-# TRAFFICMANAGER_STREAM "TMS"
-# TRAFFICMANAGERDUMP_STREAM "TMD"
-
-# the logged_streams indicates which streams get logged in the file
-# the displayed_streams indicates which streams are displayed and in which colors
-#  (RedGreenBlueIntensity)
-
-dmi_verbosity = 0
-
-logged_streams = CTH;REG;COR;AGN;DTT;INP;OTP;OTH;STA;TMS;TMD;GMS;GMX;DTS
-displayed_streams = CTH:1111;COR:1111;AGN:0111;DTT:1111;INP:1101;OTP:0101;OTH:0101;STA:1010;TMS:1011;DTS:1001;GMS:1101
-
-
-# the grounging manager configuration can be: 
-#  no_grounding
-#  requests
-#  concepts
-#  requests+concepts
-grounding_manager_configuration = requests
-
-# specifies a pointer to the grounding policies file
-grounding_policies_file = grounding.policies
-
-# broadcast state to helios (you can have multiple addresses separated by ;)
-broadcast_state = helios.set_dialog_state
-
-# default timeout period
-default_timeout = 16
-
-# specifies the file that gives the dialog states definition
-dialog_states_file = dialog_states.def
-
-# indicates whether or not the dialog manager will exit(terminate) on a fatal error
-exit_on_fatal_error = false
\ No newline at end of file

Deleted: trunk/TeamTalk/Agents/TeamTalkDM/zap2DialogTask.cpp
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkDM/zap2DialogTask.cpp	2007-09-18 20:02:56 UTC (rev 750)
+++ trunk/TeamTalk/Agents/TeamTalkDM/zap2DialogTask.cpp	2007-09-19 04:17:39 UTC (rev 751)
@@ -1,3022 +0,0 @@
-//=============================================================================
-//
-//   Copyright (c) 2000-2004, Carnegie Mellon University.  
-//   All rights reserved.
-//
-//   Redistribution and use in source and binary forms, with or without
-//   modification, are permitted provided that the following conditions
-//   are met:
-//
-//   1. Redistributions of source code must retain the above copyright
-//      notice, this list of conditions and the following disclaimer. 
-//
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in
-//      the documentation and/or other materials provided with the
-//      distribution.
-//
-//   This work was supported in part by funding from the Defense Advanced 
-//   Research Projects Agency and the National Science Foundation of the 
-//   United States of America, and the CMU Sphinx Speech Consortium.
-//
-//   THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
-//   ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-//   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-//   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
-//   NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-//   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-//   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-//   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-//   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-//   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-//   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//=============================================================================
-
-//-----------------------------------------------------------------------------
-// 
-// ZAP2DIALOGTASK.CPP - This module contains the description of the dialog 
-//                          task, (i.e. all the user defined agencies, etc)
-//                          for the zap2 system
-// 
-// ----------------------------------------------------------------------------
-// 
-// BEFORE MAKING CHANGES TO THIS CODE, please read the appropriate 
-// documentation, available in the Documentation folder. 
-//
-// ANY SIGNIFICANT CHANGES made should be reflected back in the documentation
-// file(s)
-//
-// ANY CHANGES made (even small bug fixes, should be reflected in the history
-// below, in reverse chronological order
-// 
-// HISTORY --------------------------------------------------------------------
-//
-//   [2002-10-16] (dbohus): started working on this - created a skeleton DM
-//
-//-----------------------------------------------------------------------------
-
-#include "DialogTask.h"
-#include "BindingFilters.h"
-
-//-----------------------------------------------------------------------------
-//
-// DM GALAXY SERVER CONFIGURATION
-//
-//-----------------------------------------------------------------------------
-//#ifdef GALAXY
-//    DMSERVER_CONFIGURATION(NULL, 0)
-//#endif
-extern "C" {
-   char* lpszDMServerName;
-   int iDMServerPort;
-}
-
-//-----------------------------------------------------------------------------
-//
-// DIALOG CORE CONFIGURATION
-//
-//-----------------------------------------------------------------------------
-CORE_CONFIGURATION(
-
-	USE_ALL_GROUNDING_ACTIONS("")
-				   
-	// declare the NLG as the single output device
-	USE_OUTPUT_DEVICES(
-		DEFAULT_OUTPUT_DEVICE("nlg", "nlg.launch_query", 1)
-		OUTPUT_DEVICE("select_bot", "PenDecoder.select_bot", 1)
-	)
-
-    DEFINE_CONFIDENCE_SLOTNAME([h3_confidence])
-
-	// long timeout
-	DEFAULT_TIMEOUT_PERIOD(100000)
-
-	// declare the library agents to be used in the tree
-    // the terminate agent
-    USE_LIBRARY_AGENTS(
-	    LIBRARY_AGENT(CTerminate, Terminate, RegisterTerminateAgent, "")
-
-        // various help agents
-        LIBRARY_AGENT(CHelp, Help, RegisterHelpAgent, "")
-        LIBRARY_AGENT(CHelpGetTips, HelpGetTips, RegisterHelpGetTipsAgent, "")
-        LIBRARY_AGENT(CHelpEstablishContext, HelpEstablishContext, 
-            RegisterHelpEstablishContextAgent, "")
-        LIBRARY_AGENT(CHelpWhatCanISay, HelpWhatCanISay, 
-            RegisterHelpWhatCanISayAgent, "")
-		LIBRARY_AGENT(CHelpSystemCapabilities, HelpSystemCapabilities,
-			RegisterHelpSystemCapabilitiesAgent, "")
-
-        // repeat handling agent
-        LIBRARY_AGENT(CRepeat, Repeat, RegisterRepeatAgent, "")
-
-        // suspend handling agency
-        LIBRARY_AGENT(CSuspend, Suspend, RegisterSuspendAgency, "")
-
-        // timeout handling agency
-        LIBRARY_AGENT(CTimeoutTerminate, TimeoutTerminate, 
-            RegisterTimeoutTerminateAgency, "")
-
-        // start-over handling agency
-        LIBRARY_AGENT(CStartOver, StartOver, RegisterStartOverAgency, "")
-
-        // quit handling agency
-        LIBRARY_AGENT(CQuit, Quit, RegisterQuitAgency, "")
-    )
-
-    // declare the binding filters
-    USE_BINDING_FILTERS(
-        // the date-time binding filter
-        BINDING_FILTER("datetime", DateTime4_DateTimeBindingFilter)
-        // the end-time binding filter
-        BINDING_FILTER("endtime", DateTime4_EndTimeBindingFilter)
-        // the number binding filter (used for room sizes)
-        BINDING_FILTER("number", DateTime4_NumberBindingFilter)
-    )
-)
-
-//-----------------------------------------------------------------------------
-//
-// STRUCTURED CONCEPT TYPES SPECIFICATION
-//
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// D: Definition of the CDateTime structured concept class; this class follows
-//    the return specification of the DateTime4 Hub Galaxy agent
-//-----------------------------------------------------------------------------
-
-// Date concept
-/*
-DEFINE_FRAME_CONCEPT_TYPE( CDateConcept, 
-    INT_ITEM( month )
-    INT_ITEM( day )
-    INT_ITEM( year )
-    BOOL_ITEM( valid_date )
-    BOOL_ITEM( past_date )
-    INT_ITEM( weekday )
-    BOOL_ITEM( need_date )
-    BOOL_ITEM( date_exists )
-    BOOL_ITEM( ambiguous )
-    STRING_ITEM( date_choice )
-)
-
-// Time concept
-DEFINE_FRAME_CONCEPT_TYPE( CTimeConcept, 
-    INT_ITEM( start_time )
-    INT_ITEM( end_time )
-    INT_ITEM( time_duration )
-    STRING_ITEM( timeperiod_spec )
-    BOOL_ITEM( valid_time )
-    INT_ITEM( day_skip )
-    BOOL_ITEM( past_time )
-)
-
-// DateTime concept
-DEFINE_FRAME_CONCEPT_TYPE( CDateTimeConcept,
-	CUSTOM_ITEM(date, CDateConcept)
-	CUSTOM_ITEM(time, CTimeConcept)
-)
-
-// Room query concept
-DEFINE_FRAME_CONCEPT_TYPE( CRoomQuery,
-    CUSTOM_ITEM( date_time, CDateTimeConcept )
-    STRING_ITEM( room_location )
-    INT_ITEM( room_number )
-    INT_ITEM( room_size )
-    STRING_ITEM( room_size_spec )
-    BOOL_ITEM( room_projector )
-    BOOL_ITEM( room_network )
-    BOOL_ITEM( room_whiteboard )
-    BOOL_ITEM( room_computer )
-)
-
-// Room query refinement concept
-DEFINE_FRAME_CONCEPT_TYPE( CRoomQueryRefinement,
-    STRING_ITEM( location )
-    INT_ITEM( size )
-    STRING_ITEM( size_spec )
-    STRING_ITEM( equip )
-)
-
-// Room result concept
-DEFINE_FRAME_CONCEPT_TYPE( CRoomResult, 
-    CUSTOM_ITEM( date_time, CDateTimeConcept )
-    STRING_ITEM( room_location )
-    INT_ITEM( room_number )
-    INT_ITEM( room_size )
-    STRING_ITEM( room_size_spec )
-    BOOL_ITEM( room_projector )
-    BOOL_ITEM( room_network )
-    BOOL_ITEM( room_whiteboard )
-    BOOL_ITEM( room_computer )
-)
-*/
-
-// Array of results from the backend
-//DEFINE_ARRAY_CONCEPT_TYPE(CRoomResult, none, CQueryResults)
-
-//-----------------------------------------------------------------------------
-//
-// AGENT SPECIFICATIONS
-//
-//-----------------------------------------------------------------------------
- 
-//-----------------------------------------------------------------------------
-// /zap2
-//-----------------------------------------------------------------------------
-DEFINE_AGENCY(Czap2,
-	IS_MAIN_TOPIC()
-    DEFINE_CONCEPTS(
-        STRING_USER_CONCEPT(current_addressee, "")
-		STRING_SYSTEM_CONCEPT(robot_name)
-		STRING_SYSTEM_CONCEPT(everyone)
-	)
-	DEFINE_SUBAGENTS(
-    //SUBAGENT(InformAddressChange, CInformAddresseeChange, "")
-		//SUBAGENT(InformReport, CInformReport, "")
-		SUBAGENT(GetCurrentAddressee, CGetCurrentAddressee, "")
-		SUBAGENT(PerformTask, CTask, "")
-	)
-	ON_INITIALIZATION(
-		C("robot_name") = lpszDMServerName;
-		C("everyone") = "EVERYONE";
-		C("current_addressee") = "EVERYONE";
-	)
-)	
-
-//-----------------------------------------------------------------------------
-// /zap2/Welcome
-//-----------------------------------------------------------------------------
-//DEFINE_INFORM_AGENT( CWelcome,
-//    PROMPT(":non-interruptable inform welcome"))
-
-//-----------------------------------------------------------------------------
-// /zap2/GetCurrentAddressee
-//-----------------------------------------------------------------------------
-DEFINE_AGENCY( CGetCurrentAddressee, 
-	// This agency consists of an expect agent which binds the value of the slot 
-	// [RobotName] to the concept current_addressee (so that we know who is being
-	// addressed currently) and an execute agent that reopens the current_addressee
-	// concept so that future occurrences of the [RobotName] slot can be bound too.
-			  
-	// We need to trigger this agency if the concept current_addressee just got 
-	// updated (as indicated by 0 TURNS_SINCE_LAST_UPDATED of concept 
-	// current_addressee being. However ReOpen() sets TURNS_SINCE_LAST_UPDATED to 0.
-	// To prevent that from triggering the agency, we also need to know that 
-	// current_addressee was UPDATED.
-
-  TRIGGERED_BY(UPDATED_IN_LAST_TURN(current_addressee))
-	PRECONDITION(false)
-	DEFINE_SUBAGENTS(
-		SUBAGENT(ExpectAddressee, CExpectAddressee, "")
-		SUBAGENT(InformAddresseeChange, CInformAddresseeChange, "")
-		SUBAGENT(ExecuteReopenAddressee, CExecuteReopenAddressee, "")
-	)
-	ON_COMPLETION(RESET)
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/GetCurrentAddressee/ExpectAddressee
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT( CExpectAddressee, 
-	EXPECT_CONCEPT(current_addressee)
-    GRAMMAR_MAPPING("@(/zap2)[RobotName]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/GetCurrentAddressee/ExpectAddressee
-//-----------------------------------------------------------------------------
-DEFINE_INFORM_AGENT(CInformAddresseeChange, 
-	PROMPT(":select_bot inform select_bot <current_addressee")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/GetCurrentAddressee/ExecuteReopenAddressee
-//-----------------------------------------------------------------------------
-DEFINE_EXECUTE_AGENT( CExecuteReopenAddressee, 
-	EXECUTE(C("current_addressee").ReOpen())
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task
-//-----------------------------------------------------------------------------
-DEFINE_AGENCY( CTask,
-	IS_MAIN_TOPIC()
-    DEFINE_CONCEPTS(
-		BOOL_USER_CONCEPT(report_command_issued, "")
-		BOOL_USER_CONCEPT(report_location_command_issued, "")
-		STRING_SYSTEM_CONCEPT(location_report)
-    STRING_SYSTEM_CONCEPT(move_report)
-		BOOL_USER_CONCEPT(move_cardinal_command_issued, "")
-		BOOL_USER_CONCEPT(move_relative_command_issued, "")
-		BOOL_USER_CONCEPT(move_to_goal_command_issued, "")
-		BOOL_USER_CONCEPT(search_command_issued, "")
-    BOOL_USER_CONCEPT(explore_command_issued, "")
-		BOOL_USER_CONCEPT(halt_command_issued, "")
-		BOOL_USER_CONCEPT(follow_command_issued, "")
-		BOOL_USER_CONCEPT(pause_command_issued, "")
-		BOOL_USER_CONCEPT(continue_command_issued, "")
-		BOOL_USER_CONCEPT(turn_command_issued, "")
-    BOOL_USER_CONCEPT(set_pose_command_issued, "")
-    BOOL_USER_CONCEPT(cancel_task_command_issued, "")
-		BOOL_USER_CONCEPT(cancel, "")
-	)
-	DEFINE_SUBAGENTS(
-		SUBAGENT(RequestWaitForCommands, CRequestWaitForCommands, "")
-		SUBAGENT(Report, CReport, "")
-	  SUBAGENT(QueryLocation, CQueryLocation, "")
-		SUBAGENT(ReportLocation, CReportLocation, "")
-		SUBAGENT(MoveCardinal, CMoveCardinal, "")
-		SUBAGENT(MoveToGoal, CMoveToGoal, "")
-		SUBAGENT(Search, CSearch, "")
-    SUBAGENT(Explore, CExplore, "")
-		SUBAGENT(CommandMoveRelative, CCommandMoveRelative, "")
-    SUBAGENT(ReportMove, CReportMove, "")
-		SUBAGENT(Halt, CHalt, "")
-		SUBAGENT(Follow, CFollow, "")
-		SUBAGENT(Pause, CPause, "")
-		SUBAGENT(Continue, CContinue, "")
-		SUBAGENT(Turn, CTurn, "")
-    SUBAGENT(SetPose, CSetPose, "")
-    SUBAGENT(CancelTask, CCancelTask, "")
-		SUBAGENT(ExpectCancel, CExpectCancel, "")
-		SUBAGENT(AllDoneDummy, CAllDoneDummy, "")
-	)
-	SUCCEEDS_WHEN(COMPLETED(AllDoneDummy))
-	ON_COMPLETION(RESET)
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/RequestWaitForCommands
-//-----------------------------------------------------------------------------
-DEFINE_REQUEST_AGENT( CRequestWaitForCommands, 
-	// PROMPT("request idle <robot_name")
-	TIMEOUT_PERIOD(1000000)
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Report
-//-----------------------------------------------------------------------------
-DEFINE_AGENCY(CReport,
- 	PRECONDITION(IS_TRUE(report_command_issued) &&
-	  	(*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-		*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	DEFINE_SUBAGENTS(
-		SUBAGENT(ExpectReportCommand, CExpectReportCommand, "")
-		SUBAGENT(InformReport, CInformReport, "")
-	)
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Report/ExpectReportCommand
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectReportCommand,
-	EXPECT_CONCEPT(report_command_issued)
-	GRAMMAR_MAPPING("[HumanReportCommand]>true")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Report/InformReport
-//-----------------------------------------------------------------------------
-DEFINE_INFORM_AGENT(CInformReport, 
-	PROMPT("inform my_report <robot_name")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/QueryLocation
-//-----------------------------------------------------------------------------
-DEFINE_AGENCY(CQueryLocation,
-	DEFINE_CONCEPTS(
-        STRING_SYSTEM_CONCEPT(location)
-	)
-	PRECONDITION(IS_TRUE(report_location_command_issued) &&
-	  	(*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-		*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	DEFINE_SUBAGENTS(
-		SUBAGENT(ExpectQueryLocationCommand, CExpectQueryLocationCommand, "")
-		SUBAGENT(ExecuteGetLocation, CExecuteGetLocation, "")
-	)
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/QueryLocation/ExpectQueryLocationCommand
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectQueryLocationCommand,
-	EXPECT_CONCEPT(report_location_command_issued)
-	//EXPECT_WHEN(
- 	//	(*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanLocationQuery]>true")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/QueryLocation/ExecuteGetLocation
-//-----------------------------------------------------------------------------
-DEFINE_EXECUTE_AGENT(CExecuteGetLocation,
-	CALL("gal_be.launch_query query=location_query <robot_name")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/ReportLocation
-//-----------------------------------------------------------------------------
-DEFINE_AGENCY(CReportLocation,
-	PRECONDITION(UPDATED(location_report) &&
-	  	(*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-		*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	DEFINE_SUBAGENTS(
-		SUBAGENT(ExpectReportLocationCommand, CExpectReportLocationCommand, "")
-		SUBAGENT(InformLocation, CInformLocation, "")
-	)
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/ReportLocation/ExpectReportLocationCommand
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectReportLocationCommand,
-	EXPECT_CONCEPT(location_report)
-	EXPECT_WHEN(
- 		(*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-		*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[RobotMessage.Location]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/ReportLocation/InformLocation
-//-----------------------------------------------------------------------------
-DEFINE_INFORM_AGENT(CInformLocation,
-	PROMPT("inform report_location <robot_name location<location_report")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/MoveCardinal
-//-----------------------------------------------------------------------------
-DEFINE_AGENCY(CMoveCardinal,
-	DEFINE_CONCEPTS(
-		STRING_USER_CONCEPT(distance, "expl")
-    STRING_USER_CONCEPT(direction, "expl")
-		STRING_SYSTEM_CONCEPT(report)
-	)
-	PRECONDITION(IS_TRUE(move_cardinal_command_issued) 
-     && (UPDATED(distance) || UPDATED(direction)) &&
-	  	(*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-		*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	DEFINE_SUBAGENTS(
-		SUBAGENT(ExpectMoveCardinalCommand, CExpectMoveCardinalCommand, "")
-		SUBAGENT(RequestDistance, CRequestDistance, "")
-		SUBAGENT(RequestCardinalDirection, CRequestCardinalDirection, "")
-		SUBAGENT(ExecuteMove, CExecuteMove, "")
-		SUBAGENT(InformReaction2Move, CInformReaction2Move, "")
-	)
-	SUCCEEDS_WHEN(COMPLETED(InformReaction2Move) || UPDATED_IN_LAST_TURN(cancel))
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/CommandMoveRelative
-//-----------------------------------------------------------------------------
-DEFINE_AGENCY(CCommandMoveRelative,
-	DEFINE_CONCEPTS(
-    STRING_USER_CONCEPT(direction, "expl")
-		STRING_USER_CONCEPT(distance, "expl")
-		STRING_USER_CONCEPT(units, "")
-    STRING_SYSTEM_CONCEPT(report)
-	)
-	PRECONDITION(IS_TRUE(move_relative_command_issued) 
-    && (UPDATED(distance) || UPDATED(direction)) &&
-	  (*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-		*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	DEFINE_SUBAGENTS(
-		SUBAGENT(ExpectMoveRelativeCommand, CExpectMoveRelativeCommand, "")
-		SUBAGENT(RequestMoveDirection, CRequestMoveDirection, "")
-		SUBAGENT(RequestRelativeDistance, CRequestRelativeDistance, "")
-		SUBAGENT(ExecuteRelativeMove, CExecuteRelativeMove, "")
-	)
-	SUCCEEDS_WHEN(COMPLETED(ExecuteRelativeMove) || UPDATED_IN_LAST_TURN(cancel))
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/MoveCardinal/ExpectMoveCardinalCommand
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectMoveCardinalCommand,
-	EXPECT_CONCEPT(move_cardinal_command_issued)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[MoveVectorCardinal]>true")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/MoveRelative/ExpectMoveRelativeCommand
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectMoveRelativeCommand,
-	EXPECT_CONCEPT(move_relative_command_issued)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[MoveVectorRelative]>true")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Move/RequestCardinalDirection
-//-----------------------------------------------------------------------------
-DEFINE_REQUEST_AGENT(CRequestCardinalDirection,
-	REQUEST_CONCEPT(direction)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	PROMPT("request direction <distance")
-	GRAMMAR_MAPPING("[MoveVectorCardinal.CardinalDirection],![CardinalDirection]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Move/RequestMoveDirection
-//-----------------------------------------------------------------------------
-DEFINE_REQUEST_AGENT(CRequestMoveDirection,
-	REQUEST_CONCEPT(direction)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	PROMPT("request direction <distance")
-	GRAMMAR_MAPPING("[MoveVectorRelative.MoveDirection],![MoveDirection]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Move/RequestDistance	
-//-----------------------------------------------------------------------------
-DEFINE_REQUEST_AGENT(CRequestDistance,
-	REQUEST_CONCEPT(distance)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	PROMPT("request distance <direction")
-	GRAMMAR_MAPPING("![AbsoluteDistance.Number-20],[MoveVectorCardinal.AbsoluteDistance.Number-20]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Move/RequestRelativeDistance	
-//-----------------------------------------------------------------------------
-DEFINE_REQUEST_AGENT(CRequestRelativeDistance,
-	REQUEST_CONCEPT(distance)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	PROMPT("request distance <direction")
-	GRAMMAR_MAPPING("![AbsoluteDistance.Number-20],[MoveVectorRelative.AbsoluteDistance.Number-20]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Move/ExecuteMove
-//-----------------------------------------------------------------------------
-DEFINE_EXECUTE_AGENT(CExecuteMove,
-	PRECONDITION(AVAILABLE(direction) && AVAILABLE(distance))
-    CALL("gal_be.launch_query query=move_cardinal_command <robot_name <distance <direction >report")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Move/ExecuteRelativeMove
-//-----------------------------------------------------------------------------
-DEFINE_EXECUTE_AGENT(CExecuteRelativeMove,
-	PRECONDITION(AVAILABLE(direction) && AVAILABLE(distance))
-    CALL("gal_be.launch_query query=move_relative_command <robot_name <distance <direction >report")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/ReportMove
-//-----------------------------------------------------------------------------
-DEFINE_AGENCY(CReportMove,
-	PRECONDITION(UPDATED(move_report) &&
-	  (*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-		 *C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	DEFINE_SUBAGENTS(
-		SUBAGENT(ExpectReportMove, CExpectReportMove, "")
-		SUBAGENT(InformMove, CInformMove, "")
-	)
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/ReportMove/ExpectReportMove
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectReportMove,
-	EXPECT_CONCEPT(move_report)
-	EXPECT_WHEN(
- 		(*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-		 *C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[RobotMessage.Move]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/ReportMove/InformMove
-//-----------------------------------------------------------------------------
-DEFINE_INFORM_AGENT(CInformMove,
-	PROMPT("inform report_move_status <robot_name <move_report")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Move/InformReaction2Move
-//-----------------------------------------------------------------------------
-DEFINE_INFORM_AGENT(CInformReaction2Move,
-	PROMPT("inform report_move_relative <robot_name <direction <distance <report")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal
-//-----------------------------------------------------------------------------
-DEFINE_AGENCY(CMoveToGoal,
-	DEFINE_CONCEPTS(
-        INT_USER_CONCEPT(relDist, "")
-		STRING_USER_CONCEPT(dir, "")
-		STRING_USER_CONCEPT(ordinal, "expl")
-		STRING_SYSTEM_CONCEPT(report)
-	)
-	PRECONDITION(IS_TRUE(move_to_goal_command_issued) && 
-		(UPDATED(dir) || UPDATED(ordinal) || UPDATED(relDist)) &&
-	  	(*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-		   *C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	DEFINE_SUBAGENTS(
-		SUBAGENT(ExpectMoveToGoalCommand, CExpectMoveToGoalCommand, "")
-		SUBAGENT(ExpectRelDist, CExpectRelDist, "")
-		SUBAGENT(ExpectDir, CExpectDir, "")
-		SUBAGENT(ExpectOrdinal, CExpectOrdinal, "")
-		SUBAGENT(ExecuteMoveToGoal, CExecuteMoveToGoal, "")
-		SUBAGENT(InformMoveToGoalReport, CInformMoveToGoalReport, "")
-	)
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal/ExpectMoveToGoalCommand
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectMoveToGoalCommand,
-	EXPECT_CONCEPT(move_to_goal_command_issued)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[MoveToGoal]>true")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/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"
-	)
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal/ExpectDir
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectDir,
-	EXPECT_CONCEPT(dir)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[MoveToGoal.Side]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal/ExpectOrdinal
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectOrdinal,
-	EXPECT_CONCEPT(ordinal)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[MoveToGoal.Goal],[MoveToGoal.Home]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal/ExecuteMoveToGoal
-//-----------------------------------------------------------------------------
-DEFINE_EXECUTE_AGENT(CExecuteMoveToGoal,
-    PRECONDITION(AVAILABLE(ordinal))
-    CALL("gal_be.launch_query query=move_to_goal_command <robot_name <relDist <dir <ordinal >report")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/MoveToGoal/InformMoveToGoalReport
-//-----------------------------------------------------------------------------
-DEFINE_INFORM_AGENT(CInformMoveToGoalReport,
-	PROMPT("inform report_move_to_goal <robot_name <ordinal <report")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search
-//-----------------------------------------------------------------------------
-DEFINE_AGENCY(CSearch,
-	DEFINE_CONCEPTS(
-    FLOAT_USER_CONCEPT(x1, "")
-    FLOAT_USER_CONCEPT(x2, "")
-		FLOAT_USER_CONCEPT(x3, "")
-		FLOAT_USER_CONCEPT(x4, "")
-		FLOAT_USER_CONCEPT(x5, "")
-		FLOAT_USER_CONCEPT(x6, "")
-		FLOAT_USER_CONCEPT(x7, "")
-		FLOAT_USER_CONCEPT(x8, "")
-		FLOAT_USER_CONCEPT(x9, "")
-		FLOAT_USER_CONCEPT(x10, "")
-    FLOAT_USER_CONCEPT(y1, "")
-    FLOAT_USER_CONCEPT(y2, "")
-		FLOAT_USER_CONCEPT(y3, "")
-		FLOAT_USER_CONCEPT(y4, "")
-		FLOAT_USER_CONCEPT(y5, "")
-		FLOAT_USER_CONCEPT(y6, "")
-		FLOAT_USER_CONCEPT(y7, "")
-		FLOAT_USER_CONCEPT(y8, "")
-		FLOAT_USER_CONCEPT(y9, "")
-		FLOAT_USER_CONCEPT(y10, "")
-		STRING_SYSTEM_CONCEPT(report)
-	)
-	PRECONDITION(IS_TRUE(search_command_issued) && 
-		(UPDATED(x1) && UPDATED(y1)) &&
-	  	(*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-		   *C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	DEFINE_SUBAGENTS(
-		SUBAGENT(ExpectSearchCommand, CExpectSearchCommand, "")
-		SUBAGENT(ExpectX1, CExpectX1, "")
-		SUBAGENT(ExpectX2, CExpectX2, "")
-		SUBAGENT(ExpectX3, CExpectX3, "")
-		SUBAGENT(ExpectX4, CExpectX4, "")
-		SUBAGENT(ExpectX5, CExpectX5, "")
-		SUBAGENT(ExpectX6, CExpectX6, "")
-		SUBAGENT(ExpectX7, CExpectX7, "")
-		SUBAGENT(ExpectX8, CExpectX8, "")
-		SUBAGENT(ExpectX9, CExpectX9, "")
-		SUBAGENT(ExpectX10, CExpectX10, "")
-		SUBAGENT(ExpectY1, CExpectY1, "")
-		SUBAGENT(ExpectY2, CExpectY2, "")
-		SUBAGENT(ExpectY3, CExpectY3, "")
-		SUBAGENT(ExpectY4, CExpectY4, "")
-		SUBAGENT(ExpectY5, CExpectY5, "")
-		SUBAGENT(ExpectY6, CExpectY6, "")
-		SUBAGENT(ExpectY7, CExpectY7, "")
-		SUBAGENT(ExpectY8, CExpectY8, "")
-		SUBAGENT(ExpectY9, CExpectY9, "")
-		SUBAGENT(ExpectY10, CExpectY10, "")
-		SUBAGENT(ExecuteSearch, CExecuteSearch, "")
-		SUBAGENT(InformSearchReport, CInformSearchReport, "")
-	)
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectSearchCommand
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectSearchCommand,
-	EXPECT_CONCEPT(search_command_issued)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand]>true")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX1
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectX1,
-	EXPECT_CONCEPT(x1)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.x1]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX2
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectX2,
-	EXPECT_CONCEPT(x2)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.x2]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX3
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectX3,
-	EXPECT_CONCEPT(x3)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.x3]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX4
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectX4,
-	EXPECT_CONCEPT(x4)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.x4]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX5
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectX5,
-	EXPECT_CONCEPT(x5)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.x5]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX6
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectX6,
-	EXPECT_CONCEPT(x6)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.x6]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX7
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectX7,
-	EXPECT_CONCEPT(x7)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.x7]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX8
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectX8,
-	EXPECT_CONCEPT(x8)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.x8]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX9
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectX9,
-	EXPECT_CONCEPT(x9)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.x9]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectX10
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectX10,
-	EXPECT_CONCEPT(x10)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.x10]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY1
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectY1,
-	EXPECT_CONCEPT(y1)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.y1]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY2
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectY2,
-	EXPECT_CONCEPT(y2)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.y2]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY3
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectY3,
-	EXPECT_CONCEPT(y3)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.y3]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY4
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectY4,
-	EXPECT_CONCEPT(y4)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.y4]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY5
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectY5,
-	EXPECT_CONCEPT(y5)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.y5]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY6
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectY6,
-	EXPECT_CONCEPT(y6)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.y6]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY7
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectY7,
-	EXPECT_CONCEPT(y7)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.y7]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY8
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectY8,
-	EXPECT_CONCEPT(y8)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.y8]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY9
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectY9,
-	EXPECT_CONCEPT(y9)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.y9]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Search/ExpectY10
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectY10,
-	EXPECT_CONCEPT(y10)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanSearchCommand.y10]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/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
-//-----------------------------------------------------------------------------
-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
-//-----------------------------------------------------------------------------
-DEFINE_AGENCY(CExplore,
-	DEFINE_CONCEPTS(
-        FLOAT_USER_CONCEPT(x1, "")
-        FLOAT_USER_CONCEPT(x2, "")
-		FLOAT_USER_CONCEPT(x3, "")
-		FLOAT_USER_CONCEPT(x4, "")
-		FLOAT_USER_CONCEPT(x5, "")
-		FLOAT_USER_CONCEPT(x6, "")
-		FLOAT_USER_CONCEPT(x7, "")
-		FLOAT_USER_CONCEPT(x8, "")
-		FLOAT_USER_CONCEPT(x9, "")
-		FLOAT_USER_CONCEPT(x10, "")
-        FLOAT_USER_CONCEPT(y1, "")
-        FLOAT_USER_CONCEPT(y2, "")
-		FLOAT_USER_CONCEPT(y3, "")
-		FLOAT_USER_CONCEPT(y4, "")
-		FLOAT_USER_CONCEPT(y5, "")
-		FLOAT_USER_CONCEPT(y6, "")
-		FLOAT_USER_CONCEPT(y7, "")
-		FLOAT_USER_CONCEPT(y8, "")
-		FLOAT_USER_CONCEPT(y9, "")
-		FLOAT_USER_CONCEPT(y10, "")
-		STRING_SYSTEM_CONCEPT(report)
-	)
-	PRECONDITION(IS_TRUE(explore_command_issued) && 
-		(UPDATED(x1) && UPDATED(y1)) &&
-	  	(*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-		*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	DEFINE_SUBAGENTS(
-		SUBAGENT(ExpectExploreCommand, CExpectExploreCommand, "")
-		SUBAGENT(ExpectExploreX1, CExpectExploreX1, "")
-		SUBAGENT(ExpectExploreX2, CExpectExploreX2, "")
-		SUBAGENT(ExpectExploreX3, CExpectExploreX3, "")
-		SUBAGENT(ExpectExploreX4, CExpectExploreX4, "")
-		SUBAGENT(ExpectExploreX5, CExpectExploreX5, "")
-		SUBAGENT(ExpectExploreX6, CExpectExploreX6, "")
-		SUBAGENT(ExpectExploreX7, CExpectExploreX7, "")
-		SUBAGENT(ExpectExploreX8, CExpectExploreX8, "")
-		SUBAGENT(ExpectExploreX9, CExpectExploreX9, "")
-		SUBAGENT(ExpectExploreX10, CExpectX10, "")
-		SUBAGENT(ExpectExploreY1, CExpectExploreY1, "")
-		SUBAGENT(ExpectExploreY2, CExpectExploreY2, "")
-		SUBAGENT(ExpectExploreY3, CExpectExploreY3, "")
-		SUBAGENT(ExpectExploreY4, CExpectExploreY4, "")
-		SUBAGENT(ExpectExploreY5, CExpectExploreY5, "")
-		SUBAGENT(ExpectExploreY6, CExpectExploreY6, "")
-		SUBAGENT(ExpectExploreY7, CExpectExploreY7, "")
-		SUBAGENT(ExpectExploreY8, CExpectExploreY8, "")
-		SUBAGENT(ExpectExploreY9, CExpectExploreY9, "")
-		SUBAGENT(ExpectExploreY10, CExpectExploreY10, "")
-		SUBAGENT(ExecuteExplore, CExecuteExplore, "")
-		SUBAGENT(InformExploreReport, CInformExploreReport, "")
-	)
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreCommand
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectExploreCommand,
-	EXPECT_CONCEPT(explore_command_issued)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanExploreCommand]>true")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX1
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectExploreX1,
-	EXPECT_CONCEPT(x1)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanExploreCommand.x1]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX2
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectExploreX2,
-	EXPECT_CONCEPT(x2)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanExploreCommand.x2]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX3
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectExploreX3,
-	EXPECT_CONCEPT(x3)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanExploreCommand.x3]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX4
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectExploreX4,
-	EXPECT_CONCEPT(x4)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanExploreCommand.x4]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX5
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectExploreX5,
-	EXPECT_CONCEPT(x5)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanExploreCommand.x5]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX6
-//-----------------------------------------------------------------------------
-DEFINE_EXPECT_AGENT(CExpectExploreX6,
-	EXPECT_CONCEPT(x6)
-	//EXPECT_WHEN((*C("current_addressee").CreateMergedHistoryConcept() == C("robot_name") ||
-	//	*C("current_addressee").CreateMergedHistoryConcept() == C("everyone")))
-	GRAMMAR_MAPPING("[HumanExploreCommand.x6]")
-)
-
-//-----------------------------------------------------------------------------
-// /zap2/Task/Explore/ExpectExploreX7
-//-----------------------------------------------------------------------------

@@ Diff output truncated at 60000 characters. @@

More information about the TeamTalk-developers mailing list