Fix utilisation bug #145
Merged
Fix utilisation bug #145
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
drvinceknight
suggested changes
Dec 21, 2017
| Q.simulate_until_max_time(200) | ||
| for srvr in Q.transitive_nodes[0].servers: | ||
| self.assertGreaterEqual(srvr.total_time, srvr.busy_time) | ||
| self.assertLessEqual(Q.transitive_nodes[0].server_utilisation, 1.0) |
There was a problem hiding this comment.
throw in a assertGreaterEqual than 0 too?
ciw/tests/test_node.py
Outdated
| @@ -1,5 +1,7 @@ | |||
| import unittest | |||
| import ciw | |||
| from hypothesis import given | |||
| from hypothesis.strategies import (floats, integers, random_module) | |||
There was a problem hiding this comment.
Any reason for the brackets? Haven't seen that conventionally anywhere else.
| Q = ciw.Simulation(N) | ||
| Q.simulate_until_max_time(168) | ||
| for srvr in Q.transitive_nodes[0].servers: | ||
| self.assertGreaterEqual(srvr.total_time, srvr.busy_time) |
There was a problem hiding this comment.
Also, this doesn't have the check of the actual bug does it?
There was a problem hiding this comment.
yes. The problem was srvr.busy_time was larger then srvr.total_time because I was also adding the final customers' waiting time to the busy time.
There was a problem hiding this comment.
Ah yes! I see that now 👍
|
Looks good @geraintpalmer: merge! 👍 |
|
Fixes bug in which utilisation is not calculated correctly, resulting in utilisation > 100%. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bug allowed utilisation to be greater than 100% in some cases.
This fixes that bug, and adds tests and property based tests to check for it.