Skip to content
Snippets Groups Projects
Commit 9d615b6b authored by Reeves, David E's avatar Reeves, David E
Browse files

* separated some states to make logging activities ok

parent 6bd6a877
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
scripts/HTN/Trees/Red/ConvoyUnit.xml
+ 62
− 3
View file @ 9d615b6b
...@@ -38,6 +38,8 @@ goalContainer.getCurrentExecutingStack().addReplanTrigger("GoalTracker_ConvoySet ...@@ -38,6 +38,8 @@ goalContainer.getCurrentExecutingStack().addReplanTrigger("GoalTracker_ConvoySet
goalContainer.getCurrentExecutingStack().addReplanTrigger("GoalTracker_ConvoySetupComplete") goalContainer.getCurrentExecutingStack().addReplanTrigger("GoalTracker_ConvoySetupComplete")
goalContainer.getCurrentExecutingStack().addReplanTrigger("GoalTracker_ConvoyReturn") goalContainer.getCurrentExecutingStack().addReplanTrigger("GoalTracker_ConvoyReturn")
goalContainer.getCurrentExecutingStack().addReplanTrigger("GoalTracker_ReturnCompleted") goalContainer.getCurrentExecutingStack().addReplanTrigger("GoalTracker_ReturnCompleted")
goalContainer.getCurrentExecutingStack().addReplanTrigger("GoalTracker_ConvoyPackUp")
goalContainer.getCurrentExecutingStack().addReplanTrigger("GoalTracker_ConvoyPackUpComplete")
</Code> </Code>
<Import /> <Import />
</HTNNode> </HTNNode>
...@@ -144,6 +146,11 @@ if len(borg.redConvoysWaiting[state.getCurrentUnit().getName()])==0: ...@@ -144,6 +146,11 @@ if len(borg.redConvoysWaiting[state.getCurrentUnit().getName()])==0:
cmdName = state.getCurrentCommander().getAssignedName() cmdName = state.getCurrentCommander().getAssignedName()
SendEntityEvent(cmdName, "GoalTracker_ConvoySetup", []) SendEntityEvent(cmdName, "GoalTracker_ConvoySetup", [])
borg.delay=1.0 borg.delay=1.0
#################################
# logging info
borg.redUnitActivity[state.getCurrentUnitName()]="MOVE_TO_DEPLOYMENT_SITE"
</Code> </Code>
<Import /> <Import />
</HTNNode> </HTNNode>
...@@ -205,9 +212,61 @@ if borg.redUnitStatus[state.getCurrentUnitName()]==setupNum: ...@@ -205,9 +212,61 @@ if borg.redUnitStatus[state.getCurrentUnitName()]==setupNum:
rn = PythonUtilities._py_getRandomNumber("UNIFORM", [0.0, 1.0]) rn = PythonUtilities._py_getRandomNumber("UNIFORM", [0.0, 1.0])
rn = (1.5 + rn * 2.5) * 14400.0 rn = (1.5 + rn * 2.5) * 14400.0
rn = 60.0 #00000.0 rn = 60.0 #00000.0
SendEntityEventDelay(info.getMyAssignedName(), "GoalTracker_ConvoyReturn", [], rn) # SendEntityEventDelay(info.getMyAssignedName(), "GoalTracker_ConvoyReturn", [], rn)
printMessage("Convoy setup complete: "+str(state.getCurrentUnitName()), True) # printMessage("Convoy setup complete: "+str(state.getCurrentUnitName()), True)
borg.delay=0 # borg.delay=0
# commander name
cmdName=""
if state.isCommander():
cmdName = info.getMyAssignedName()
else:
cmdName = state.getCurrentCommander().getAssignedName()
SendEntityEventDelay(cmdName, "GoalTracker_ConvoyPackUp", [], rn)
</Code>
<Import />
</HTNNode>
</HTNNode>
<HTNNode AllowMsg="true" Name="isGoalTracker_ConvoyPackUp" Type="DEFAULT">
<Parent>isGoalTracker_ConvoyReturn</Parent>
<Code IsFile="false">if state.getLastTrigger() == "doGoalTracker_ConvoyPackUp":
_htn_precon_ret=1
</Code>
<Import />
<HTNNode AllowMsg="true" Name="packUp" Type="INTERRUPT">
<Parent>isGoalTracker_ConvoyPackUp</Parent>
<Code IsFile="false">import cxxi.model.behavior.PythonUtilities as PythonUtilities
from HTNBehaviors import SendEntityEventDelay
# commander name
cmdName=""
if state.isCommander():
cmdName = info.getMyAssignedName()
else:
cmdName = state.getCurrentCommander().getAssignedName()
SendEntityEventDelay(cmdName, "GoalTracker_ConvoyPackUpComplete", [], 300.0)
printMessage("Convoy packing up: "+str(state.getCurrentUnitName()), True)
borg.delay=0
</Code>
<Import />
</HTNNode>
</HTNNode>
<HTNNode AllowMsg="true" Name="isGoalTracker_ConvoyPackUpComplete" Type="DEFAULT">
<Parent>isGoalTracker_ConvoyReturn</Parent>
<Code IsFile="false">if state.getLastTrigger() == "doGoalTracker_ConvoyPackUpComplete":
_htn_precon_ret=1
</Code>
<Import />
<HTNNode AllowMsg="true" Name="packUpComplete" Type="INTERRUPT">
<Parent>isGoalTracker_ConvoyPackUp</Parent>
<Code IsFile="false">import cxxi.model.behavior.PythonUtilities as PythonUtilities
from HTNBehaviors import SendEntityEventDelay
SendEntityEventDelay(info.getMyAssignedName(), "GoalTracker_ConvoyReturn", [], rn)
printMessage("Convoy pack up complete: "+str(state.getCurrentUnitName()), True)
borg.delay=0
</Code> </Code>
<Import /> <Import />
</HTNNode> </HTNNode>
......
scripts/HTN/Trees/Red/RedForceCoordinator.xml
+ 51
− 48
View file @ 9d615b6b
...@@ -18,6 +18,9 @@ borg.redConvoyDest=dict() ...@@ -18,6 +18,9 @@ borg.redConvoyDest=dict()
borg.redFormsByUnit=dict() borg.redFormsByUnit=dict()
borg.redUnitStatus=dict() borg.redUnitStatus=dict()
# for logging
borg.redUnitActivity=dict()
borg.redDestinations=["PATH_DEST1", "PATH_DEST2","PATH_DEST3","PATH_DEST4","PATH_DEST5","PATH_DEST6","PATH_DEST7","PATH_DEST8","PATH_DEST9"] borg.redDestinations=["PATH_DEST1", "PATH_DEST2","PATH_DEST3","PATH_DEST4","PATH_DEST5","PATH_DEST6","PATH_DEST7","PATH_DEST8","PATH_DEST9"]
</Code> </Code>
<Import /> <Import />
...@@ -245,60 +248,60 @@ UtilityFuncsExp.scheduleEvent( ...@@ -245,60 +248,60 @@ UtilityFuncsExp.scheduleEvent(
0.001, 0.001,
al) al)
al = ArrayList() #al = ArrayList()
al.add("bigellipse") #al.add("bigellipse")
al.add("FIRE_CONTROL_RADAR") #al.add("FIRE_CONTROL_RADAR")
al.add("FIRE_CONTROL_RADAR") #al.add("FIRE_CONTROL_RADAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
#
#UtilityFuncsExp.scheduleEvent( #UtilityFuncsExp.scheduleEvent(
# dm, # dm,
# info.getMyAssignedName(), # info.getMyAssignedName(),
# "GoalTracker_CreateConvoy", # "GoalTracker_CreateConvoy",
# 5, # 5,
# al) # al)
#
al = ArrayList() #al = ArrayList()
al.add("bigbox") #al.add("bigbox")
al.add("FIRE_CONTROL_RADAR") #al.add("FIRE_CONTROL_RADAR")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("SPT_VEH") #al.add("SPT_VEH")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
al.add("TELAR") #al.add("TELAR")
#
#UtilityFuncsExp.scheduleEvent( #UtilityFuncsExp.scheduleEvent(
# dm, # dm,
# info.getMyAssignedName(), # info.getMyAssignedName(),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment