Skip to content

I
integrated-scheduling-v3
Commit cd3346f6 authored by Allvey's avatar Allvey
Browse files
Options

修复新版地图二次调度异常

parent bd837d18
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 45 deletions
graph/topo_graph.py
View file @ cd3346f6
...@@ -140,28 +140,36 @@ class Topo(): ...@@ -140,28 +140,36 @@ class Topo():
# item = [[load_area_id, unload_area_id], to_unload_lanes, to_load_lanes] # item = [[load_area_id, unload_area_id], to_unload_lanes, to_load_lanes]
# path_node_for_trip= [] # path_node_for_trip= []
# unload_G try:
Exitnode_for_digging = str(
session_postgre.query(DiggingWorkArea).filter_by(FeatureId=item[0][0], MapVersion=map_version).first().ExitNodeId) # unload_G
digging_name = str( Exitnode_for_digging = str(
session_postgre.query(DiggingWorkArea).filter_by(FeatureId=item[0][0], MapVersion=map_version).first().Name) session_postgre.query(DiggingWorkArea).filter_by(FeatureId=item[0][0], MapVersion=map_version).first().ExitNodeId)
Entrancenode_for_dump = str(session_postgre.query(DumpArea).filter_by(FeatureId=item[0][1], MapVersion=map_version).first().EntranceNodeId) digging_name = str(
dump_name = str(session_postgre.query(DumpArea).filter_by(FeatureId=item[0][1], MapVersion=map_version).first().Name) session_postgre.query(DiggingWorkArea).filter_by(FeatureId=item[0][0], MapVersion=map_version).first().Name)
self.unload_G.add_node(Exitnode_for_digging, name='digging', type=digging_name) Entrancenode_for_dump = str(session_postgre.query(DumpArea).filter_by(FeatureId=item[0][1], MapVersion=map_version).first().EntranceNodeId)
self.unload_G.add_node(Entrancenode_for_dump, name='group_dumps', type=dump_name) dump_name = str(session_postgre.query(DumpArea).filter_by(FeatureId=item[0][1], MapVersion=map_version).first().Name)
self.unload_G.add_node(Exitnode_for_digging, name='digging', type=digging_name)
logger.info(f'unload route start digging name: %s' % digging_name) self.unload_G.add_node(Entrancenode_for_dump, name='group_dumps', type=dump_name)
logger.info(f'unload route end dump name: %s' % dump_name)
logger.info(f'unload route start digging name: %s' % digging_name)
# path_node_for_trip.append(Exitnode_for_digging) # add start node for trip logger.info(f'unload route end dump name: %s' % dump_name)
# find the exitnodeid for diggingarea, find the entrancenodeid for dumparea # path_node_for_trip.append(Exitnode_for_digging) # add start node for trip
if Exitnode_for_digging not in self.unload_G_all_nodes:
self.unload_G_all_nodes.append(Exitnode_for_digging) # find the exitnodeid for diggingarea, find the entrancenodeid for dumparea
self.unload_G_digging_nodes.append(Exitnode_for_digging) if Exitnode_for_digging not in self.unload_G_all_nodes:
if Entrancenode_for_dump not in self.unload_G_all_nodes: self.unload_G_all_nodes.append(Exitnode_for_digging)
self.unload_G_all_nodes.append(Entrancenode_for_dump) self.unload_G_digging_nodes.append(Exitnode_for_digging)
self.unload_G_dump_nodes.append(Entrancenode_for_dump) if Entrancenode_for_dump not in self.unload_G_all_nodes:
self.unload_G_all_nodes.append(Entrancenode_for_dump)
self.unload_G_dump_nodes.append(Entrancenode_for_dump)
except Exception as es:
self.logger.error(es)
self.logger.error("读取卸载区入场点出错")
session_mysql.rollback()
session_postgre.rollback()
try: try:
unload_saved_lane = [] unload_saved_lane = []
...@@ -215,27 +223,35 @@ class Topo(): ...@@ -215,27 +223,35 @@ class Topo():
# path_node_for_trip.append(Exitnode_for_digging) # add node for trip # path_node_for_trip.append(Exitnode_for_digging) # add node for trip
# if lane_endpoint in self.unload_G_dump_nodes: # if lane_endpoint in self.unload_G_dump_nodes:
# load_G try:
Entrancenode_for_digging = str(
session_postgre.query(DiggingWorkArea).filter_by(FeatureId=item[0][0], MapVersion=map_version).first().EntranceNodeId) # load_G
digging_name = str( Entrancenode_for_digging = str(
session_postgre.query(DiggingWorkArea).filter_by(FeatureId=item[0][0], MapVersion=map_version).first().Name) session_postgre.query(DiggingWorkArea).filter_by(FeatureId=item[0][0], MapVersion=map_version).first().EntranceNodeId)
Exitnode_for_dump = str(session_postgre.query(DumpArea).filter_by(FeatureId=item[0][1], MapVersion=map_version).first().ExitNodeId) digging_name = str(
dump_name = str(session_postgre.query(DumpArea).filter_by(FeatureId=item[0][1], MapVersion=map_version).first().Name) session_postgre.query(DiggingWorkArea).filter_by(FeatureId=item[0][0], MapVersion=map_version).first().Name)
Exitnode_for_dump = str(session_postgre.query(DumpArea).filter_by(FeatureId=item[0][1], MapVersion=map_version).first().ExitNodeId)
logger.info(f'load route start dump name: %s' % dump_name) dump_name = str(session_postgre.query(DumpArea).filter_by(FeatureId=item[0][1], MapVersion=map_version).first().Name)
logger.info(f'load route end digging name: %s' % digging_name)
logger.info(f'load route start dump name: %s' % dump_name)
# find the exit node_id for digging_area, entrance node_id for dumparea, logger.info(f'load route end digging name: %s' % digging_name)
if Exitnode_for_dump not in self.load_G_all_nodes:
self.load_G_all_nodes.append(Exitnode_for_dump) # find the exit node_id for digging_area, entrance node_id for dumparea,
self.load_G_dump_nodes.append(Exitnode_for_dump) if Exitnode_for_dump not in self.load_G_all_nodes:
if Entrancenode_for_digging not in self.load_G_all_nodes: self.load_G_all_nodes.append(Exitnode_for_dump)
self.load_G_all_nodes.append(Entrancenode_for_digging) self.load_G_dump_nodes.append(Exitnode_for_dump)
self.load_G_digging_nodes.append(Entrancenode_for_digging) if Entrancenode_for_digging not in self.load_G_all_nodes:
self.load_G_all_nodes.append(Entrancenode_for_digging)
self.load_G.add_node(Exitnode_for_dump, name='group_dumps', type=dump_name) self.load_G_digging_nodes.append(Entrancenode_for_digging)
self.load_G.add_node(Entrancenode_for_digging, name='digging', type=digging_name)
self.load_G.add_node(Exitnode_for_dump, name='group_dumps', type=dump_name)
self.load_G.add_node(Entrancenode_for_digging, name='digging', type=digging_name)
except Exception as es:
self.logger.error(es)
self.logger.error("读取装载区入场点出错")
session_mysql.rollback()
session_postgre.rollback()
try: try:
load_saved_lane = [] load_saved_lane = []
......
versiontag.py
View file @ cd3346f6
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# @File : versiontag.py.py # @File : versiontag.py.py
# @Software: PyCharm # @Software: PyCharm
VERSION_TAG = '81' VERSION_TAG = '82'
\ No newline at end of file \ No newline at end of file
Markdown is supported
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