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

Fix/units names datascience #582

Merged
merged 47 commits into from
Jul 27, 2023
Merged

Fix/units names datascience #582

merged 47 commits into from
Jul 27, 2023

Conversation

LucasDerReisende
Copy link
Collaborator

TODO Lucas

Depends on:

PR checklist

  • Acceptance criteria fulfilled
  • Additional features are tested
  • Docs (code, wiki & diagrams) updated
  • Breaking changes anounced
  • Added classes that inherit from BaseModel to src.constants.tables
  • Dev-branch has been merged into local branch to resolve conflicts
  • Tests and linter have passed AFTER local merge
  • Another dev reviewed and approved

SaturnHafen and others added 30 commits June 13, 2023 13:55
@SaturnHafen
fix: reimport the schwarze-pumpe...
ad2bf74 
...for better junctions
@SaturnHafen
reimport network to fix overlapping signals
70fe9ed
@LucasDerReisende
update edges in busStops
49f5b25
@SaturnHafen
fix: broken busStops
0b76132
@SaturnHafen
feat: import the demonstration network
bcbbed8
@LucasDerReisende
Merge branch 'dev' into fix/new-network-import
0a53815
@LucasDerReisende
create demonstration scenario
f6aa4f7
@SaturnHafen
Fix network import
5a7e5f0
@SaturnHafen
Merge branch 'fix/new-network-import' of github.com:BP2022-AP1/bp2022…
6d672da 
…-ap1 into fix/new-network-import
@LucasDerReisende
adapt additionals
0151551
@LucasDerReisende
update models
be902ea
@LucasDerReisende
add logs, update insert scripts
01e9df5
@LucasDerReisende
add pseudo stations
ebe1085
@antonykamp
feat: add configuration for demonstration
951988b
@antonykamp
revert: pseudo busstops
94357a1
@Lietze
moved methods
58a0a67
@Lietze
lint and format
bbe3f37
@LucasDerReisende
change verkehrsmenge to verkehrsarbeit
af0180f
@LucasDerReisende
maxSpeed for vTypes
f9b815e
@Lietze
fix test
4cd67f9
@Lietze
another test fix
d41b46d
@LucasDerReisende
rename block section to edge
1eb453e
@LucasDerReisende
fix lint
1d7a7f4
@LucasDerReisende
fix tests
3f1a911
@LucasDerReisende
Merge remote-tracking branch 'origin/feature/552-fix-train-enter-bloc…
ac0c56c 
…k-section-and-train-leave-block-section' into fix/units-names-datascience

# Conflicts:
#	.env.shared
#	src/data_science/data_science.py
#	tests/data_science/test_data_science.py
@LucasDerReisende
fix grafana functions/graphs
45b041a
@LucasDerReisende
update model files
2a95a37
@LucasDerReisende
fix units data science
b3d1758
@LucasDerReisende
fix no id available for gui
bd48d45
@LucasDerReisende
revert rearrange reservations
a2976de
@LucasDerReisende LucasDerReisende self-assigned this Jul 18, 2023
@LucasDerReisende LucasDerReisende linked an issue Jul 20, 2023 that may be closed by this pull request
Fix units in DataScience #551
Closed
2 tasks
@LucasDerReisende LucasDerReisende mentioned this pull request Jul 20, 2023
Closed
8 tasks
@LucasDerReisende
Merge branch 'dev' into fix/units-names-datascience
6eb4c43 
# Conflicts:
#	.env.shared
#	data/planpro/demonstration.ppxml
#	data/sumo/demonstration/sumo-config/demonstration.net.xml
#	data/sumo/demonstration/sumo-config/demonstration.routes.xml
#	src/data_science/data_science.py
#	src/interlocking_component/route_controller.py
#	src/wrapper/simulation_objects.py
#	tests/data_science/test_data_science.py
#	tests/interlocking_component/conftest.py
@LucasDerReisende
fix tests
00ca13a
@LucasDerReisende
fix demonstration simulation
2848a4a
@LucasDerReisende
change train type to cargo
fe4ecc5
@LucasDerReisende
Merge branch 'dev' into fix/units-names-datascience
092855a 
# Conflicts:
#	data/planpro/demonstration.ppxml
@LucasDerReisende
remove max_speed from demonstration.routes.xml
414196b
@LucasDerReisende
insert space character
5152eb0
@LucasDerReisende
rephrase error msg
99b1121
@LucasDerReisende
Fix Grafana Dashboards Config, Multi Config
0c1046f
@LucasDerReisende
fix edge length factor
63b4665
@LucasDerReisende
reformat
3d094e5
@LucasDerReisende
Merge branch 'dev' into fix/units-names-datascience
2aace40
CR1337
CR1337 approved these changes Jul 27, 2023
View reviewed changes
Copy link
Collaborator

@CR1337 CR1337 left a comment

Choose a reason for hiding this comment

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

👍

@LucasDerReisende LucasDerReisende merged commit 8bde760 into dev Jul 27, 2023
10 checks passed
@LucasDerReisende LucasDerReisende deleted the fix/units-names-datascience branch July 27, 2023 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CR1337 CR1337 CR1337 approved these changes

@SaturnHafen SaturnHafen Awaiting requested review from SaturnHafen

@antonykamp antonykamp Awaiting requested review from antonykamp

@Lietze Lietze Awaiting requested review from Lietze

@instant-sky instant-sky Awaiting requested review from instant-sky

Assignees

@LucasDerReisende LucasDerReisende

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix units in DataScience
5 participants
@LucasDerReisende @CR1337 @SaturnHafen @antonykamp @Lietze