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 stopwatch = new Stopwatch();
stopwatch.Start(); stopwatch.Start();
switch (parsed.Item1) switch (parsed.Algorithm)
{ {
case 1: case 1:
solved = SimpleAlgorithm.Solve(parsed.Item3); solved = SimpleAlgorithm.Solve(parsed.Circles);
break; break;
case 2: case 2:
solved = SweepLineAlgorithm.Solve(parsed.Item3); solved = SweepLineAlgorithm.Solve(parsed.Circles);
break; break;
case 3: case 3:
solved = SweepLineEffAlgorithm.Solve(parsed.Item3); solved = SweepLineEffAlgorithm.Solve(parsed.Circles);
break; break;
default: 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(); 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; 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"; private const string OutputFile = "output.txt";

6
TMI-practicum/TMI-practicum.csproj
View File

@@ -11,7 +11,7 @@
<AssemblyName>TMI_practicum</AssemblyName> <AssemblyName>TMI_practicum</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<LangVersion>6</LangVersion> <LangVersion>7.3</LangVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@@ -41,6 +41,10 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

1
TMI-practicum/packages.config
View File

@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="MedallionPriorityQueue" version="1.1.0" targetFramework="net461" /> <package id="MedallionPriorityQueue" version="1.1.0" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
</packages> </packages>