From 7db1fdcfadad94aa7aea2acf36ec5fb84b27331f Mon Sep 17 00:00:00 2001 From: Toby Vincent Date: Thu, 22 Apr 2021 01:43:55 -0500 Subject: cleaned up weight and key system --- src/CS340.Plotter/Program.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/CS340.Plotter') diff --git a/src/CS340.Plotter/Program.cs b/src/CS340.Plotter/Program.cs index 497ac32..9e9a52a 100644 --- a/src/CS340.Plotter/Program.cs +++ b/src/CS340.Plotter/Program.cs @@ -1,5 +1,3 @@ -using Graph; -using Graph.IO; using System; using System.Collections.Generic; using System.Diagnostics; @@ -7,11 +5,12 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; +using Graph; +using Graph.IO; using TSP; namespace Plotter { - using Map = Graph, double>, Edge, double>; static class Program { /// @@ -31,15 +30,15 @@ namespace Plotter { foreach (string file in Directory.GetFiles("graphs/")) { - Map graph = GraphFile.Read(new FileReader(file)); + Tour bruteForce = Solve.BruteForce(file, 0); + Debug.WriteLine(bruteForce); + // Graph mst = graph.MST(0); // GraphFile.Print(mst, new ConsoleWriter()); // Console.WriteLine( // graph.Vertices.Sum(vertex => // vertex.Edges.FirstOrDefault(edge => edge.V == vertex.Parent).Weight)); - Tour bruteForce = TSP.TSP.BruteForce(graph, 0); - Debug.WriteLine(bruteForce); // mst.Vertices.ForEach(vertex => // { // Console.Write($"{vertex.Id}"); -- cgit v1.2.3-70-g09d2