Skip to content

Commit bd13d38

Browse files
RossNordbyRossNordby
committed
File scope namespace redo.
1 parent a6bbc83 commit bd13d38

2 files changed

Lines changed: 265 additions & 267 deletions

File tree

‎Demos/SpecializedTests/IntertreeThreadingTests.cs‎

Lines changed: 150 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -6,185 +6,184 @@
66
using System.Numerics;
77
using System.Runtime.CompilerServices;
88

9-
namespace Demos.SpecializedTests
9+
namespace Demos.SpecializedTests;
10+
11+
public static class IntertreeThreadingTests
1012
{
11-
public static class IntertreeThreadingTests
13+
static void GetRandomLocation(Random random, ref BoundingBox locationBounds, out Vector3 location)
14+
{
15+
location = (locationBounds.Max - locationBounds.Min) * new Vector3(random.NextSingle(), random.NextSingle(), random.NextSingle()) + locationBounds.Min;
16+
}
17+
struct OverlapHandler : IOverlapHandler
1218
{
13-
static void GetRandomLocation(Random random, ref BoundingBox locationBounds, out Vector3 location)
19+
public List<(int a, int b)> Pairs;
20+
public void Handle(int indexA, int indexB)
1421
{
15-
location = (locationBounds.Max - locationBounds.Min) * new Vector3(random.NextSingle(), random.NextSingle(), random.NextSingle()) + locationBounds.Min;
22+
Pairs.Add((indexA, indexB));
1623
}
17-
struct OverlapHandler : IOverlapHandler
24+
}
25+
26+
static void GetBoundsForLeaf(in Tree tree, int leafIndex, out BoundingBox bounds)
27+
{
28+
ref var leaf = ref tree.Leaves[leafIndex];
29+
ref var node = ref tree.Nodes[leaf.NodeIndex];
30+
bounds = leaf.ChildIndex == 0 ? new BoundingBox(node.A.Min, node.A.Max) : new BoundingBox(node.B.Min, node.B.Max);
31+
}
32+
33+
static void SortPairs(List<(int a, int b)> pairs)
34+
{
35+
for (int i = 0; i < pairs.Count; ++i)
1836
{
19-
public List<(int a, int b)> Pairs;
20-
public void Handle(int indexA, int indexB)
37+
if (pairs[i].b < pairs[i].a)
2138
{
22-
Pairs.Add((indexA, indexB));
39+
pairs[i] = (pairs[i].b, pairs[i].a);
2340
}
2441
}
42+
Comparison<(int, int)> comparison = (a, b) =>
43+
{
44+
var combinedA = ((ulong)a.Item1 << 32) | ((uint)a.Item2);
45+
var combinedB = ((ulong)b.Item1 << 32) | ((uint)b.Item2);
46+
return combinedA.CompareTo(combinedB);
47+
};
48+
pairs.Sort(comparison);
49+
}
2550

26-
static void GetBoundsForLeaf(in Tree tree, int leafIndex, out BoundingBox bounds)
51+
unsafe static void TestTrees(BufferPool pool, IThreadDispatcher threadDispatcher, Random random)
52+
{
53+
var treeA = new Tree(pool, 1);
54+
var treeB = new Tree(pool, 1);
55+
56+
var aBounds = new BoundingBox(new Vector3(-40, 0, -40), new Vector3(40, 0, 40));
57+
var aOffset = new Vector3(3f, 3f, 3f);
58+
var aCount = 1024;
59+
var bBounds = new BoundingBox(new Vector3(-5, -2, -5), new Vector3(5, 2, 5));
60+
var bOffset = new Vector3(0.5f, 0.5f, 0.5f);
61+
var bCount = 3;
62+
for (int i = 0; i < aCount; ++i)
2763
{
28-
ref var leaf = ref tree.Leaves[leafIndex];
29-
ref var node = ref tree.Nodes[leaf.NodeIndex];
30-
bounds = leaf.ChildIndex == 0 ? new BoundingBox(node.A.Min, node.A.Max) : new BoundingBox(node.B.Min, node.B.Max);
64+
GetRandomLocation(random, ref aBounds, out var center);
65+
var bounds = new BoundingBox(center - aOffset, center + aOffset);
66+
treeA.Add(bounds, pool);
3167
}
32-
33-
static void SortPairs(List<(int a, int b)> pairs)
68+
for (int i = 0; i < bCount; ++i)
3469
{
35-
for (int i = 0; i < pairs.Count; ++i)
36-
{
37-
if (pairs[i].b < pairs[i].a)
38-
{
39-
pairs[i] = (pairs[i].b, pairs[i].a);
40-
}
41-
}
42-
Comparison<(int, int)> comparison = (a, b) =>
43-
{
44-
var combinedA = ((ulong)a.Item1 << 32) | ((uint)a.Item2);
45-
var combinedB = ((ulong)b.Item1 << 32) | ((uint)b.Item2);
46-
return combinedA.CompareTo(combinedB);
47-
};
48-
pairs.Sort(comparison);
70+
GetRandomLocation(random, ref bBounds, out var center);
71+
var bounds = new BoundingBox(center - bOffset, center + bOffset);
72+
treeB.Add(bounds, pool);
4973
}
50-
51-
unsafe static void TestTrees(BufferPool pool, IThreadDispatcher threadDispatcher, Random random)
74+
5275
{
53-
var treeA = new Tree(pool, 1);
54-
var treeB = new Tree(pool, 1);
55-
56-
var aBounds = new BoundingBox(new Vector3(-40, 0, -40), new Vector3(40, 0, 40));
57-
var aOffset = new Vector3(3f, 3f, 3f);
58-
var aCount = 1024;
59-
var bBounds = new BoundingBox(new Vector3(-5, -2, -5), new Vector3(5, 2, 5));
60-
var bOffset = new Vector3(0.5f, 0.5f, 0.5f);
61-
var bCount = 3;
62-
for (int i = 0; i < aCount; ++i)
63-
{
64-
GetRandomLocation(random, ref aBounds, out var center);
65-
var bounds = new BoundingBox(center - aOffset, center + aOffset);
66-
treeA.Add(bounds, pool);
67-
}
68-
for (int i = 0; i < bCount; ++i)
69-
{
70-
GetRandomLocation(random, ref bBounds, out var center);
71-
var bounds = new BoundingBox(center - bOffset, center + bOffset);
72-
treeB.Add(bounds, pool);
73-
}
74-
75-
{
76-
var indexToRemove = 1;
77-
GetBoundsForLeaf(treeB, indexToRemove, out var removedBounds);
78-
treeB.RemoveAt(indexToRemove);
79-
treeA.Add(removedBounds, pool);
80-
}
81-
82-
var singleThreadedResults = new OverlapHandler { Pairs = new List<(int a, int b)>() };
83-
treeA.GetOverlaps(ref treeB, ref singleThreadedResults);
84-
SortPairs(singleThreadedResults.Pairs);
85-
for (int i = 0; i < 10; ++i)
86-
{
87-
treeA.RefitAndRefine(pool, i);
88-
treeB.RefitAndRefine(pool, i);
89-
}
90-
treeA.Validate();
91-
treeB.Validate();
76+
var indexToRemove = 1;
77+
GetBoundsForLeaf(treeB, indexToRemove, out var removedBounds);
78+
treeB.RemoveAt(indexToRemove);
79+
treeA.Add(removedBounds, pool);
80+
}
81+
82+
var singleThreadedResults = new OverlapHandler { Pairs = new List<(int a, int b)>() };
83+
treeA.GetOverlaps(ref treeB, ref singleThreadedResults);
84+
SortPairs(singleThreadedResults.Pairs);
85+
for (int i = 0; i < 10; ++i)
86+
{
87+
treeA.RefitAndRefine(pool, i);
88+
treeB.RefitAndRefine(pool, i);
89+
}
90+
treeA.Validate();
91+
treeB.Validate();
9292

93-
var context = new Tree.MultithreadedIntertreeTest<OverlapHandler>();
94-
var handlers = new OverlapHandler[threadDispatcher.ThreadCount];
95-
for (int i = 0; i < threadDispatcher.ThreadCount; ++i)
96-
{
97-
handlers[i].Pairs = new List<(int a, int b)>();
98-
}
99-
context.PrepareJobs(ref treeA, ref treeB, handlers, threadDispatcher.ThreadCount, 0, pool);
100-
threadDispatcher.DispatchWorkers(context.PairTest, context.JobCount);
101-
context.CompleteTest();
102-
List<(int a, int b)> multithreadedResults = new List<(int, int)>();
103-
for (int i = 0; i < threadDispatcher.ThreadCount; ++i)
104-
{
105-
multithreadedResults.AddRange(handlers[i].Pairs);
106-
}
107-
SortPairs(multithreadedResults);
93+
var context = new Tree.MultithreadedIntertreeTest<OverlapHandler>();
94+
var handlers = new OverlapHandler[threadDispatcher.ThreadCount];
95+
for (int i = 0; i < threadDispatcher.ThreadCount; ++i)
96+
{
97+
handlers[i].Pairs = new List<(int a, int b)>();
98+
}
99+
context.PrepareJobs(ref treeA, ref treeB, handlers, threadDispatcher.ThreadCount, 0, pool);
100+
threadDispatcher.DispatchWorkers(context.PairTest, context.JobCount);
101+
context.CompleteTest();
102+
List<(int a, int b)> multithreadedResults = new List<(int, int)>();
103+
for (int i = 0; i < threadDispatcher.ThreadCount; ++i)
104+
{
105+
multithreadedResults.AddRange(handlers[i].Pairs);
106+
}
107+
SortPairs(multithreadedResults);
108108

109-
if (singleThreadedResults.Pairs.Count != multithreadedResults.Count)
110-
{
111-
throw new Exception("Single threaded vs multithreaded counts don't match.");
112-
}
113-
for (int i = 0; i < singleThreadedResults.Pairs.Count; ++i)
109+
if (singleThreadedResults.Pairs.Count != multithreadedResults.Count)
110+
{
111+
throw new Exception("Single threaded vs multithreaded counts don't match.");
112+
}
113+
for (int i = 0; i < singleThreadedResults.Pairs.Count; ++i)
114+
{
115+
var singleThreadedPair = singleThreadedResults.Pairs[i];
116+
var multithreadedPair = multithreadedResults[i];
117+
if (singleThreadedPair.a != multithreadedPair.a ||
118+
singleThreadedPair.b != multithreadedPair.b)
114119
{
115-
var singleThreadedPair = singleThreadedResults.Pairs[i];
116-
var multithreadedPair = multithreadedResults[i];
117-
if (singleThreadedPair.a != multithreadedPair.a ||
118-
singleThreadedPair.b != multithreadedPair.b)
119-
{
120-
throw new Exception("Single threaded vs multithreaded results don't match.");
121-
}
120+
throw new Exception("Single threaded vs multithreaded results don't match.");
122121
}
122+
}
123123

124-
//Single and multithreaded variants produce the same results. But do they match a brute force test?
125-
Tree smaller, larger;
126-
if (treeA.LeafCount < treeB.LeafCount)
127-
{
128-
smaller = treeA;
129-
larger = treeB;
130-
}
131-
else
132-
{
133-
smaller = treeB;
134-
larger = treeA;
135-
}
136-
var bruteResultsEnumerator = new BruteForceResultsEnumerator();
137-
bruteResultsEnumerator.Pairs = new List<(int a, int b)>();
138-
for (int i = 0; i < smaller.LeafCount; ++i)
139-
{
140-
GetBoundsForLeaf(smaller, i, out var bounds);
141-
bruteResultsEnumerator.QuerySourceIndex = i;
142-
larger.GetOverlaps(bounds, ref bruteResultsEnumerator);
143-
}
144-
SortPairs(bruteResultsEnumerator.Pairs);
124+
//Single and multithreaded variants produce the same results. But do they match a brute force test?
125+
Tree smaller, larger;
126+
if (treeA.LeafCount < treeB.LeafCount)
127+
{
128+
smaller = treeA;
129+
larger = treeB;
130+
}
131+
else
132+
{
133+
smaller = treeB;
134+
larger = treeA;
135+
}
136+
var bruteResultsEnumerator = new BruteForceResultsEnumerator();
137+
bruteResultsEnumerator.Pairs = new List<(int a, int b)>();
138+
for (int i = 0; i < smaller.LeafCount; ++i)
139+
{
140+
GetBoundsForLeaf(smaller, i, out var bounds);
141+
bruteResultsEnumerator.QuerySourceIndex = i;
142+
larger.GetOverlaps(bounds, ref bruteResultsEnumerator);
143+
}
144+
SortPairs(bruteResultsEnumerator.Pairs);
145145

146-
if (singleThreadedResults.Pairs.Count != bruteResultsEnumerator.Pairs.Count)
147-
{
148-
throw new Exception("Brute force vs intertree counts don't match.");
149-
}
150-
for (int i = 0; i < singleThreadedResults.Pairs.Count; ++i)
146+
if (singleThreadedResults.Pairs.Count != bruteResultsEnumerator.Pairs.Count)
147+
{
148+
throw new Exception("Brute force vs intertree counts don't match.");
149+
}
150+
for (int i = 0; i < singleThreadedResults.Pairs.Count; ++i)
151+
{
152+
var singleThreadedPair = singleThreadedResults.Pairs[i];
153+
var bruteForcePair = bruteResultsEnumerator.Pairs[i];
154+
if (singleThreadedPair.a != bruteForcePair.a ||
155+
singleThreadedPair.b != bruteForcePair.b)
151156
{
152-
var singleThreadedPair = singleThreadedResults.Pairs[i];
153-
var bruteForcePair = bruteResultsEnumerator.Pairs[i];
154-
if (singleThreadedPair.a != bruteForcePair.a ||
155-
singleThreadedPair.b != bruteForcePair.b)
156-
{
157-
throw new Exception("Brute force vs intertree results don't match.");
158-
}
157+
throw new Exception("Brute force vs intertree results don't match.");
159158
}
160-
161-
treeA.Dispose(pool);
162-
treeB.Dispose(pool);
163159
}
164160

165-
struct BruteForceResultsEnumerator : IBreakableForEach<int>
161+
treeA.Dispose(pool);
162+
treeB.Dispose(pool);
163+
}
164+
165+
struct BruteForceResultsEnumerator : IBreakableForEach<int>
166+
{
167+
public List<(int a, int b)> Pairs;
168+
public int QuerySourceIndex;
169+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
170+
public bool LoopBody(int foundIndex)
166171
{
167-
public List<(int a, int b)> Pairs;
168-
public int QuerySourceIndex;
169-
[MethodImpl(MethodImplOptions.AggressiveInlining)]
170-
public bool LoopBody(int foundIndex)
171-
{
172-
Pairs.Add((QuerySourceIndex, foundIndex));
173-
return true;
174-
}
172+
Pairs.Add((QuerySourceIndex, foundIndex));
173+
return true;
175174
}
175+
}
176176

177-
public static void Test()
177+
public static void Test()
178+
{
179+
var random = new Random(5);
180+
var pool = new BufferPool();
181+
var threadDispatcher = new ThreadDispatcher(Environment.ProcessorCount);
182+
for (int i = 0; i < 1000; ++i)
178183
{
179-
var random = new Random(5);
180-
var pool = new BufferPool();
181-
var threadDispatcher = new ThreadDispatcher(Environment.ProcessorCount);
182-
for (int i = 0; i < 1000; ++i)
183-
{
184-
TestTrees(pool, threadDispatcher, random);
185-
}
186-
pool.Clear();
187-
threadDispatcher.Dispose();
184+
TestTrees(pool, threadDispatcher, random);
188185
}
186+
pool.Clear();
187+
threadDispatcher.Dispose();
189188
}
190189
}

0 commit comments

Comments
 (0)