Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Fix behaviour of TreeSubSet Min and Max #16771

Merged
stephentoub merged 3 commits into from
Mar 7, 2017
Merged

Fix behaviour of TreeSubSet Min and Max #16771

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbafaf8
Fix behaviour of TreeSubSet Min and Max
mjp41 Mar 6, 2017
0315d3f
Added a more exhaustive test of Min/Max on TreeSubSet.
mjp41 Mar 7, 2017
0e302d8
Code review feedback.
mjp41 Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Code review feedback.
  • Loading branch information
@mjp41
mjp41 committed Mar 7, 2017
commit 0e302d89df56545e364988ea869416570a66e693
25 changes: 18 additions & 7 deletions src/System.Collections/src/System/Collections/Generic/SortedSet.TreeSubSet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,21 @@ internal override T MinInternal
Node current = _root;
T result = default(T);

while (current != null) {
while (current != null)
{

int comp = _lBoundActive ? Comparer.Compare(_min, current.Item) : -1;
if (comp == 1) {
if (comp == 1)
{
current = current.Right;
} else {
}
else
{
result = current.Item;
if (comp == 0)
{
break;
}
current = current.Left;
}
}
Expand All @@ -155,15 +161,20 @@ internal override T MaxInternal
Node current = _root;
T result = default(T);

while (current != null) {

while (current != null)
{
int comp = _uBoundActive ? Comparer.Compare(_max, current.Item) : 1;
if (comp == -1) {
if (comp == -1)
{
current = current.Left;
} else {
}
else
{
result = current.Item;
if (comp == 0)
{
break;
}
current = current.Right;
}
}
Expand Down
7 changes: 5 additions & 2 deletions src/System.Collections/tests/Generic/SortedSet/SortedSet.Generic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,13 @@ public void SortedSet_Generic_GetViewBetween_MinMax_Exhaustive()
{
SortedSet<int> view = set.GetViewBetween(i, j);

if (j < i || (j == i && i % 2 == 0) ){
if (j < i || (j == i && i % 2 == 0) )
{
Assert.Equal(default(int), view.Min);
Assert.Equal(default(int), view.Max);
} else {
}
else
{
Assert.Equal(i + ((i+1) % 2), view.Min);
Assert.Equal(j - ((j+1) % 2), view.Max);
}
Copy link
Member

@stephentoub stephentoub Mar 7, 2017

Choose a reason for hiding this comment

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

Nit: same style nits, e.g. braces

Expand Down