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
eb0d2a57
Commit
eb0d2a57
authored
Oct 29, 2021
by
Allvey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复循环调用BUG
parent
28c1a28b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
realtime_dispatch.py
realtime_dispatch.py
+4
-1
traffic_flow_info.py
traffic_flow/traffic_flow_info.py
+0
-1
No files found.
realtime_dispatch.py
View file @
eb0d2a57
...
@@ -377,7 +377,10 @@ class Dispatcher(WalkManage):
...
@@ -377,7 +377,10 @@ class Dispatcher(WalkManage):
self
.
cur_excavator_real_mass
=
np
.
zeros
(
self
.
excavator
)
self
.
cur_excavator_real_mass
=
np
.
zeros
(
self
.
excavator
)
self
.
cur_dump_real_mass
=
np
.
zeros
(
self
.
dump
)
self
.
cur_dump_real_mass
=
np
.
zeros
(
self
.
dump
)
traf_para
=
Traffic_para
(
self
.
excavator
,
self
.
dump
,
self
.
excavator
,
self
.
dump
)
# traf_para = Traffic_para(self.excavator, self.dump, self.excavator, self.dump)
num_load
=
len
(
set
(
update_load_area
()))
num_unload
=
len
(
set
(
update_unload_area
()))
traf_para
=
Traffic_para
(
num_load
,
num_unload
,
self
.
excavator
,
self
.
dump
)
self
.
excavator_target_mass
=
traf_para
.
get_target_excavator_mass
()
self
.
excavator_target_mass
=
traf_para
.
get_target_excavator_mass
()
self
.
dump_target_mass
=
traf_para
.
get_target_dump_mass
()
self
.
dump_target_mass
=
traf_para
.
get_target_dump_mass
()
...
...
traffic_flow/traffic_flow_info.py
View file @
eb0d2a57
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
# @Software: PyCharm
# @Software: PyCharm
# import
# import
from
traffic_flow.traffic_flow_planner
import
*
from
path_plan.path_plannner
import
*
from
path_plan.path_plannner
import
*
from
para_config
import
*
from
para_config
import
*
from
equipment.excavator
import
ExcavatorInfo
from
equipment.excavator
import
ExcavatorInfo
...
...
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