From 75b12788c896f51cc12645be31f448d1e5d5b7e4 Mon Sep 17 00:00:00 2001
From: Berack96 <giacomobertolazzi7@gmail.com>
Date: Mon, 27 Jan 2025 20:32:27 +0100
Subject: [PATCH] Refactor - removed unused code - changed net inputs for
 better usability

---
 src/main/java/net/berack/upo/valpre/Main.java      |  2 +-
 src/main/java/net/berack/upo/valpre/sim/Net.java   | 14 ++++++--------
 .../java/net/berack/upo/valpre/sim/ServerNode.java |  5 +++++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/net/berack/upo/valpre/Main.java b/src/main/java/net/berack/upo/valpre/Main.java
index b41dc01..f919f20 100644
--- a/src/main/java/net/berack/upo/valpre/Main.java
+++ b/src/main/java/net/berack/upo/valpre/Main.java
@@ -35,7 +35,7 @@ public class Main {
         var node2 = ServerNode.createQueue("Queue", 1, new Distribution.NormalBoxMuller(mu, sigma));
         net.addNode(node1);
         net.addNode(node2);
-        net.addConnection(node1.name, node2.name, 1.0);
+        net.addConnection(node1, node2, 1.0);
         net.normalizeWeights();
 
         /// Run multiple simulations
diff --git a/src/main/java/net/berack/upo/valpre/sim/Net.java b/src/main/java/net/berack/upo/valpre/sim/Net.java
index 361d612..c72412b 100644
--- a/src/main/java/net/berack/upo/valpre/sim/Net.java
+++ b/src/main/java/net/berack/upo/valpre/sim/Net.java
@@ -14,10 +14,9 @@ import net.berack.upo.valpre.rand.Rng;
  * must be a Source or must generate at least one event to be processed.
  */
 public final class Net {
-    private final HashMap<String, Integer> indices = new HashMap<>();
     private final List<ServerNode> servers = new ArrayList<>();
+    private final HashMap<ServerNode, Integer> indices = new HashMap<>();
     private final List<List<Connection>> connections = new ArrayList<>();
-    private final List<Double> sum = new ArrayList<>();
 
     /**
      * Adds a new server node to the network.
@@ -28,13 +27,12 @@ public final class Net {
      * @throws IllegalArgumentException if the node already exist
      */
     public void addNode(ServerNode node) {
-        if (this.indices.containsKey(node.name))
+        if (this.indices.containsKey(node))
             throw new IllegalArgumentException("Node already exist");
 
         this.servers.add(node);
-        this.indices.put(node.name, this.servers.size() - 1);
+        this.indices.put(node, this.servers.size() - 1);
         this.connections.add(new ArrayList<>());
-        this.sum.add(0.0);
     }
 
     /**
@@ -48,7 +46,7 @@ public final class Net {
      * @throws NullPointerException     if one of the two nodes are not in the net
      * @throws IllegalArgumentException if the weight is negative or zero
      */
-    public void addConnection(String parent, String child, double weight) {
+    public void addConnection(ServerNode parent, ServerNode child, double weight) {
         var nodeP = this.indices.get(parent);
         var nodeC = this.indices.get(child);
 
@@ -86,10 +84,10 @@ public final class Net {
      * @return the resultig node
      */
     public ServerNode getChildOf(ServerNode parent, Rng rng) {
-        var index = this.indices.get(parent.name);
+        var index = this.indices.get(parent);
         var random = rng.random();
         for (var conn : this.connections.get(index)) {
-            random -= conn.weight / 1.0;
+            random -= conn.weight;
             if (random <= 0) {
                 return this.servers.get(conn.index);
             }
diff --git a/src/main/java/net/berack/upo/valpre/sim/ServerNode.java b/src/main/java/net/berack/upo/valpre/sim/ServerNode.java
index 83127eb..63cb395 100644
--- a/src/main/java/net/berack/upo/valpre/sim/ServerNode.java
+++ b/src/main/java/net/berack/upo/valpre/sim/ServerNode.java
@@ -104,4 +104,9 @@ public class ServerNode {
     public boolean shouldSpawnArrival(double numArrivals) {
         return this.spawnArrivals > Math.max(0, numArrivals);
     }
+
+    @Override
+    public int hashCode() {
+        return this.name.hashCode();
+    }
 }