Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
integrated-scheduling
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张晓彤
integrated-scheduling
Commits
3c2d53dd
Commit
3c2d53dd
authored
Sep 14, 2021
by
Allvey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
speed update debug
parent
dca1c2f1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
13 deletions
+22
-13
path_plannner.py
path_plan/path_plannner.py
+10
-3
realtime_dispatch.py
realtime_dispatch.py
+8
-6
settings.py
settings.py
+4
-4
No files found.
path_plan/path_plannner.py
View file @
3c2d53dd
...
...
@@ -48,11 +48,11 @@ class PathPlanner(WalkManage):
to_unload_cost
=
0
# 装载道路总成本初始化
to_load_cost
=
0
# 道路权重
weighted_distance
=
weighted_walk_cost
()
#
#
道路权重
#
weighted_distance = weighted_walk_cost()
# 修正因子
weight
=
10
0
weight
=
6
0
# 阻塞成本权重
alpha
=
0
# 距离成本权重
...
...
@@ -101,6 +101,10 @@ class PathPlanner(WalkManage):
to_unload_cost
=
alpha
*
cost_to_unload_blockage
+
beta
*
path
.
to_unload_distance
to_load_cost
=
alpha
*
cost_to_load_blockage
+
beta
*
path
.
to_load_distance
# print("拥堵因子-挖机")
# print(alpha, cost_to_load_blockage)
# print("拥堵因子-卸点")
# print(alpha, cost_to_unload_blockage)
except
Exception
as
es
:
logger
.
error
(
f
'道路{load_area_id + "-" +unload_area_id}行驶成本计算异常'
)
logger
.
error
(
es
)
...
...
@@ -136,6 +140,9 @@ class PathPlanner(WalkManage):
self
.
period_map_para_load
()
# 计算行驶成本前,更新路网速度信息
self
.
lane
.
lane_speed_generate
()
try
:
# 读取路网成本
for
walk_time
in
session_postgre
.
query
(
WalkTime
)
.
all
():
...
...
realtime_dispatch.py
View file @
3c2d53dd
...
...
@@ -393,6 +393,8 @@ class Dispatcher(WalkManage):
# 卸载设备可用时间
self
.
update_dump_ava_time
(
dump_reach_list
)
self
.
cost_to_excavator
,
self
.
cost_to_dump
,
self
.
cost_park_to_excavator
=
self
.
path
.
walk_cost
()
def
sim_para_reset
(
self
):
...
...
@@ -406,7 +408,7 @@ class Dispatcher(WalkManage):
rule3
=
session_mysql
.
query
(
DispatchRule
)
.
filter_by
(
id
=
3
)
.
first
()
.
disabled
rule4
=
session_mysql
.
query
(
DispatchRule
)
.
filter_by
(
id
=
4
)
.
first
()
.
disabled
cost_to_excavator
,
cost_to_dump
,
cost_park_to_excavator
=
self
.
path
.
walk_cost
()
#
cost_to_excavator, cost_to_dump, cost_park_to_excavator = self.path.walk_cost()
excavator_priority_coefficient
=
self
.
excavator
.
excavator_priority_coefficient
...
...
@@ -459,7 +461,7 @@ class Dispatcher(WalkManage):
if
truck_id
in
self
.
truck
.
truck_excavator_bind
:
target
=
self
.
excavator_uuid_to_index_dict
[
self
.
truck
.
truck_excavator_bind
[
truck_id
]]
else
:
transport_value
=
cost_park_to_excavator
transport_value
=
self
.
cost_park_to_excavator
logger
.
info
(
"transport_value"
)
logger
.
info
(
transport_value
)
...
...
@@ -514,7 +516,7 @@ class Dispatcher(WalkManage):
if
truck_id
in
self
.
truck
.
truck_material_bind
:
logger
.
info
(
self
.
truck
.
truck_material_bind
[
truck_id
])
logger
.
info
(
"驶往卸点的运输成本"
)
logger
.
info
(
cost_to_dump
)
logger
.
info
(
self
.
cost_to_dump
)
logger
.
info
(
"卸点物料修正"
)
logger
.
info
(
self
.
truck
.
dump_material_bind_modify
)
...
...
@@ -530,7 +532,7 @@ class Dispatcher(WalkManage):
break
else
:
if
rule3
and
rule4
:
transport_value
=
cost_to_dump
[:,
int
(
trip
[
1
])]
transport_value
=
self
.
cost_to_dump
[:,
int
(
trip
[
1
])]
else
:
transport_value
=
(
self
.
actual_goto_dump_traffic_flow
[
int
(
trip
[
1
]),
:]
+
0.001
)
\
/
(
self
.
opt_goto_dump_traffic_flow
[
int
(
trip
[
1
]),
:]
+
0.001
)
...
...
@@ -590,7 +592,7 @@ class Dispatcher(WalkManage):
if
truck_id
in
self
.
truck
.
truck_material_bind
:
logger
.
info
(
self
.
truck
.
truck_material_bind
[
truck_id
])
logger
.
info
(
"驶往挖机的运输成本"
)
logger
.
info
(
cost_to_excavator
)
logger
.
info
(
self
.
cost_to_excavator
)
logger
.
info
(
"挖机物料修正"
)
logger
.
info
(
self
.
truck
.
excavator_material_bind_modify
)
logger
.
info
(
"挖机优先级修正"
)
...
...
@@ -603,7 +605,7 @@ class Dispatcher(WalkManage):
target
=
self
.
excavator_uuid_to_index_dict
[
self
.
truck
.
truck_excavator_bind
[
truck_id
]]
else
:
if
rule3
and
rule4
:
transport_value
=
cost_to_excavator
[
int
(
trip
[
1
]),
:]
transport_value
=
self
.
cost_to_excavator
[
int
(
trip
[
1
]),
:]
else
:
transport_value
=
(
self
.
actual_goto_excavator_traffic_flow
[
trip
[
1
],
:]
+
0.001
)
\
/
(
self
.
opt_goto_excavator_traffic_flow
[
trip
[
1
],
:]
+
0.001
)
...
...
settings.py
View file @
3c2d53dd
...
...
@@ -27,8 +27,8 @@ import time
log_path
=
"/usr/local/fleet-log/dispatch"
# 创建日志目录
if
not
os
.
path
.
exists
(
log_path
):
os
.
mkdir
(
log_path
)
#
if not os.path.exists(log_path):
#
os.mkdir(log_path)
# logging初始化工作
logging
.
basicConfig
()
...
...
@@ -38,8 +38,8 @@ logger.setLevel(logging.INFO)
# timefilehandler = logging.handlers.TimedRotatingFileHandler(log_path + "/dispatch.log", when='M', interval=1, backupCount=60)
filehandler
=
logging
.
handlers
.
RotatingFileHandler
(
log_path
+
"/dispatch.log"
,
maxBytes
=
3
*
1024
*
1024
,
backupCount
=
10
)
#
filehandler = logging.handlers.RotatingFileHandler("./Logs/dispatch.log", maxBytes=3 * 1024 * 1024, backupCount=10)
#
filehandler = logging.handlers.RotatingFileHandler(log_path + "/dispatch.log", maxBytes=3*1024*1024, backupCount=10)
filehandler
=
logging
.
handlers
.
RotatingFileHandler
(
"./Logs/dispatch.log"
,
maxBytes
=
3
*
1024
*
1024
,
backupCount
=
10
)
# 设置后缀名称,跟strftime的格式一样
filehandler
.
suffix
=
"
%
Y-
%
m-
%
d_
%
H-
%
M.log"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment