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.

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

MS: Master Thesis Dev #782

Draft
wants to merge 62 commits into
base: dev
Choose a base branch
from
Draft

MS: Master Thesis Dev #782

wants to merge 62 commits into from

Conversation

staudtMarius
Copy link
Member

Note MS: This is just a temporal branch for all the changes I make during my master thesis. This branch should not be merged.

@staudtMarius staudtMarius self-assigned this Apr 6, 2024
staudtMarius and others added 28 commits April 12, 2024 15:06
# Conflicts:
#	src/main/scala/edu/ie3/simona/agent/grid/DBFSAlgorithm.scala
#	src/main/scala/edu/ie3/simona/agent/grid/GridAgent.scala
# Conflicts:
#	src/main/scala/edu/ie3/simona/config/SimonaConfig.scala
staudtMarius and others added 30 commits May 24, 2024 13:01
…-dbfs' into ms/ma-thesis-dev

# Conflicts:
#	CHANGELOG.md
# Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/config/ConfigFailFast.scala
#	src/main/scala/edu/ie3/simona/service/weather/SampleWeatherSource.scala
#	src/test/scala/edu/ie3/simona/service/weather/WeatherSourceSpec.scala
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant