Refactoring

- better args input
- possibility to simulate or display the results
- modified CSV logic

src/main/java/net/berack/upo/valpre/Main.java

@@ -1,77 +1,33 @@
 package net.berack.upo.valpre;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import net.berack.upo.valpre.sim.Net;
-import net.berack.upo.valpre.sim.SimulationMultiple;
+import java.io.File;
+import java.net.URISyntaxException;
+import java.util.Arrays;
 
 public class Main {
     public static void main(String[] args) throws Exception {
-        // Parameters for the simulation
-        String csv = null;
-        var runs = 100;
-        var seed = 2007539552L;
+        if (args.length == 0)
+            exit();
 
-        // Evantually change the parameters
-        var arguments = parseParameters(args);
-        if (arguments.containsKey("seed"))
-            seed = Long.parseLong(arguments.get("seed"));
-        if (arguments.containsKey("runs"))
-            runs = Integer.parseInt(arguments.get("runs"));
-        if (arguments.containsKey("csv"))
-            csv = arguments.get("csv");
-        var parallel = arguments.containsKey("p");
-
-        var file = arguments.get("net");
-        if (file == null)
-            throw new IllegalArgumentException("Net file needed! Use -net <file>");
-        if (file.startsWith("example"))
-            file = Main.class.getClassLoader().getResource(file).getPath();
-
-        // var maxDepartures = new EndSimulationCriteria.MaxDepartures("Queue", total);
-        // var maxTime = new EndSimulationCriteria.MaxTime(1000.0);
-
-        /// Run multiple simulations
-        var net = Net.load(file);
-        var nano = System.nanoTime();
-        var sim = new SimulationMultiple(net);
-        var results = parallel ? sim.runParallel(seed, runs) : sim.run(seed, runs);
-        nano = System.nanoTime() - nano;
-
-        System.out.print(results.average.getHeader());
-        System.out.print(results.average.getSummary());
-        System.out.println("Final time " + nano / 1e6 + "ms");
-
-        if (csv != null) {
-            results.saveCSV(csv);
-            System.out.println("Data saved to " + csv);
+        var subArgs = Arrays.copyOfRange(args, 1, args.length);
+        switch (args[0]) {
+            case "simulation":
+                var sim = new Simulation(subArgs);
+                sim.run();
+                break;
+            case "plot":
+                var plot = new Plot(subArgs);
+                plot.show();
+                break;
+            default:
+                exit();
         }
     }
 
-    public static Map<String, String> parseParameters(String[] args) {
-        var arguments = new HashMap<String, Boolean>();
-        arguments.put("p", false);
-        arguments.put("seed", true);
-        arguments.put("runs", true);
-        arguments.put("net", true);
-        arguments.put("csv", true);
-
-        var param = new Parameters("-", arguments);
-        try {
-            return param.parse(args);
-        } catch (IllegalArgumentException e) {
-            var descriptions = new HashMap<String, String>();
-            descriptions.put("p", "Add this if you want the simulation to use threads (one each run).");
-            descriptions.put("seed", "The seed of the simulation.");
-            descriptions.put("runs", "How many runs the simulator should run.");
-            descriptions.put("net",
-                    "The net to use. It should be a file. Use example1.net or example2.net for the provided ones.");
-            descriptions.put("csv", "The filename for saving every run statistics.");
-
-            System.out.println(e.getMessage());
-            System.out.println(param.helper(descriptions));
-            return null;
-        }
+    public static void exit() throws URISyntaxException {
+        var uri = Main.class.getProtectionDomain().getCodeSource().getLocation().toURI();
+        var name = new File(uri).getName();
+        System.out.println("Usage: java -jar " + name + ".jar [simulation|plot] [args]");
+        System.exit(1);
     }
 }