diff options
author | Toby Vincent <tobyv13@gmail.com> | 2021-05-02 14:58:01 -0500 |
---|---|---|
committer | Toby Vincent <tobyv13@gmail.com> | 2021-05-02 15:02:02 -0500 |
commit | b03ade8a3c2d94c1931d09f8d09b7865826a9743 (patch) | |
tree | 1339db9c7dd814de9ec898bd167d809b9a09c1be | |
parent | 1bd4f32d974674186900cec0897567419afe0b88 (diff) |
removed CS340 namespace
Signed-off-by: Toby Vincent <tobyv13@gmail.com>
-rw-r--r-- | .gitmodules | 24 | ||||
-rw-r--r-- | .vscode/launch.json | 4 | ||||
-rw-r--r-- | .vscode/tasks.json | 6 | ||||
-rw-r--r-- | TSP.sln (renamed from CS340.TSP.sln) | 16 | ||||
m--------- | src/CS340.Extensions | 0 | ||||
m--------- | src/CS340.Graph | 0 | ||||
m--------- | src/CS340.Interfaces | 0 | ||||
m--------- | src/CS340.PriorityQueue | 0 | ||||
-rw-r--r-- | src/CS340.TSP/CS340.TSP.csproj | 13 | ||||
m--------- | src/Extensions | 0 | ||||
m--------- | src/Graph | 0 | ||||
m--------- | src/Interfaces | 0 | ||||
-rw-r--r-- | src/Plotter/Plot.Designer.cs (renamed from src/CS340.Plotter/Plot.Designer.cs) | 0 | ||||
-rw-r--r-- | src/Plotter/Plot.cs (renamed from src/CS340.Plotter/Plot.cs) | 0 | ||||
-rw-r--r-- | src/Plotter/Plot.resx (renamed from src/CS340.Plotter/Plot.resx) | 0 | ||||
-rw-r--r-- | src/Plotter/Plotter.csproj (renamed from src/CS340.Plotter/CS340.Plotter.csproj) | 4 | ||||
-rw-r--r-- | src/Plotter/Program.cs (renamed from src/CS340.Plotter/Program.cs) | 0 | ||||
-rw-r--r-- | src/Plotter/TourPlot.cs (renamed from src/CS340.Plotter/TourPlot.cs) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph1.csv (renamed from src/CS340.Plotter/graphs/graph1.csv) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph1.txt (renamed from src/CS340.Plotter/graphs/graph1.txt) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph10.csv (renamed from src/CS340.Plotter/graphs/graph10.csv) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph10.txt (renamed from src/CS340.Plotter/graphs/graph10.txt) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph2.csv (renamed from src/CS340.Plotter/graphs/graph2.csv) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph2.txt (renamed from src/CS340.Plotter/graphs/graph2.txt) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph3.csv (renamed from src/CS340.Plotter/graphs/graph3.csv) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph3.txt (renamed from src/CS340.Plotter/graphs/graph3.txt) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph4.csv (renamed from src/CS340.Plotter/graphs/graph4.csv) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph4.txt (renamed from src/CS340.Plotter/graphs/graph4.txt) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph5.csv (renamed from src/CS340.Plotter/graphs/graph5.csv) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph5.txt (renamed from src/CS340.Plotter/graphs/graph5.txt) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph6.csv (renamed from src/CS340.Plotter/graphs/graph6.csv) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph6.txt (renamed from src/CS340.Plotter/graphs/graph6.txt) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph7.csv (renamed from src/CS340.Plotter/graphs/graph7.csv) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph7.txt (renamed from src/CS340.Plotter/graphs/graph7.txt) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph8.csv (renamed from src/CS340.Plotter/graphs/graph8.csv) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph8.txt (renamed from src/CS340.Plotter/graphs/graph8.txt) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph9.csv (renamed from src/CS340.Plotter/graphs/graph9.csv) | 0 | ||||
-rw-r--r-- | src/Plotter/graphs/graph9.txt (renamed from src/CS340.Plotter/graphs/graph9.txt) | 0 | ||||
m--------- | src/PriorityQueue | 0 | ||||
-rw-r--r-- | src/TSP/City.cs (renamed from src/CS340.TSP/City.cs) | 0 | ||||
-rw-r--r-- | src/TSP/Coordinates.cs (renamed from src/CS340.TSP/Coordinates.cs) | 0 | ||||
-rw-r--r-- | src/TSP/TSP.csproj | 13 | ||||
-rw-r--r-- | src/TSP/TSPSolver.cs (renamed from src/CS340.TSP/TSPSolver.cs) | 0 | ||||
-rw-r--r-- | src/TSP/Tour.cs (renamed from src/CS340.TSP/Tour.cs) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/PrimDijkstra.Tests.csproj (renamed from tests/CS340.PrimDijkstra.Tests/CS340.PrimDijkstra.Tests.csproj) | 6 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/PrimDijkstraShould.cs (renamed from tests/CS340.PrimDijkstra.Tests/PrimDijkstraShould.cs) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph1.csv (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph1.csv) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph1.txt (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph1.txt) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph10.csv (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph10.csv) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph10.txt (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph10.txt) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph2.csv (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph2.csv) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph2.txt (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph2.txt) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph3.csv (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph3.csv) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph3.txt (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph3.txt) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph4.csv (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph4.csv) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph4.txt (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph4.txt) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph5.csv (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph5.csv) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph5.txt (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph5.txt) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph6.csv (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph6.csv) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph6.txt (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph6.txt) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph7.csv (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph7.csv) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph7.txt (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph7.txt) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph8.csv (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph8.csv) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph8.txt (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph8.txt) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph9.csv (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph9.csv) | 0 | ||||
-rw-r--r-- | tests/PrimDijkstra.Tests/graphs/graph9.txt (renamed from tests/CS340.PrimDijkstra.Tests/graphs/graph9.txt) | 0 | ||||
-rw-r--r-- | tests/PriorityQueue.Tests/PriorityQueue.Tests.csproj (renamed from tests/CS340.PriorityQueue.Tests/CS340.PriorityQueue.Tests.csproj) | 4 | ||||
-rw-r--r-- | tests/PriorityQueue.Tests/PriorityQueueShould.cs (renamed from tests/CS340.PriorityQueue.Tests/PriorityQueueShould.cs) | 0 |
68 files changed, 45 insertions, 45 deletions
diff --git a/.gitmodules b/.gitmodules index 36382a0..1684f64 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ -[submodule "src/CS340.Graph"] - path = src/CS340.Graph - url = https://github.com/tobyvin/CS340.Graph -[submodule "src/CS340.Interfaces"] - path = src/CS340.Interfaces - url = https://github.com/tobyvin/CS340.Interfaces -[submodule "src/CS340.Extensions"] - path = src/CS340.Extensions - url = https://github.com/tobyvin/CS340.Extensions -[submodule "src/CS340.PriorityQueue"] - path = src/CS340.PriorityQueue - url = https://github.com/tobyvin/CS340.PriorityQueue +[submodule "src/Graph"] + path = src/Graph + url = git@github.com:/tobyvin-CS340/Graph +[submodule "src/Interfaces"] + path = src/Interfaces + url = git@github.com:/tobyvin-CS340/Interfaces +[submodule "src/Extensions"] + path = src/Extensions + url = git@github.com:/tobyvin-CS340/Extensions +[submodule "src/PriorityQueue"] + path = src/PriorityQueue + url = git@github.com:/tobyvin-CS340/PriorityQueue diff --git a/.vscode/launch.json b/.vscode/launch.json index 835c95b..4014a13 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,9 +9,9 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/src/CS340.Plotter/bin/Debug/net5.0-windows/CS340.Plotter.dll", + "program": "${workspaceFolder}/src/Plotter/bin/Debug/net5.0-windows/Plotter.dll", "args": [], - "cwd": "${workspaceFolder}/src/CS340.Plotter", + "cwd": "${workspaceFolder}/src/Plotter", "console": "internalConsole", "stopAtEntry": false } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 0b9c9ea..1b61a39 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,7 +7,7 @@ "type": "process", "args": [ "build", - "${workspaceFolder}/src/CS340.Plotter/CS340.Plotter.csproj", + "${workspaceFolder}/src/Plotter/Plotter.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -19,7 +19,7 @@ "type": "process", "args": [ "publish", - "${workspaceFolder}/src/CS340.Plotter/CS340.Plotter.csproj", + "${workspaceFolder}/src/Plotter/Plotter.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -32,7 +32,7 @@ "args": [ "watch", "run", - "${workspaceFolder}/src/CS340.Plotter/CS340.Plotter.csproj", + "${workspaceFolder}/src/Plotter/Plotter.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -5,23 +5,23 @@ VisualStudioVersion = 16.6.30114.105 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D035EDB3-98C7-4A59-8C2F-5BD5BB9E83DA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CS340.Graph", "src\CS340.Graph\CS340.Graph.csproj", "{D2383783-7EAB-4E7F-B9A6-33702BA8E919}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graph", "src\Graph\Graph.csproj", "{D2383783-7EAB-4E7F-B9A6-33702BA8E919}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CS340.TSP", "src\CS340.TSP\CS340.TSP.csproj", "{1ED43E67-3A64-47DF-9730-A9203443F3AB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TSP", "src\TSP\TSP.csproj", "{1ED43E67-3A64-47DF-9730-A9203443F3AB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CS340.Interfaces", "src\CS340.Interfaces\CS340.Interfaces.csproj", "{2BF6C193-197B-4C49-AE0C-7C8682F1F0CB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Interfaces", "src\Interfaces\Interfaces.csproj", "{2BF6C193-197B-4C49-AE0C-7C8682F1F0CB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CS340.Extensions", "src\CS340.Extensions\CS340.Extensions.csproj", "{D94E98AE-9D02-4532-AD8E-DFD118039775}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extensions", "src\Extensions\Extensions.csproj", "{D94E98AE-9D02-4532-AD8E-DFD118039775}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CS340.PriorityQueue", "src\CS340.PriorityQueue\CS340.PriorityQueue.csproj", "{A8E26365-D1A6-4E9C-9524-D7CFC3E41C76}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PriorityQueue", "src\PriorityQueue\PriorityQueue.csproj", "{A8E26365-D1A6-4E9C-9524-D7CFC3E41C76}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1C5331E5-D2DC-48A8-8264-3E83B06B4335}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CS340.PriorityQueue.Tests", "tests\CS340.PriorityQueue.Tests\CS340.PriorityQueue.Tests.csproj", "{CDCD0887-1053-49CE-A01E-D53E9110DD00}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PriorityQueue.Tests", "tests\PriorityQueue.Tests\PriorityQueue.Tests.csproj", "{CDCD0887-1053-49CE-A01E-D53E9110DD00}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CS340.Plotter", "src\CS340.Plotter\CS340.Plotter.csproj", "{8042E9EE-4690-41AD-B048-6EFCB78C4549}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plotter", "src\Plotter\Plotter.csproj", "{8042E9EE-4690-41AD-B048-6EFCB78C4549}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CS340.PrimDijkstra.Tests", "tests\CS340.PrimDijkstra.Tests\CS340.PrimDijkstra.Tests.csproj", "{A12FB0C4-013A-4C51-93F5-ED8715E035A8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrimDijkstra.Tests", "tests\PrimDijkstra.Tests\PrimDijkstra.Tests.csproj", "{A12FB0C4-013A-4C51-93F5-ED8715E035A8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/CS340.Extensions b/src/CS340.Extensions deleted file mode 160000 -Subproject 9524e96711b9a01868717395f6a040373f5678f diff --git a/src/CS340.Graph b/src/CS340.Graph deleted file mode 160000 -Subproject 92abf69c87475311de8c3d585c352b484aae8e9 diff --git a/src/CS340.Interfaces b/src/CS340.Interfaces deleted file mode 160000 -Subproject 187e8aaf854e9262f1ff6c574a2c28fe662dbbf diff --git a/src/CS340.PriorityQueue b/src/CS340.PriorityQueue deleted file mode 160000 -Subproject 7b0641c6f967b6843ea93010d3eb338eaada014 diff --git a/src/CS340.TSP/CS340.TSP.csproj b/src/CS340.TSP/CS340.TSP.csproj deleted file mode 100644 index dae9f9e..0000000 --- a/src/CS340.TSP/CS340.TSP.csproj +++ /dev/null @@ -1,13 +0,0 @@ -<Project Sdk="Microsoft.NET.Sdk"> - - <PropertyGroup> - <TargetFramework>net5.0</TargetFramework> - </PropertyGroup> - - <ItemGroup> - <ProjectReference Include="..\CS340.Graph\CS340.Graph.csproj" /> - <ProjectReference Include="..\CS340.Interfaces\CS340.Interfaces.csproj" /> - <ProjectReference Include="..\CS340.Extensions\CS340.Extensions.csproj" /> - </ItemGroup> - -</Project> diff --git a/src/Extensions b/src/Extensions new file mode 160000 +Subproject bf2c055ab57e4e0ef3a9c11ad278a7a907e1ceb diff --git a/src/Graph b/src/Graph new file mode 160000 +Subproject d372d100de05fad3b1be342f0d2b9e1bb1c3ac8 diff --git a/src/Interfaces b/src/Interfaces new file mode 160000 +Subproject cfcca407247236c785d6e09678ffd848444fb3f diff --git a/src/CS340.Plotter/Plot.Designer.cs b/src/Plotter/Plot.Designer.cs index 7a06f33..7a06f33 100644 --- a/src/CS340.Plotter/Plot.Designer.cs +++ b/src/Plotter/Plot.Designer.cs diff --git a/src/CS340.Plotter/Plot.cs b/src/Plotter/Plot.cs index 6732fe1..6732fe1 100644 --- a/src/CS340.Plotter/Plot.cs +++ b/src/Plotter/Plot.cs diff --git a/src/CS340.Plotter/Plot.resx b/src/Plotter/Plot.resx index f298a7b..f298a7b 100644 --- a/src/CS340.Plotter/Plot.resx +++ b/src/Plotter/Plot.resx diff --git a/src/CS340.Plotter/CS340.Plotter.csproj b/src/Plotter/Plotter.csproj index 1cbf369..4c973b3 100644 --- a/src/CS340.Plotter/CS340.Plotter.csproj +++ b/src/Plotter/Plotter.csproj @@ -1,8 +1,8 @@ <Project Sdk="Microsoft.NET.Sdk"> <ItemGroup> - <ProjectReference Include="..\CS340.Graph\CS340.Graph.csproj" /> - <ProjectReference Include="..\CS340.TSP\CS340.TSP.csproj" /> + <ProjectReference Include="..\Graph\Graph.csproj" /> + <ProjectReference Include="..\TSP\TSP.csproj" /> <Content Include="graphs\*.*"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> diff --git a/src/CS340.Plotter/Program.cs b/src/Plotter/Program.cs index d9175fe..d9175fe 100644 --- a/src/CS340.Plotter/Program.cs +++ b/src/Plotter/Program.cs diff --git a/src/CS340.Plotter/TourPlot.cs b/src/Plotter/TourPlot.cs index 751fd2e..751fd2e 100644 --- a/src/CS340.Plotter/TourPlot.cs +++ b/src/Plotter/TourPlot.cs diff --git a/src/CS340.Plotter/graphs/graph1.csv b/src/Plotter/graphs/graph1.csv index 17891b7..17891b7 100644 --- a/src/CS340.Plotter/graphs/graph1.csv +++ b/src/Plotter/graphs/graph1.csv diff --git a/src/CS340.Plotter/graphs/graph1.txt b/src/Plotter/graphs/graph1.txt index f31c4fd..f31c4fd 100644 --- a/src/CS340.Plotter/graphs/graph1.txt +++ b/src/Plotter/graphs/graph1.txt diff --git a/src/CS340.Plotter/graphs/graph10.csv b/src/Plotter/graphs/graph10.csv index b443717..b443717 100644 --- a/src/CS340.Plotter/graphs/graph10.csv +++ b/src/Plotter/graphs/graph10.csv diff --git a/src/CS340.Plotter/graphs/graph10.txt b/src/Plotter/graphs/graph10.txt index 4f999c7..4f999c7 100644 --- a/src/CS340.Plotter/graphs/graph10.txt +++ b/src/Plotter/graphs/graph10.txt diff --git a/src/CS340.Plotter/graphs/graph2.csv b/src/Plotter/graphs/graph2.csv index 2610f5c..2610f5c 100644 --- a/src/CS340.Plotter/graphs/graph2.csv +++ b/src/Plotter/graphs/graph2.csv diff --git a/src/CS340.Plotter/graphs/graph2.txt b/src/Plotter/graphs/graph2.txt index 3537352..3537352 100644 --- a/src/CS340.Plotter/graphs/graph2.txt +++ b/src/Plotter/graphs/graph2.txt diff --git a/src/CS340.Plotter/graphs/graph3.csv b/src/Plotter/graphs/graph3.csv index be8e3e2..be8e3e2 100644 --- a/src/CS340.Plotter/graphs/graph3.csv +++ b/src/Plotter/graphs/graph3.csv diff --git a/src/CS340.Plotter/graphs/graph3.txt b/src/Plotter/graphs/graph3.txt index aac27df..aac27df 100644 --- a/src/CS340.Plotter/graphs/graph3.txt +++ b/src/Plotter/graphs/graph3.txt diff --git a/src/CS340.Plotter/graphs/graph4.csv b/src/Plotter/graphs/graph4.csv index 8d4b0c8..8d4b0c8 100644 --- a/src/CS340.Plotter/graphs/graph4.csv +++ b/src/Plotter/graphs/graph4.csv diff --git a/src/CS340.Plotter/graphs/graph4.txt b/src/Plotter/graphs/graph4.txt index 979af49..979af49 100644 --- a/src/CS340.Plotter/graphs/graph4.txt +++ b/src/Plotter/graphs/graph4.txt diff --git a/src/CS340.Plotter/graphs/graph5.csv b/src/Plotter/graphs/graph5.csv index 58dd108..58dd108 100644 --- a/src/CS340.Plotter/graphs/graph5.csv +++ b/src/Plotter/graphs/graph5.csv diff --git a/src/CS340.Plotter/graphs/graph5.txt b/src/Plotter/graphs/graph5.txt index 719405b..719405b 100644 --- a/src/CS340.Plotter/graphs/graph5.txt +++ b/src/Plotter/graphs/graph5.txt diff --git a/src/CS340.Plotter/graphs/graph6.csv b/src/Plotter/graphs/graph6.csv index 442af1a..442af1a 100644 --- a/src/CS340.Plotter/graphs/graph6.csv +++ b/src/Plotter/graphs/graph6.csv diff --git a/src/CS340.Plotter/graphs/graph6.txt b/src/Plotter/graphs/graph6.txt index 55210c3..55210c3 100644 --- a/src/CS340.Plotter/graphs/graph6.txt +++ b/src/Plotter/graphs/graph6.txt diff --git a/src/CS340.Plotter/graphs/graph7.csv b/src/Plotter/graphs/graph7.csv index a633a58..a633a58 100644 --- a/src/CS340.Plotter/graphs/graph7.csv +++ b/src/Plotter/graphs/graph7.csv diff --git a/src/CS340.Plotter/graphs/graph7.txt b/src/Plotter/graphs/graph7.txt index 92bd948..92bd948 100644 --- a/src/CS340.Plotter/graphs/graph7.txt +++ b/src/Plotter/graphs/graph7.txt diff --git a/src/CS340.Plotter/graphs/graph8.csv b/src/Plotter/graphs/graph8.csv index f0b9474..f0b9474 100644 --- a/src/CS340.Plotter/graphs/graph8.csv +++ b/src/Plotter/graphs/graph8.csv diff --git a/src/CS340.Plotter/graphs/graph8.txt b/src/Plotter/graphs/graph8.txt index bb0eb23..bb0eb23 100644 --- a/src/CS340.Plotter/graphs/graph8.txt +++ b/src/Plotter/graphs/graph8.txt diff --git a/src/CS340.Plotter/graphs/graph9.csv b/src/Plotter/graphs/graph9.csv index 46016eb..46016eb 100644 --- a/src/CS340.Plotter/graphs/graph9.csv +++ b/src/Plotter/graphs/graph9.csv diff --git a/src/CS340.Plotter/graphs/graph9.txt b/src/Plotter/graphs/graph9.txt index 528b29a..528b29a 100644 --- a/src/CS340.Plotter/graphs/graph9.txt +++ b/src/Plotter/graphs/graph9.txt diff --git a/src/PriorityQueue b/src/PriorityQueue new file mode 160000 +Subproject aaa7b630b2117259444751ee49d90767771ad3c diff --git a/src/CS340.TSP/City.cs b/src/TSP/City.cs index 4889bdb..4889bdb 100644 --- a/src/CS340.TSP/City.cs +++ b/src/TSP/City.cs diff --git a/src/CS340.TSP/Coordinates.cs b/src/TSP/Coordinates.cs index 1e74021..1e74021 100644 --- a/src/CS340.TSP/Coordinates.cs +++ b/src/TSP/Coordinates.cs diff --git a/src/TSP/TSP.csproj b/src/TSP/TSP.csproj new file mode 100644 index 0000000..880efa6 --- /dev/null +++ b/src/TSP/TSP.csproj @@ -0,0 +1,13 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <TargetFramework>net5.0</TargetFramework> + </PropertyGroup> + + <ItemGroup> + <ProjectReference Include="..\Graph\Graph.csproj" /> + <ProjectReference Include="..\Interfaces\Interfaces.csproj" /> + <ProjectReference Include="..\Extensions\Extensions.csproj" /> + </ItemGroup> + +</Project> diff --git a/src/CS340.TSP/TSPSolver.cs b/src/TSP/TSPSolver.cs index 84d3945..84d3945 100644 --- a/src/CS340.TSP/TSPSolver.cs +++ b/src/TSP/TSPSolver.cs diff --git a/src/CS340.TSP/Tour.cs b/src/TSP/Tour.cs index 5f530be..5f530be 100644 --- a/src/CS340.TSP/Tour.cs +++ b/src/TSP/Tour.cs diff --git a/tests/CS340.PrimDijkstra.Tests/CS340.PrimDijkstra.Tests.csproj b/tests/PrimDijkstra.Tests/PrimDijkstra.Tests.csproj index 8d6c580..30279c7 100644 --- a/tests/CS340.PrimDijkstra.Tests/CS340.PrimDijkstra.Tests.csproj +++ b/tests/PrimDijkstra.Tests/PrimDijkstra.Tests.csproj @@ -23,9 +23,9 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\src\CS340.Graph\CS340.Graph.csproj" /> - <ProjectReference Include="..\..\src\CS340.Interfaces\CS340.Interfaces.csproj" /> - <ProjectReference Include="..\..\src\CS340.Extensions\CS340.Extensions.csproj" /> + <ProjectReference Include="..\..\src\Graph\Graph.csproj" /> + <ProjectReference Include="..\..\src\Interfaces\Interfaces.csproj" /> + <ProjectReference Include="..\..\src\Extensions\Extensions.csproj" /> </ItemGroup> </Project> diff --git a/tests/CS340.PrimDijkstra.Tests/PrimDijkstraShould.cs b/tests/PrimDijkstra.Tests/PrimDijkstraShould.cs index 2093420..2093420 100644 --- a/tests/CS340.PrimDijkstra.Tests/PrimDijkstraShould.cs +++ b/tests/PrimDijkstra.Tests/PrimDijkstraShould.cs diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph1.csv b/tests/PrimDijkstra.Tests/graphs/graph1.csv index 17891b7..17891b7 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph1.csv +++ b/tests/PrimDijkstra.Tests/graphs/graph1.csv diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph1.txt b/tests/PrimDijkstra.Tests/graphs/graph1.txt index f31c4fd..f31c4fd 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph1.txt +++ b/tests/PrimDijkstra.Tests/graphs/graph1.txt diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph10.csv b/tests/PrimDijkstra.Tests/graphs/graph10.csv index b443717..b443717 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph10.csv +++ b/tests/PrimDijkstra.Tests/graphs/graph10.csv diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph10.txt b/tests/PrimDijkstra.Tests/graphs/graph10.txt index 4f999c7..4f999c7 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph10.txt +++ b/tests/PrimDijkstra.Tests/graphs/graph10.txt diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph2.csv b/tests/PrimDijkstra.Tests/graphs/graph2.csv index 2610f5c..2610f5c 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph2.csv +++ b/tests/PrimDijkstra.Tests/graphs/graph2.csv diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph2.txt b/tests/PrimDijkstra.Tests/graphs/graph2.txt index 3537352..3537352 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph2.txt +++ b/tests/PrimDijkstra.Tests/graphs/graph2.txt diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph3.csv b/tests/PrimDijkstra.Tests/graphs/graph3.csv index be8e3e2..be8e3e2 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph3.csv +++ b/tests/PrimDijkstra.Tests/graphs/graph3.csv diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph3.txt b/tests/PrimDijkstra.Tests/graphs/graph3.txt index aac27df..aac27df 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph3.txt +++ b/tests/PrimDijkstra.Tests/graphs/graph3.txt diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph4.csv b/tests/PrimDijkstra.Tests/graphs/graph4.csv index 8d4b0c8..8d4b0c8 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph4.csv +++ b/tests/PrimDijkstra.Tests/graphs/graph4.csv diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph4.txt b/tests/PrimDijkstra.Tests/graphs/graph4.txt index 979af49..979af49 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph4.txt +++ b/tests/PrimDijkstra.Tests/graphs/graph4.txt diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph5.csv b/tests/PrimDijkstra.Tests/graphs/graph5.csv index 58dd108..58dd108 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph5.csv +++ b/tests/PrimDijkstra.Tests/graphs/graph5.csv diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph5.txt b/tests/PrimDijkstra.Tests/graphs/graph5.txt index 719405b..719405b 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph5.txt +++ b/tests/PrimDijkstra.Tests/graphs/graph5.txt diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph6.csv b/tests/PrimDijkstra.Tests/graphs/graph6.csv index 442af1a..442af1a 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph6.csv +++ b/tests/PrimDijkstra.Tests/graphs/graph6.csv diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph6.txt b/tests/PrimDijkstra.Tests/graphs/graph6.txt index 55210c3..55210c3 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph6.txt +++ b/tests/PrimDijkstra.Tests/graphs/graph6.txt diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph7.csv b/tests/PrimDijkstra.Tests/graphs/graph7.csv index a633a58..a633a58 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph7.csv +++ b/tests/PrimDijkstra.Tests/graphs/graph7.csv diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph7.txt b/tests/PrimDijkstra.Tests/graphs/graph7.txt index 92bd948..92bd948 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph7.txt +++ b/tests/PrimDijkstra.Tests/graphs/graph7.txt diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph8.csv b/tests/PrimDijkstra.Tests/graphs/graph8.csv index f0b9474..f0b9474 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph8.csv +++ b/tests/PrimDijkstra.Tests/graphs/graph8.csv diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph8.txt b/tests/PrimDijkstra.Tests/graphs/graph8.txt index bb0eb23..bb0eb23 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph8.txt +++ b/tests/PrimDijkstra.Tests/graphs/graph8.txt diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph9.csv b/tests/PrimDijkstra.Tests/graphs/graph9.csv index 46016eb..46016eb 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph9.csv +++ b/tests/PrimDijkstra.Tests/graphs/graph9.csv diff --git a/tests/CS340.PrimDijkstra.Tests/graphs/graph9.txt b/tests/PrimDijkstra.Tests/graphs/graph9.txt index 528b29a..528b29a 100644 --- a/tests/CS340.PrimDijkstra.Tests/graphs/graph9.txt +++ b/tests/PrimDijkstra.Tests/graphs/graph9.txt diff --git a/tests/CS340.PriorityQueue.Tests/CS340.PriorityQueue.Tests.csproj b/tests/PriorityQueue.Tests/PriorityQueue.Tests.csproj index 9c9f613..26dbb37 100644 --- a/tests/CS340.PriorityQueue.Tests/CS340.PriorityQueue.Tests.csproj +++ b/tests/PriorityQueue.Tests/PriorityQueue.Tests.csproj @@ -20,8 +20,8 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\src\CS340.PriorityQueue\CS340.PriorityQueue.csproj" /> - <ProjectReference Include="..\..\src\CS340.Interfaces\CS340.Interfaces.csproj" /> + <ProjectReference Include="..\..\src\PriorityQueue\PriorityQueue.csproj" /> + <ProjectReference Include="..\..\src\Interfaces\Interfaces.csproj" /> </ItemGroup> </Project> diff --git a/tests/CS340.PriorityQueue.Tests/PriorityQueueShould.cs b/tests/PriorityQueue.Tests/PriorityQueueShould.cs index beafb41..beafb41 100644 --- a/tests/CS340.PriorityQueue.Tests/PriorityQueueShould.cs +++ b/tests/PriorityQueue.Tests/PriorityQueueShould.cs |