added more generics

1 files changed, 6 insertions, 4 deletions

diff --git a/src/CS340.TSP/TSP.cs b/src/CS340.TSP/TSP.cs
index de7eda8..a26fe6c 100644
--- a/src/CS340.TSP/TSP.cs
+++ b/src/CS340.TSP/TSP.cs
@@ -1,18 +1,20 @@
 using System.Diagnostics;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Graph;
+using Graph.IO;
 
 namespace TSP
 {
-    using City = Vertex<double>;
-    using Tour = Tour<double>;
+
+    using Map = Graph<Vertex<Edge<double>, double>, Edge<double>, double>;
 
     public static class TSP
     {
         static Tour BestTour = null;
-        static Graph<double> Map;
+        static Map Map;
 
-        public static Tour BruteForce(Graph<double> map, int init)
+        public static Tour BruteForce(Map map, int init)
         {
             Map = map;
             Tour intialTour = new Tour(map.Vertices);