diff --git a/scripts/HTN/Trees/Red/RedForceCoordinator.xml b/scripts/HTN/Trees/Red/RedForceCoordinator.xml index dc2d19b010c7acdc88fe421472f92ab4c66b9de9..4bb96b81b505ed9e04ce6141ba4efb59640621bf 100644 --- a/scripts/HTN/Trees/Red/RedForceCoordinator.xml +++ b/scripts/HTN/Trees/Red/RedForceCoordinator.xml @@ -141,14 +141,16 @@ import mtry.cxxi.model.HierarchicalTaskNetwork.PythonUtilities.AStarCM.TerrainNe import mtry.cxxi.model.HierarchicalTaskNetwork.PythonUtilities.AStarCM.TerrainNetwork.TerrainNetworkSerializer as TerrainNetworkSerializer import mtry.cxxi.model.HierarchicalTaskNetwork.PythonUtilities.AStarCM.TerrainNetwork.TerrainSearch as TerrainSearch -roadPath = "D:/code_base/scenario_sandbox/TerrainReasoning/NewTests/IADS/scripts/data/" +#roadPath = "D:/code_base/scenario_sandbox/TerrainReasoning/NewTestsfart/IADS/scripts/data/" # loading a road network -borg.roadNetwork = TerrainNetworkSerializer.loadNetwork(roadPath+"road_edges", True) +#borg.roadNetwork = TerrainNetworkSerializer.loadNetwork(roadPath+"road_edges", True) +borg.roadNetwork = TerrainNetworkSerializer.loadNetwork("road_edges", True) borg.roadNetwork.printStats() # if not borg.roadNetwork.wasDeserialized: - TerrainNetworkSerializer.saveNetwork(borg.roadNetwork, roadPath+"road_edges.srz") +# TerrainNetworkSerializer.saveNetwork(borg.roadNetwork, roadPath+"road_edges.srz") + TerrainNetworkSerializer.saveNetwork(borg.roadNetwork, "road_edges.srz") # # load a dynamic network diff --git a/scripts/HTNBehaviors.py b/scripts/HTNBehaviors.py index 92d9207cf1bf2a16a434f5a756dacc7b0cea1ae7..e6b9db72f1a7985e4f56bc3203982f0ae4d5859d 100644 --- a/scripts/HTNBehaviors.py +++ b/scripts/HTNBehaviors.py @@ -30,7 +30,7 @@ def IsTransmitting(unitName, isCommander): if activityName == "MOVE_TO_DEPLOYMENT_SITE" and not isCommander and (elapsedTime >= 300 and elapsedTime <= 310): return True - elif activityName == "OPERATE_AT_SITE" and isCommander (elapsedTime >= 3600 and elapsedTime <= 3610): + elif activityName == "OPERATE_AT_SITE" and isCommander and (elapsedTime >= 3600 and elapsedTime <= 3610): return True else: return False