implemented batch tests for algorithms

Author: dave-ck

AISearch.iml

@@ -7,5 +7,27 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library name="JUnit5.2">
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.3.1/junit-jupiter-api-5.3.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.0.0/apiguardian-api-1.0.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.1.1/opentest4j-1.1.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.3.1/junit-platform-commons-1.3.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="JUnit4">
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>

src/SimAnnealer.java

@@ -1,9 +1,25 @@
 public class SimAnnealer {
 
-	public static FullTour SimAnneal(FullTour initial){
-		
+	public static FullTour SimAnneal(FullTour initial) {
 		return null;
 	}
-
+	
+	public static FullTour HillClimb(FullTour initial) {
+		FullTour current = initial;
+		FullTour optimal = initial;
+		int optimalWeight = initial.computeWeight();
+		long time = System.nanoTime();
+		System.out.println(time);
+		do {
+			for (FullTour ft : current.getSuccessors()) {
+				if(ft.computeWeight() < optimalWeight){
+					optimal = ft;
+					optimalWeight = ft.computeWeight();
+				}
+			}
+		} while (!current.equals(optimal) && System.nanoTime() < time + 5000000); //timeout after 5 seconds
+		return optimal;
+	}
+	
 }
 

src/StartPointGenerator.java

@@ -0,0 +1,17 @@
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+
+public class StartPointGenerator {
+	
+	// done
+	public static FullTour Greedy(Graph g) throws Exception {
+		PartialTour pt = new PartialTour(g);
+		pt.append(0);
+		while (pt.greedyAppend()) {
+			// System.out.println(pt);
+		}
+		return new FullTour(pt);
+	}
+	
+	
+}

src/TSP.java

@@ -1,45 +1,55 @@
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
 public class TSP {
-
+	
 	public static void main(String[] args) throws Exception {
-		greedyFile();
-	}
-
-	// done
-	public static FullTour Greedy(Graph g) throws Exception {
-		PartialTour pt = new PartialTour(g);
-		pt.append(0);
-		while (pt.greedyAppend()) {
-			// System.out.println(pt);
+		ArrayList<FullTour> greedyTours = new ArrayList<>();
+		ArrayList<FullTour> annealingTours = new ArrayList<>();
+		ArrayList<FullTour> hillClimbingTours = new ArrayList<>();
+		for(Graph graph : readGraphs()){
+			System.out.println("Currently processing graph of size "+graph.getSize());
+			//Greedy
+			greedyTours.add(StartPointGenerator.Greedy(graph));
+			// Hill Climbing
+			hillClimbingTours.add(SimAnnealer.HillClimb(StartPointGenerator.Greedy(graph)));
+			//Annealing
+			//hillClimbingTours.add(SimAnnealer.SimAnneal(StartPointGenerator.Greedy(graph)));
 		}
-		return new FullTour(pt);
+		System.out.println("writeToFile called");
+		
+		writeToFile("Greedy", greedyTours);
+		writeToFile("HillClimb", hillClimbingTours);
+		writeToFile("Annealing", annealingTours);
 	}
-
-	public static FullTour simulatedAnnealing(Graph g) {
-		return null;
-
+	
+	//TODO: change ...file58.txt to ...file058.txt
+	public static void writeToFile(String pathName, ArrayList<FullTour> tours) throws Exception {
+		new File(pathName).mkdirs();
+		for (FullTour tour : tours) {
+			String outputFileName = "tourNEWAISearchfile" + tour.size() + ".txt";
+			PrintWriter writer = new PrintWriter(pathName + "/" + outputFileName, "UTF-8");
+			writer.println(tour);
+			System.out.println("Successfully printed tour" + outputFileName);
+			writer.close();
+		}
 	}
-
-	public static void greedyFile() throws Exception {
+	
+	
+	public static ArrayList<Graph> readGraphs() throws Exception {
 		Collection<String> fileNumbers = Arrays.asList("012", "017", "021", "026", "042", "048", "058", "175", "180",
 				"535");
+		ArrayList<Graph> graphs = new ArrayList<>();
 		for (String ext : fileNumbers) {
 			String fileName = "NEWAISearchfile" + ext + ".txt";
-			System.out.println(fileName);
+			System.out.println("Reading graph from: " + fileName);
 			Graph g = new Graph(fileName);
-			new File("Greedy").mkdirs();
-			String outputFileName = "tourNEWAISearchfile" + ext + ".txt";
-			PrintWriter writer = new PrintWriter("Greedy/" + outputFileName, "UTF-8");
-			writer.println(Greedy(g));
-			writer.close();
+			graphs.add(g);
 		}
-
+		return graphs;
 	}
+	
 }