Commit 9bc1e4f3 authored by 虢奥's avatar 虢奥

config增加调度因子

parent b16e9d5d
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
}, },
"gothrough": { "gothrough": {
"closer_area_name": "1025装载区05", "closer_area_name": "1025装载区05",
"further_area_name": "1025装载区-03" "further_area_name": "1025装载区-03",
"factor": "0.4"
} }
} }
\ No newline at end of file
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
from data.para_config import * from data.para_config import *
from data.dispatchInfo import DispatchInfo from data.dispatchInfo import DispatchInfo
import uuid import uuid
import json
def area_choose(excavators_id, closer_area_id, further_area_id, further_lane_set, closer_lane_set, def area_choose(excavators_id, closer_area_id, further_area_id, further_lane_set, closer_lane_set,
...@@ -111,6 +112,9 @@ def area_choose(excavators_id, closer_area_id, further_area_id, further_lane_set ...@@ -111,6 +112,9 @@ def area_choose(excavators_id, closer_area_id, further_area_id, further_lane_set
# logger.info("近端挖机排队时间短, 调度车辆前往") # logger.info("近端挖机排队时间短, 调度车辆前往")
# target_excavator = DispatchInfo.load_excavator_dict[closer_area_id] # target_excavator = DispatchInfo.load_excavator_dict[closer_area_id]
# # truck_dispatch_to_redis(request_truck_id, group_id, DispatchInfo.load_excavator_dict[closer_area_id]) # # truck_dispatch_to_redis(request_truck_id, group_id, DispatchInfo.load_excavator_dict[closer_area_id])
load_value = json.load(f)
gothrough_config_area = load_value["gothrough"]
dispatch_factor = gothrough_config_area["closer_area_name"]
# 近端挖机空闲 # 近端挖机空闲
if closer_excavator_state == 0: if closer_excavator_state == 0:
...@@ -118,7 +122,7 @@ def area_choose(excavators_id, closer_area_id, further_area_id, further_lane_set ...@@ -118,7 +122,7 @@ def area_choose(excavators_id, closer_area_id, further_area_id, further_lane_set
target_excavator = DispatchInfo.load_excavator_dict[closer_area_id] target_excavator = DispatchInfo.load_excavator_dict[closer_area_id]
# truck_dispatch_to_redis(request_truck_id, group_id, DispatchInfo.load_excavator_dict[closer_area_id]) # truck_dispatch_to_redis(request_truck_id, group_id, DispatchInfo.load_excavator_dict[closer_area_id])
# 近端挖机不空闲但是远端挖机已满载 # 近端挖机不空闲但是远端挖机已满载
elif closer_excavator_state != 0 and goto_further_area_num >= int(0.6*arrival_truck_num): elif closer_excavator_state != 0 and goto_further_area_num >= int(dispatch_factor*arrival_truck_num):
logger.info("远端挖机满载, 调度车辆前往近端装载区") logger.info("远端挖机满载, 调度车辆前往近端装载区")
target_excavator = DispatchInfo.load_excavator_dict[closer_area_id] target_excavator = DispatchInfo.load_excavator_dict[closer_area_id]
# 近端挖机满载,只能派往远端挖机 # 近端挖机满载,只能派往远端挖机
......
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