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

* changed terrain to search path for data directory

* fixed boolean error when logging 'isTransmitting' flag
parent 469c6968
No related branches found
No related tags found
No related merge requests found
...@@ -141,14 +141,16 @@ import mtry.cxxi.model.HierarchicalTaskNetwork.PythonUtilities.AStarCM.TerrainNe ...@@ -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.TerrainNetworkSerializer as TerrainNetworkSerializer
import mtry.cxxi.model.HierarchicalTaskNetwork.PythonUtilities.AStarCM.TerrainNetwork.TerrainSearch as TerrainSearch 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 # 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() borg.roadNetwork.printStats()
# #
if not borg.roadNetwork.wasDeserialized: 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 # load a dynamic network
......
...@@ -30,7 +30,7 @@ def IsTransmitting(unitName, isCommander): ...@@ -30,7 +30,7 @@ def IsTransmitting(unitName, isCommander):
if activityName == "MOVE_TO_DEPLOYMENT_SITE" and not isCommander and (elapsedTime >= 300 and elapsedTime <= 310): if activityName == "MOVE_TO_DEPLOYMENT_SITE" and not isCommander and (elapsedTime >= 300 and elapsedTime <= 310):
return True 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 return True
else: else:
return False return False
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment