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

Parse household initialization data #104

Merged
merged 18 commits into from
Oct 24, 2023
Merged

Parse household initialization data #104

merged 18 commits into from
Oct 24, 2023

Conversation

t-ober
Copy link
Contributor

@t-ober t-ober commented Apr 12, 2023

Resolves #55

@t-ober
Merge branch 'main' into to/#55-hh-input-2
85f117b 
# Conflicts:
#	.github/workflows/simple-ci.yml
#	markovs_household/data/usage_probabilities.py
#	poetry.lock
#	pyproject.toml
#	tests/data/test_switch_on_probablity.py
@t-ober
merge main
dd8ab8c
@t-ober
fix test path
4c728f4
@t-ober
update lock file
cab8c7b
@t-ober t-ober changed the title To/#55 hh input 2 Parse household initialization data Apr 12, 2023
@t-ober t-ober marked this pull request as draft April 17, 2023 12:57
@t-ober
Copy link
Contributor Author

t-ober commented Apr 17, 2023

I still need to parse the different load profiles for the appliance types.

t-ober and others added 3 commits May 8, 2023 13:53
@t-ober
Merge branch 'to/#31-handle-appliance-operation-state' into to/#55-hh…
deaff49 
…-input-2

# Conflicts:
#	markovs_household/data/probability.py
#	markovs_household/data/usage_probabilities.py
#	poetry.lock
#	tests/common/test_data.py
@t-ober
Implement appliance type initialization
770fabb
@t-ober
Merge branch 'main' into to/#55-hh-input-2
2b0ef4d
@t-ober t-ober marked this pull request as ready for review October 24, 2023 09:54
@t-ober t-ober mentioned this pull request Oct 24, 2023
Open
danielfeismann
danielfeismann approved these changes Oct 24, 2023
View reviewed changes
Copy link
Member

@danielfeismann danielfeismann left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for finalizing this!

@danielfeismann danielfeismann merged commit b7e1f81 into main Oct 24, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sonatype-lift sonatype-lift[bot] sonatype-lift left review comments

@danielfeismann danielfeismann danielfeismann approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Parse household initialization data
2 participants
@t-ober @danielfeismann