Bug fixes and performance improvements

Author: kufo2018

out/production/bnfo501/project1/Main.class

@@ -1,11 +1,56 @@
 package project1;
 
+import java.util.InputMismatchException;
+import java.util.Scanner;
+
+/**
+ * Driver class for Project1
+ */
 public class Main {
     public static void main(String[] args) {
+        runProgram(args);
+    }
+
+    private static void runProgram(String[] args) {
+        Project1 project1;
+        int response;
+
+        System.out.println("Enter 1 to use command line arguments or 2 to manually input file names:");
+        Scanner scanner = new Scanner(System.in);
+        try {
+            response = scanner.nextInt();
+        } catch (InputMismatchException exception) {
+            response = 3;
+        }
+
+        if (response == 1) {
+            project1 = new Project1(args);
+        } else if (response == 2) {
+            System.out.print(
+                    "Enter input file only and program will generate an output.txt file for you OR ");
+            System.out.print(
+                    "Enter input and output filenames separated by a comma e.g. " +
+                            "MyInputFile.txt,MyOutputFile.txt: ");
+
+            var userInput = scanner.next();
+            if (userInput.isEmpty()) {
+                System.out.println("Input file cannot be empty, please retry");
+                return;
+            } else {
+                var fileNames = userInput.split(",");
+                if (fileNames.length == 1) {
+                    project1 = new Project1(fileNames[0], "output.txt");
+                } else {
+                    project1 = new Project1(fileNames[0], fileNames[1]);
+                }
+            }
+        } else {
+            System.out.println("Invalid response");
+            return;
+        }
 
-        Project1 project1 = new Project1("testFile.txt", "output.txt");
-//        Project1 project1 = new Project1(args);
         project1.initializeProgram();
         project1.runSearchAlgorithms();
+        scanner.close();
     }
 }

out/production/bnfo501/project1/Project1$Timer.class

@@ -17,19 +17,23 @@ public class Project1 {
     private String inputFile = "";
     private String outputFile = "";
     private PrintWriter printWriter;
-    Timer timer = new Timer();
+    private Timer timer = new Timer();
 
     /**
      * Creates an object of this class using command line arguments
      *
      * @param args the String array containing the input and output file names
      */
     public Project1(String[] args) {
-        try {
+
+        if (args.length == 0) {
+            print("No command line arguments found");
+        } else if (args.length == 1) {
+            this.inputFile = args[0];
+            this.outputFile = "output.txt";
+        } else if (args.length == 2) {
             this.inputFile = args[0];
             this.outputFile = args[1];
-        } catch (Exception exception) {
-            print("Error accessing command line argument(s)");
         }
     }
 
@@ -40,12 +44,8 @@ public Project1(String[] args) {
      * @param outputFile the file to be written to
      */
     public Project1(String inputFile, String outputFile) {
-        try {
-            this.inputFile = inputFile;
-            this.outputFile = outputFile;
-        } catch (Exception exception) {
-            print("Error with input or output string");
-        }
+        this.inputFile = inputFile;
+        this.outputFile = outputFile;
     }
 
     /**
@@ -66,12 +66,10 @@ public void initializeProgram() {
 
             initializePrintWriter();
 
-        } catch (FileNotFoundException fileNotFoundException) {
-            print("Error! Input or output file does not exist");
-        } catch (IOException ioException) {
-            print("Error! IO exception occurred while reading file");
-        } catch (NumberFormatException numberFormatException) {
-            print("Error! Input file contains invalid data");
+        } catch (Exception exception) {
+            print("Error!");
+            print("Please ensure input file exists and is formatted correctly");
+            System.exit(1);
         }
     }
 
@@ -156,7 +154,6 @@ private void print(Object object) {
      */
     private void initializePrintWriter() {
         try {
-            if (outputFile.isEmpty()) outputFile = "output.txt";
             FileWriter fileWriter = new FileWriter(outputFile);
             printWriter = new PrintWriter(fileWriter);
         } catch (IOException ioException) {

out/production/bnfo501/project1/Project1.class

@@ -22,5 +22,6 @@
 9
 110
 13
-a
+123
+