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

Update residential.py #12

Merged
merged 3 commits into from
Jul 3, 2018
Merged

Conversation

SilkeVerbruggen
Copy link
Contributor

The lighting is adapted when the occupants are asleep or away.
The standby-use is only included one time-step before the appliance is turned on.
In this file these problems are fixed.

The change in the lighting load function is necessary since in the original code the lighting was adapted when the occupants were asleep or away.
The standby-use was only included one time-step before the appliance was turned on, otherwise it was zero. The removal of the indent fixes this problem.
@bramvdh91 bramvdh91 assigned cprotopa and unassigned bramvdh91 Jun 15, 2018
@bramvdh91
Copy link
Contributor

I don't feel I understand enough what's going on in this part of the code. @cprotopa, do you have more experience with this file?

@cprotopa
Copy link
Contributor

Boy, this code is complicated!
Nevertheless, I've checked Silke's changes, and I think they are correct indeed.
Since I'm not so familiar with Python actually, I can't really judge @bramvdh91 's simplifications and code improvements. :)

@bramvdh91
Copy link
Contributor

Then I propose we’ll just stick to Silke’s changes for now and I’ll keep my changes for a different pull request, as they are not really relevant here. I’ll take care of this tonight!

@bramvdh91 bramvdh91 merged commit a772e14 into open-ideas:master Jul 3, 2018
@SilkeVerbruggen SilkeVerbruggen deleted the patch-1 branch July 3, 2018 14:31
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.

3 participants