Skip to content

I
integrated-scheduling-v3
Commit 11c09e4a authored by 张晓彤's avatar 张晓彤
Browse files
Options

修改饱和度逻辑

parent 8fb3447f
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 79 deletions
algorithm.py
View file @ 11c09e4a
......@@ -119,81 +119,81 @@ class ScheduleAlg(WalkManage):
return transport_value
def traffic_plan_schedule(self, current_truck):
traffic_value = None
truck_id = current_truck.get_truck_id()
group_id = current_truck.get_group_id()
task = current_truck.get_task()
trip = current_truck.get_trip()
if task in [0, 1, 2]:
excavator_index = int(trip[1])
excavator_id = self._excavator.excavator_index_to_uuid_dict[excavator_index]
group_excavator_index = self._group.group_excavator_uuid_to_index_dict[group_id][excavator_id]
try:
# 计算 group actual traffic flow
group_actual_goto_dump_traffic_flow = self._group.group_actual_goto_dump_traffic_flow[
group_id]
# 计算 group actual traffic flow
group_opt_goto_dump_traffic_flow = self._group.group_opt_goto_dump_traffic_flow[group_id]
self.logger.info("驶往卸点分组车流")
self.logger.info(group_actual_goto_dump_traffic_flow)
self.logger.info(group_opt_goto_dump_traffic_flow)
try:
traffic_value = (group_actual_goto_dump_traffic_flow[group_excavator_index, :] + 0.001) \
/ (group_opt_goto_dump_traffic_flow[group_excavator_index, :] + 0.001)
except Exception as es:
self.logger.error("error09")
self.logger.error(es)
except Exception as es:
self.logger.error("error11")
self.logger.error(es)
self.logger.info("traffic_value")
self.logger.info(traffic_value)
self.logger.info("dump_material_bind_modify")
self.logger.info(self._truck.dump_material_bind_modify[self.truck_uuid_to_index_dict[truck_id]])
elif task in [3, 4, 5]:
dump_index = int(trip[1])
dump_id = self._dump.dump_uuid_to_index_dict[dump_index]
group_dump_index = self._group.group_dump_uuid_to_index_dict[group_id][dump_id]
# 提取group actual traffic flow
group_actual_goto_excavator_traffic_flow = self._group.group_actual_goto_excavator_traffic_flow[
group_id]
# 提取group actual traffic flow
group_opt_goto_excavator_traffic_flow = self._group.group_opt_goto_excavator_traffic_flow[
group_id]
self.logger.info("驶往挖机分组车流")
self.logger.info(group_actual_goto_excavator_traffic_flow)
self.logger.info(group_opt_goto_excavator_traffic_flow)
traffic_value = (group_actual_goto_excavator_traffic_flow[group_dump_index, :] + 0.001) \
/ (group_opt_goto_excavator_traffic_flow[group_dump_index, :] + 0.001)
# transport_value = (self.actual_goto_excavator_traffic_flow[trip[1], :] + 0.001) \
# / (self.opt_goto_excavator_traffic_flow[trip[1], :] + 0.001)
self.logger.info("traffic_value")
self.logger.info(traffic_value)
return traffic_value
# def traffic_plan_schedule(self, current_truck):
#
# traffic_value = None
#
# truck_id = current_truck.get_truck_id()
#
# group_id = current_truck.get_group_id()
#
# task = current_truck.get_task()
#
# trip = current_truck.get_trip()
#
# if task in [0, 1, 2]:
#
# excavator_index = int(trip[1])
# excavator_id = self._excavator.excavator_index_to_uuid_dict[excavator_index]
#
# group_excavator_index = self._group.group_excavator_uuid_to_index_dict[group_id][excavator_id]
#
# try:
#
# # 计算 group actual traffic flow
# group_actual_goto_dump_traffic_flow = self._group.group_actual_goto_dump_traffic_flow[
# group_id]
#
# # 计算 group actual traffic flow
# group_opt_goto_dump_traffic_flow = self._group.group_opt_goto_dump_traffic_flow[group_id]
#
# self.logger.info("驶往卸点分组车流")
# self.logger.info(group_actual_goto_dump_traffic_flow)
# self.logger.info(group_opt_goto_dump_traffic_flow)
#
# try:
# traffic_value = (group_actual_goto_dump_traffic_flow[group_excavator_index, :] + 0.001) \
# / (group_opt_goto_dump_traffic_flow[group_excavator_index, :] + 0.001)
# except Exception as es:
# self.logger.error("error09")
# self.logger.error(es)
#
# except Exception as es:
# self.logger.error("error11")
# self.logger.error(es)
# self.logger.info("traffic_value")
# self.logger.info(traffic_value)
# self.logger.info("dump_material_bind_modify")
# self.logger.info(self._truck.dump_material_bind_modify[self.truck_uuid_to_index_dict[truck_id]])
#
# elif task in [3, 4, 5]:
#
# dump_index = int(trip[1])
# dump_id = self._dump.dump_uuid_to_index_dict[dump_index]
#
# group_dump_index = self._group.group_dump_uuid_to_index_dict[group_id][dump_id]
#
# # 提取group actual traffic flow
# group_actual_goto_excavator_traffic_flow = self._group.group_actual_goto_excavator_traffic_flow[
# group_id]
#
# # 提取group actual traffic flow
# group_opt_goto_excavator_traffic_flow = self._group.group_opt_goto_excavator_traffic_flow[
# group_id]
#
# self.logger.info("驶往挖机分组车流")
# self.logger.info(group_actual_goto_excavator_traffic_flow)
# self.logger.info(group_opt_goto_excavator_traffic_flow)
#
# traffic_value = (group_actual_goto_excavator_traffic_flow[group_dump_index, :] + 0.001) \
# / (group_opt_goto_excavator_traffic_flow[group_dump_index, :] + 0.001)
#
# # transport_value = (self.actual_goto_excavator_traffic_flow[trip[1], :] + 0.001) \
# # / (self.opt_goto_excavator_traffic_flow[trip[1], :] + 0.001)
# self.logger.info("traffic_value")
# self.logger.info(traffic_value)
#
# return traffic_value
def saturation_schedule(self, current_truck):
......
path_plan/path_plannner.py
View file @ 11c09e4a
......@@ -151,7 +151,7 @@ class PathPlanner(WalkManage):
return lane_blockage
def walk_cost_cal(self, with_congestion=True):
def walk_cost_cal(self):
self.excavator.para_period_update()
......@@ -170,8 +170,6 @@ class PathPlanner(WalkManage):
# 计算行驶成本前，更新路网速度信息
self.lane.lane_speed_generate()
# if with_congestion:
try:
# 读取路网成本
for walk_time in session_postgre.query(WalkTime).all():
......
tables.py
View file @ 11c09e4a
......@@ -25,7 +25,7 @@ with open(json_file) as f:
with open(json_file) as f:
postgre_config = json.load(f)["postgresql"]
logger = get_logger("zxt.tables")
# # 创建对象的基类:
# Base = declarative_base()
......
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