From f4d3262cb7e2f77b85a53d15d4f07f50ada529c7 Mon Sep 17 00:00:00 2001
From: Berack96 <giacomobertolazzi7@gmail.com>
Date: Sun, 16 Mar 2025 16:59:12 +0100
Subject: [PATCH] Rename run method to runBuilder in InteractiveConsole and
 update references; refactor file handling in Plot and SimulationBuilder for
 improved clarity and consistency

---
 .../berack/upo/valpre/InteractiveConsole.java |  2 +-
 src/main/java/net/berack/upo/valpre/Main.java |  2 +-
 .../net/berack/upo/valpre/Parameters.java     | 22 -------------------
 src/main/java/net/berack/upo/valpre/Plot.java |  7 +-----
 .../berack/upo/valpre/SimulationBuilder.java  |  4 +---
 .../upo/valpre/sim/TestInteractions.java      |  2 +-
 6 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/src/main/java/net/berack/upo/valpre/InteractiveConsole.java b/src/main/java/net/berack/upo/valpre/InteractiveConsole.java
index efb5eaf..bbf352a 100644
--- a/src/main/java/net/berack/upo/valpre/InteractiveConsole.java
+++ b/src/main/java/net/berack/upo/valpre/InteractiveConsole.java
@@ -39,7 +39,7 @@ public class InteractiveConsole {
     /**
      * Run the interactive net builder.
      */
-    public Net run() {
+    public Net runBuilder() {
         while (true) {
             try {
                 var choice = choose(this.net + "\nChoose the next step to do:",
diff --git a/src/main/java/net/berack/upo/valpre/Main.java b/src/main/java/net/berack/upo/valpre/Main.java
index 8135468..120d2d1 100644
--- a/src/main/java/net/berack/upo/valpre/Main.java
+++ b/src/main/java/net/berack/upo/valpre/Main.java
@@ -31,7 +31,7 @@ public class Main {
                     var plot = new Plot(csv);
                     plot.show();
                 }
-                case "interactive" -> new InteractiveConsole().run();
+                case "interactive" -> new InteractiveConsole().runBuilder();
                 default -> exit("Invalid program!");
             }
         } catch (Exception e) {
diff --git a/src/main/java/net/berack/upo/valpre/Parameters.java b/src/main/java/net/berack/upo/valpre/Parameters.java
index 3f90d36..9c5eff4 100644
--- a/src/main/java/net/berack/upo/valpre/Parameters.java
+++ b/src/main/java/net/berack/upo/valpre/Parameters.java
@@ -1,8 +1,5 @@
 package net.berack.upo.valpre;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
@@ -194,23 +191,4 @@ public class Parameters {
             throw new IllegalArgumentException("Invalid arguments");
         }
     }
-
-    /**
-     * Get the file or the example file if it is present.
-     * 
-     * @param file the file to get
-     * @return the file or the example file
-     * @throws FileNotFoundException if the file is not found
-     */
-    public static InputStream getFileOrExample(String file) throws FileNotFoundException {
-        if (file == null)
-            return null;
-
-        if (file.startsWith("example")) {
-            var resource = Parameters.class.getClassLoader().getResourceAsStream(file);
-            if (resource != null)
-                return resource;
-        }
-        return new FileInputStream(file);
-    }
 }
diff --git a/src/main/java/net/berack/upo/valpre/Plot.java b/src/main/java/net/berack/upo/valpre/Plot.java
index 3f13a7a..7f1d696 100644
--- a/src/main/java/net/berack/upo/valpre/Plot.java
+++ b/src/main/java/net/berack/upo/valpre/Plot.java
@@ -41,12 +41,7 @@ public class Plot {
      * @throws IOException if anything happens while reading the file
      */
     public Plot(String csv) throws IOException {
-        var stream = Parameters.getFileOrExample(csv);
-        if (stream == null)
-            throw new IllegalArgumentException("CSV file needed!");
-        var results = CsvResult.loadResults(stream);
-        stream.close();
-
+        var results = new CsvResult(csv).loadResults();
         this.summary = new Result.Summary(results);
 
         var nodes = this.summary.getNodes().toArray(new String[0]);
diff --git a/src/main/java/net/berack/upo/valpre/SimulationBuilder.java b/src/main/java/net/berack/upo/valpre/SimulationBuilder.java
index 02b2c79..5a591bf 100644
--- a/src/main/java/net/berack/upo/valpre/SimulationBuilder.java
+++ b/src/main/java/net/berack/upo/valpre/SimulationBuilder.java
@@ -37,10 +37,8 @@ public class SimulationBuilder {
      */
     public SimulationBuilder(String netFile) throws IOException {
         try {
-            var file = Parameters.getFileOrExample(netFile);
-            this.net = Net.load(file);
+            this.net = Net.load(netFile);
             this.confidences = new ConfidenceIndices(this.net);
-            file.close();
         } catch (FileNotFoundException e) {
             throw new IllegalArgumentException("Net file needed!");
         } catch (KryoException e) {
diff --git a/src/test/java/net/berack/upo/valpre/sim/TestInteractions.java b/src/test/java/net/berack/upo/valpre/sim/TestInteractions.java
index f0f39af..3b342a7 100644
--- a/src/test/java/net/berack/upo/valpre/sim/TestInteractions.java
+++ b/src/test/java/net/berack/upo/valpre/sim/TestInteractions.java
@@ -141,7 +141,7 @@ public class TestInteractions {
         var inputs = String.join("\n", commands);
         var bytes = inputs.getBytes();
         var in = new ByteArrayInputStream(bytes);
-        return new InteractiveConsole(out, in).run();
+        return new InteractiveConsole(out, in).runBuilder();
     }
 
     /*