diff --git a/TMI-practicum/Program.cs b/TMI-practicum/Program.cs index 7a4034d..020e9ce 100644 --- a/TMI-practicum/Program.cs +++ b/TMI-practicum/Program.cs @@ -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> ParseFile(string path) + private static (byte Algorithm, int NbCircles, IList Circles) ParseFile(string path) { byte algoritm = 0; @@ -79,7 +79,7 @@ namespace TMI_practicum } } - return new Tuple>(algoritm, nbCircles, circles); + return (algoritm, nbCircles, circles); } private const string OutputFile = "output.txt"; diff --git a/TMI-practicum/TMI-practicum.csproj b/TMI-practicum/TMI-practicum.csproj index ce09dbb..800334e 100644 --- a/TMI-practicum/TMI-practicum.csproj +++ b/TMI-practicum/TMI-practicum.csproj @@ -11,7 +11,7 @@ TMI_practicum v4.6.1 512 - 6 + 7.3 AnyCPU @@ -41,6 +41,10 @@ + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + True + diff --git a/TMI-practicum/packages.config b/TMI-practicum/packages.config index ab34aaf..19d8e41 100644 --- a/TMI-practicum/packages.config +++ b/TMI-practicum/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file