Commit 40c4ed07 authored by 张晓彤's avatar 张晓彤

新增车辆空载及重载周期调度

parent 42011c50
...@@ -369,8 +369,7 @@ class DistributionRatio(object): ...@@ -369,8 +369,7 @@ class DistributionRatio(object):
@desc:计算分流配比模式下,卡车与卸载区的对应关系 @desc:计算分流配比模式下,卡车与卸载区的对应关系
""" """
# TODO: # TODO: 统一与预期等待时间的接口
# 统一与预期等待时间的接口
def __init__(self, exactor_id, truck): def __init__(self, exactor_id, truck):
self.truck = truck self.truck = truck
......
This diff is collapsed.
...@@ -121,8 +121,7 @@ class DispatchSubmission: ...@@ -121,8 +121,7 @@ class DispatchSubmission:
record = redis_format(truck_id, group_id, str(uuid.uuid1()), item) record = redis_format(truck_id, group_id, str(uuid.uuid1()), item)
# TODO: # TODO: 判断了两次是否拥堵,需要改善
# 判断了两次是否拥堵,需要改善
if self.topo is not None: if self.topo is not None:
......
...@@ -342,7 +342,8 @@ def truck_pass_first_area(truck_id, lane_id, closer_entrance_node_id, further_en ...@@ -342,7 +342,8 @@ def truck_pass_first_area(truck_id, lane_id, closer_entrance_node_id, further_en
size = len(que) size = len(que)
for _ in range(size): for _ in range(size):
cur_node = que.popleft() cur_node = que.popleft()
if cur_node is None: continue if cur_node is None:
continue
logger.info(cur_node) logger.info(cur_node)
if cur_node == closer_entrance_node_id: if cur_node == closer_entrance_node_id:
logger.info("closer_entrance_node") logger.info("closer_entrance_node")
......
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