Don't reset trackers when sampling is finished #1862
Merged
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
dictoon
reviewed
Feb 26, 2018
| // Don't exceed 'max' samples in total. | ||
| assert(trackers[0].get_size() <= m_params.m_max_samples); | ||
| const size_t remaining_samples = m_params.m_max_samples - trackers[0].get_size(); | ||
| if (remaining_samples == 0) | ||
| break; | ||
|
|
||
| trackers[0].reset_variation(); |
There was a problem hiding this comment.
Yes, that looks correct actually.
I would go even further: I would move the other termination checks just after the check on the remaining number of samples:
// Stop if the variation criterion is met.
if (trackers[0].get_variation() <= m_params.m_max_variation &&
trackers[1].get_variation() <= m_params.m_max_variation &&
trackers[2].get_variation() <= m_params.m_max_variation)
break;
There was a problem hiding this comment.
If you do so, sampling will stop on the first step. Just have to check the size at the same time.
There was a problem hiding this comment.
Oh you're right, sorry. Maybe it's better to leave the test where it was then. Sorry for the troubles!
dictoon
reviewed
Feb 27, 2018
| @@ -241,7 +241,7 @@ namespace | |||
| trackers[1].insert(shading_result.m_main[1]); | |||
| trackers[2].insert(shading_result.m_main[2]); | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
That's what happen when you edit the code directly on github :(
There was a problem hiding this comment.
Yeah, not recommended especially since it's easy to introduce mistakes that will break compilation :)
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.
This is not a fix for #1858 but a fix for a mistake in the adaptive sampler. The trackers were resat before writing them in an image when diagnostic is enabled.