Principis/tmi-practicum-2018-2019
1
0
Fork 0
Code Releases Activity

fix compare

Browse Source
This commit is contained in:
Arthur Bols
2019-05-22 12:24:48 +02:00
parent 8fa0b04d86
commit 403a4e4f24
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
TMI-practicum/Program.cs
View File

@@ -62,23 +62,37 @@ namespace TMI_practicum
Console.WriteLine("start check {0}", i++); Console.WriteLine("start check {0}", i++);
var circles = CreateRandomCircles(5); var circles = CreateRandomCircles(5);
var correctSol = SweepLineAlgorithm.Solve(circles); var correctSol = SimpleAlgorithm.Solve(circles);
var solved = SweepLineEffAlgorithm.Solve(circles); var solved = SweepLineAlgorithm.Solve(circles);
foreach (var intersection in correctSol) foreach (var intersection in correctSol)
{ {
if (solved.Contains(intersection)) continue; if (solved.Contains(intersection)) continue;
if (solved.Contains(new Intersection(intersection.X + 10e-15, intersection.Y)) || if (solved.Contains(new Intersection(intersection.X + 1e-15, intersection.Y)) ||
solved.Contains(new Intersection(intersection.X - 10e-15, intersection.Y)) || solved.Contains(new Intersection(intersection.X - 1e-15, intersection.Y)) ||
solved.Contains(new Intersection(intersection.X + 10e-15, intersection.Y + 10e-15)) || solved.Contains(new Intersection(intersection.X + 1e-15, intersection.Y + 1e-15)) ||
solved.Contains(new Intersection(intersection.X + 10e-15, intersection.Y - 10e-15)) || solved.Contains(new Intersection(intersection.X + 1e-15, intersection.Y - 1e-15)) ||
solved.Contains(new Intersection(intersection.X - 10e-15, intersection.Y - 10e-15)) || solved.Contains(new Intersection(intersection.X - 1e-15, intersection.Y + 1e-15)) ||
solved.Contains(new Intersection(intersection.X - 10e-15, intersection.Y - 10e-15)) || solved.Contains(new Intersection(intersection.X - 1e-15, intersection.Y - 1e-15)) ||
solved.Contains(new Intersection(intersection.X, intersection.Y + 10e-15)) || solved.Contains(new Intersection(intersection.X, intersection.Y + 1e-15)) ||
solved.Contains(new Intersection(intersection.X, intersection.Y - 10e-15)) solved.Contains(new Intersection(intersection.X, intersection.Y - 1e-15))
) continue; ) continue;
bool found = false;
foreach (var ints in solved)
{
if (Math.Abs(ints.X - intersection.X) < 1e-12 &&
Math.Abs(ints.Y - intersection.Y) < 1e-12)
{
found = true;
break;
}
}
if (found) continue;
Console.WriteLine(InCircles(circles)); Console.WriteLine(InCircles(circles));
failed = true; failed = true;