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

change to csharp 7.3

Browse Source
This commit is contained in:
Arthur Bols
2019-05-16 09:39:36 +02:00
parent 00b6f44912
commit 19644edced
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
TMI-practicum/Program.cs
View File

@@ -29,19 +29,19 @@ namespace TMI_practicum
Stopwatch stopwatch = new Stopwatch();
stopwatch.Start();
switch (parsed.Item1)
switch (parsed.Algorithm)
{
case 1:
solved = SimpleAlgorithm.Solve(parsed.Item3);
solved = SimpleAlgorithm.Solve(parsed.Circles);
break;
case 2:
solved = SweepLineAlgorithm.Solve(parsed.Item3);
solved = SweepLineAlgorithm.Solve(parsed.Circles);
break;
case 3:
solved = SweepLineEffAlgorithm.Solve(parsed.Item3);
solved = SweepLineEffAlgorithm.Solve(parsed.Circles);
break;
default:
throw new ArgumentException("Algorithm with id: " + parsed.Item1 + " is not defined!");
throw new ArgumentException("Algorithm with id: " + parsed.Algorithm + " is not defined!");
}
stopwatch.Stop();
@@ -49,7 +49,7 @@ namespace TMI_practicum
}
private static Tuple<byte, int, IList<Circle>> ParseFile(string path)
private static (byte Algorithm, int NbCircles, IList<Circle> Circles) ParseFile(string path)
{
byte algoritm = 0;
@@ -79,7 +79,7 @@ namespace TMI_practicum
}
}
return new Tuple<byte, int, IList<Circle>>(algoritm, nbCircles, circles);
return (algoritm, nbCircles, circles);
}
private const string OutputFile = "output.txt";