Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Landscape Configuration #79

Merged
merged 192 commits into from
Apr 27, 2024
Merged

Landscape Configuration #79

merged 192 commits into from
Apr 27, 2024

Conversation

vanoha
Copy link
Contributor

@vanoha vanoha commented Feb 5, 2024 •
edited by StannisMod
Loading

Added LandscapeConfiguration - structure that could response on request about environment (the environment remains static over time), and LandGraph, that describes a graph of environment:

  • vertices - platforms, resource holders
  • edges - roads with own weight (length) and bandwidth

Developed algorithm of unrenewable resource delivery before the start of a work.
SupplyTimeline was developed to take into account the resources' of:

  • holders: materials (there is no way to make up for them), vehicles (renewable resources, because they could leave their holder and come back after delivery),
  • roads: vehicles (this is represents of road bandwidth, it is renewable resource)

PlatformTimeline is presented to avoid implementation difficult platforms' behaviour. The state of platform, that distributed over the time, has follow rules:

  • timestamp has resources that are left AFTER the work, that started at the time, obtain necessary materials,
  • the work can be scheduled at the timestamp A if ALL timestamps after 'A' can provide necessary materials (not other way).

Moreover, SimpleSynthetic was extended by LandscapeConfiguration generator based on obtained WorkGraph.

In addition, tests include flag about MaterialReq generation for each GraphNode in WorkGraph.

PlatformTimeline is the beginning of separation SupplyTimeline into individual timelines to consider the complex behaviour of each participant in evironment (holders, roads, vehicles, platforms).

Added examples that demonstrate the work with landscape generator and without it.

@StannisMod
Material planning started
5916612
@StannisMod
Material timeline pre-finished
9e51b07
@StannisMod
Integrated material timeline to Just-In-Time-Timeline
cfb4da4
@StannisMod
Added material delivery to ScheduledWork results
056c9c0
@StannisMod
Added material delivery handling to HEFT
4f23175
@StannisMod
Improved, but not finished material scheduling
da5ca78 
- Now we are searching resources in depots
- Now all the information of material delivery is recorded in resulting schedule
- Refactoring
@StannisMod
Trying to refactor material timeline
6274170
@StannisMod
First test for material planning passed!
153a382
@StannisMod
All tests for material planning passed!
8533fc9 
// TODO Fix writing down material planning info to the result
@StannisMod
First version of material delivery
4203a9a
@StannisMod
Material planning started
f019c42
@StannisMod
Material timeline pre-finished
0643eee
@StannisMod
Integrated material timeline to Just-In-Time-Timeline
37a59ed
@StannisMod
Added material delivery to ScheduledWork results
40c7922
@StannisMod
Added material delivery handling to HEFT
ce414ea
@StannisMod
Improved, but not finished material scheduling
423f400 
- Now we are searching resources in depots
- Now all the information of material delivery is recorded in resulting schedule
- Refactoring
@StannisMod
Trying to refactor material timeline
e76f4b8
@StannisMod
First test for material planning passed!
7e14394
@StannisMod
All tests for material planning passed!
27aef8c 
// TODO Fix writing down material planning info to the result
@StannisMod
First version of material delivery
75442cc
@StannisMod
Merge branch 'feature/landscape_geometry' of https://github.com/Indus…
fd98e89 
…trial-AI-Research-Lab/sampo into feature/landscape_geometry

# Conflicts:
#	sampo/scheduler/base.py
#	sampo/scheduler/heft/base.py
#	sampo/schemas/resources.py
#	sampo/schemas/works.py
@StannisMod
Material planning started
85178f4
@StannisMod
Material timeline pre-finished
be358c0
@StannisMod
Integrated material timeline to Just-In-Time-Timeline
54d3e94
@StannisMod
Added material delivery to ScheduledWork results
22242aa
@StannisMod
Added material delivery handling to HEFT
afb028d
@StannisMod
Improved, but not finished material scheduling
202de7b 
- Now we are searching resources in depots
- Now all the information of material delivery is recorded in resulting schedule
- Refactoring
@StannisMod
Trying to refactor material timeline
659552d
@StannisMod
First test for material planning passed!
7cb3051
@StannisMod
All tests for material planning passed!
40c94ef 
// TODO Fix writing down material planning info to the result
vanoha01 and others added 25 commits March 12, 2024 10:49
@vanoha01
Merge remote-tracking branch 'origin/feature/landscape_geometry' into…
b889764 
… feature/landscape_geometry
@vanoha01
Updated landscape generator
a70cf2f
@vanoha01
Updated just in time (rewriting find_min_start_time)
d9e5084
@vanoha01
Updated landscape generator (make it less stochastic to increase expe…
c9fbe76 
…riment representation)
@vanoha01
Fixed material timeline
2669f0a
@vanoha01
Experiment with road length in landscape generator
2731ef1
@vanoha01
Experiment with landscape generator
069ec4a
@vanoha01
Experiment with landscape generator
5772ae6
@vanoha
Merge remote-tracking branch 'origin/main' into feature/landscape_geo…
a7208f1 
…metry
@vanoha
Cleaned code and updated supply timeline to avoid work start time shi…
ee9ecae 
…fting after found this time and before scheduling.
@vanoha
Updated landscape generator
1f40b1e
@vanoha
Make find_min_start_time and deliver_materials in material timeline c…
999d1fa 
…onsistent
@vanoha
Fixed code
b9c477f
@vanoha
Fixed material timeline, that resolve bags with momentum timeline and…
7ba3828 
… changing start_time in scheduling part (after start time was found)
@vanoha
Computations were speed up
f7f3b0c
@vanoha01
Merge remote-tracking branch 'origin/feature/landscape_geometry' into…
b3397a1 
… feature/landscape_geometry

# Conflicts:
#	pyproject.toml
#	sampo/generator/environment/landscape.py
@vanoha01
Experiment with landscape generator
9ed2ab2
@vanoha01
Some cleaning code actions
6c3d544
@vanoha01
Added hybrid material delivery algorithm that compares results of 2 e…
6c4455b 
…xisted algos and chooses the best.
@vanoha01
Solve one bags
2c7b26b
@vanoha01
Added comments, optimize code in necessary places
77ac1fd
@vanoha01
Added comments, optimize code in necessary places, ready to push to main
92faac5
@vanoha01
Added comments, added example about landscape and experiments.
76c5ee6
@vanoha01
Upgraded tests for timelines and delete the generate landscape for bi…
3c61a39 
…g graphs
@vanoha01
Upgraded tests for timelines and delete the generate landscape for bi…
b663bf1 
…g graphs
@vanoha vanoha closed this Mar 25, 2024
@vanoha vanoha reopened this Mar 25, 2024
StannisMod
StannisMod approved these changes Apr 8, 2024
View reviewed changes
Copy link
Collaborator

@StannisMod StannisMod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@vanoha vanoha merged commit dc365c7 into main Apr 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@StannisMod StannisMod StannisMod approved these changes

@Timotshak Timotshak Awaiting requested review from Timotshak

Assignees
No one assigned
Labels
enhancement New feature or request examples refactor The rewriting of existing code to improve code quality
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@vanoha @StannisMod @vanoha01 @simpledumpling @Timotshak