From e02b9dc77a76d65e75bb921b19d7fc9e617eb9c3 Mon Sep 17 00:00:00 2001
From: "dereeves@nps.edu" <dereeves@nps.edu>
Date: Tue, 23 Mar 2021 17:08:28 -0700
Subject: [PATCH] * changed terrain to search path for data directory * fixed
boolean error when logging 'isTransmitting' flag
---
scripts/HTN/Trees/Red/RedForceCoordinator.xml | 8 +++++---
scripts/HTNBehaviors.py | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/scripts/HTN/Trees/Red/RedForceCoordinator.xml b/scripts/HTN/Trees/Red/RedForceCoordinator.xml
index dc2d19b..4bb96b8 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 92d9207..e6b9db7 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
--
GitLab