Skip to content

Commit 0322c18

Browse files
committed
Fixed code style issues
1 parent 372a464 commit 0322c18

File tree

4 files changed

+22
-20
lines changed

4 files changed

+22
-20
lines changed

Main/src/Collections/DisjointSets.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace CodeJam.Collections
44
{
55
/// <summary>Disjoint sets without payload</summary>
6-
/// <remarks>
6+
/// <remarks>
77
/// See http://en.wikipedia.org/wiki/Disjoint-set_data_structure
88
/// </remarks>
99
[PublicAPI]
@@ -25,7 +25,7 @@ public void Add(int count)
2525
{
2626
for (var i = 0; i < count; ++i)
2727
{
28-
Nodes_.Add(new BasicNode { ParentIndex = -1, Rank = 0 });
28+
Nodes.Add(new BasicNode { ParentIndex = -1, Rank = 0 });
2929
}
3030
SetsCount += count;
3131
}

Main/src/Collections/DisjointSetsBase.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ namespace CodeJam.Collections
99
public class DisjointSetsBase<T> where T : BasicNode
1010
{
1111
/// <summary>All nodes</summary>
12-
protected readonly List<T> Nodes_ = new List<T>();
12+
protected readonly List<T> Nodes = new List<T>();
1313

1414
/// <summary>Creates an empty base</summary>
1515
protected DisjointSetsBase() { }
1616

1717
/// <summary>The number of nodes</summary>
18-
public int Count => Nodes_.Count;
18+
public int Count => Nodes.Count;
1919

2020
/// <summary>The number of disjoint sets</summary>
2121
public int SetsCount { get; protected set; }
@@ -34,7 +34,7 @@ public int IndexToSetId(int index)
3434
var rootIndex = index;
3535
for (;;)
3636
{
37-
var parentIndex = Nodes_[rootIndex].ParentIndex;
37+
var parentIndex = Nodes[rootIndex].ParentIndex;
3838
if (parentIndex == -1)
3939
{
4040
break;
@@ -46,7 +46,7 @@ public int IndexToSetId(int index)
4646
// walk from the passed element upto the root replacing the the ParentIndex with the root index
4747
while (index != rootIndex)
4848
{
49-
var node = Nodes_[index];
49+
var node = Nodes[index];
5050
index = node.ParentIndex;
5151
node.ParentIndex = rootIndex;
5252
}
@@ -60,14 +60,16 @@ public void Union(int elementOfSet1Index, int elementOfSet2Index)
6060
{
6161
elementOfSet1Index = IndexToSetId(elementOfSet1Index);
6262
elementOfSet2Index = IndexToSetId(elementOfSet2Index);
63+
6364
if (elementOfSet1Index == elementOfSet2Index)
6465
{
6566
return; // Already the single set
6667
}
6768

68-
var set1Root = Nodes_[elementOfSet1Index];
69-
var set2Root = Nodes_[elementOfSet2Index];
69+
var set1Root = Nodes[elementOfSet1Index];
70+
var set2Root = Nodes[elementOfSet2Index];
7071
var rankDifference = set1Root.Rank - set2Root.Rank;
72+
7173
// Attach the tree with a smaller rank to the tree with a higher rank.
7274
// The resulting tree rank is equal to the higher rank
7375
// except the case when initial ranks are equal.

Main/src/Collections/DisjointSetsT.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ public DisjointSets(IEnumerable<T> values)
2626

2727
/// <summary>Gets an element by its index</summary>
2828
/// <param name="index">Elmement's index</param>
29-
public T this[int index] => Nodes_[index].Value;
29+
public T this[int index] => Nodes[index].Value;
3030

3131
/// <summary>Appends a list of values</summary>
3232
/// <param name="values">The values to append</param>
3333
public void Add(IEnumerable<T> values)
3434
{
35-
var initialNodesCount = Nodes_.Count;
36-
Nodes_.AddRange(values.Select(_ => new Node { Value = _, ParentIndex = -1, Rank = 0 }));
37-
SetsCount += Nodes_.Count - initialNodesCount;
35+
var initialNodesCount = Nodes.Count;
36+
Nodes.AddRange(values.Select(_ => new Node { Value = _, ParentIndex = -1, Rank = 0 }));
37+
SetsCount += Nodes.Count - initialNodesCount;
3838
}
3939

4040
/// <summary>Appends a single element</summary>
4141
/// <param name="value">The value to append</param>
4242
public void Add(T value)
4343
{
44-
Nodes_.Add(new Node { Value = value, ParentIndex = -1, Rank = 0 });
44+
Nodes.Add(new Node { Value = value, ParentIndex = -1, Rank = 0 });
4545
++SetsCount;
4646
}
4747

Main/tests/Collections/DisjointSetsTest.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ namespace CodeJam
1111
[TestFixture]
1212
public class DisjointSetsTest
1313
{
14-
private readonly Random random_ = new Random();
14+
private readonly Random _random = new Random();
1515
private const int ElementsNumber = 10000;
16-
private readonly List<int> seq_ = Enumerable.Range(0, ElementsNumber).ToList();
16+
private readonly List<int> _seq = Enumerable.Range(0, ElementsNumber).ToList();
1717

1818
[Test]
1919
public void Test01NonGeneric()
2020
{
21-
for (var i = 1; i <= ElementsNumber; i += 1 + i / (10 + random_.Next(0, 10)))
21+
for (var i = 1; i <= ElementsNumber; i += 1 + i / (10 + _random.Next(0, 10)))
2222
{
2323
Console.WriteLine($"i = {i}");
2424
var djs = new DisjointSets(ElementsNumber);
25-
foreach (var el in RandomShuffle(seq_))
25+
foreach (var el in RandomShuffle(_seq))
2626
{
2727
djs.Union(el, el % i);
2828
}
@@ -33,10 +33,10 @@ public void Test01NonGeneric()
3333
[Test]
3434
public void Test02Generic()
3535
{
36-
for (var i = 1; i <= ElementsNumber; i += 1 + i / (10 + random_.Next(0, 10)))
36+
for (var i = 1; i <= ElementsNumber; i += 1 + i / (10 + _random.Next(0, 10)))
3737
{
3838
Console.WriteLine($"i = {i}");
39-
var rs = RandomShuffle(seq_).ToList();
39+
var rs = RandomShuffle(_seq).ToList();
4040
var djs = new DisjointSets<int>(rs);
4141
foreach (var el in rs)
4242
{
@@ -60,6 +60,6 @@ private static void VerifySets<T>(DisjointSetsBase<T> djs, int mod) where T : Ba
6060
}
6161
}
6262

63-
private IEnumerable<T> RandomShuffle<T>(IEnumerable<T> en) => en.OrderBy(x => random_.Next());
63+
private IEnumerable<T> RandomShuffle<T>(IEnumerable<T> en) => en.OrderBy(x => _random.Next());
6464
}
6565
}

0 commit comments

Comments
 (0)