diff --git a/.gitignore b/.gitignore
index c2b7620..408ed1e 100644
Binary files a/.gitignore and b/.gitignore differ
diff --git a/src/berack96/sim/util/graph/Graph.java b/src/berack96/sim/util/graph/Graph.java
index 44e2747..5ae7afa 100644
--- a/src/berack96/sim/util/graph/Graph.java
+++ b/src/berack96/sim/util/graph/Graph.java
@@ -1,518 +1,546 @@
-package berack96.sim.util.graph;
-
-import berack96.sim.util.graph.visit.VisitInfo;
-import berack96.sim.util.graph.visit.VisitStrategy;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-
-/**
- * An interface for the graphs. The Object that represent a vertex
- * @param The Object that represent the edge (more specifically the weight of the edge)
- * @author Berack96
- */
-public interface Graph extends Iterable {
-
- String NOT_DAG = "The graph is not a DAG";
- String NOT_CONNECTED = "The source vertex doesn't have a path that reach the destination";
- String PARAM_NULL = "The parameter must not be null";
- String VERTEX_NOT_CONTAINED = "The vertex must be contained in the graph";
-
- /**
- * Tells if the graph has some cycle. getVertex(V vertex) throws NullPointerException, IllegalArgumentException;
-
- /**
- * Add the vertex to the graph. If it's already in the graph it will be replaced. vertices) throws NullPointerException;
-
- /**
- * Remove the selected vertex from the graph. getMarks(V vertex) throws NullPointerException, IllegalArgumentException;
-
- /**
- * Remove the selected mark from all the vertices
- *
- * @param mark the mark to remove
- * @throws NullPointerException if the mark is null
- */
- void unMarkAll(Object mark) throws NullPointerException;
-
- /**
- * Remove all the marker to all the vertex. edge) throws NullPointerException, IllegalArgumentException;
-
- /**
- * This particular function add an edge to the graph. edge) throws NullPointerException, IllegalArgumentException;
-
- /**
- * Add all the edges of the collection to the graph.> edges) throws NullPointerException;
-
- /**
- * Get the weight of the selected edge. vertices();
-
- /**
- * Get all the edges in the graph.> edges();
-
- /**
- * Retrieve all the edges of a particular vertex.> edgesOf(V vertex) throws NullPointerException, IllegalArgumentException;
-
- /**
- * Retrieve all the edges of a particular vertex.> getEdgesIn(V vertex) throws NullPointerException, IllegalArgumentException;
-
- /**
- * Retrieve all the edges that goes OUT of a particular vertex.> getEdgesOut(V vertex) throws NullPointerException, IllegalArgumentException;
-
- /**
- * Get all the vertices that are children of the vertex passed as parameter. getChildren(V vertex) throws NullPointerException, IllegalArgumentException;
-
- /**
- * Get all the vertices that have the vertex passed as their child. getAncestors(V vertex) throws NullPointerException, IllegalArgumentException;
-
- /**
- * Tells the degree of all the edges that goes to this vertex. visit(V source, VisitStrategy strategy, Consumer visit) throws NullPointerException, IllegalArgumentException;
-
- /**
- * This method will create a new Graph that is the transposed version of the original. transpose();
-
- /**
- * If the current graph is a DAG, it returns a topological sort of this graph. topologicalSort() throws UnsupportedOperationException;
-
- /**
- * The strongly connected components or diconnected components of an arbitrary directed graph form a partition into subgraphs that are themselves strongly connected.
- *
- * @return a collection containing the strongly connected components
- */
- Collection> stronglyConnectedComponents();
-
- /**
- * Get a sub-graph of the current one based on the maximum depth that is given. subGraph(V source, int depth) throws NullPointerException, IllegalArgumentException;
-
- /**
- * Get a sub-graph of the current one with only the vertex marked with the selected marker. subGraph(Object marker);
-
- /**
- * Get the minimum path from the source vertex to the destination vertex.> distance(V source, V destination) throws NullPointerException, IllegalArgumentException, UnsupportedOperationException;
-
- /**
- * Get the minimum path from the source vertex to all the possible reachable vertices.
- *
- * @param source the vertex where to start
- * @return a map containing all the possible reachable vertices from the source and the minimum path to reach them
- * @throws NullPointerException if one of the parameter is null (except the consumer)
- * @throws IllegalArgumentException if the vertex is not in the graph
- */
- Map>> distance(V source) throws NullPointerException, IllegalArgumentException;
-
- // TODO maybe -> STATIC saveOnFile(orString) INSTANCE loadFromFile(orString), but need JSON parser
- // TODO maybe, but i don't think so... STATIC DISTANCE V* -> V*
-}
+package berack96.sim.util.graph;
+
+import berack96.sim.util.graph.visit.VisitInfo;
+import berack96.sim.util.graph.visit.VisitStrategy;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
+/**
+ * An interface for the graphs. The Object that represent a vertex
+ * @param The Object that represent the edge (more specifically the weight of the edge)
+ * @author Berack96
+ */
+public interface Graph extends Iterable {
+
+ String NOT_DAG = "The graph is not a DAG";
+ String NOT_CONNECTED = "The source vertex doesn't have a path that reach the destination";
+ String PARAM_NULL = "The parameter must not be null";
+ String VERTEX_NOT_CONTAINED = "The vertex must be contained in the graph";
+
+ /**
+ * Tells if the graph has some cycle. getVertex(V vertex) throws NullPointerException, IllegalArgumentException;
+
+ /**
+ * Add the vertex to the graph. If it's already in the graph it will be replaced. vertices) throws NullPointerException;
+
+ /**
+ * Remove the selected vertex from the graph. getMarkedWith(Object mark) throws NullPointerException;
+
+ /**
+ * Get all the marker of this vertex. getMarks(V vertex) throws NullPointerException, IllegalArgumentException;
+
+ /**
+ * Remove the selected mark from all the vertices
+ *
+ * @param mark the mark to remove
+ * @throws NullPointerException if the mark is null
+ */
+ void unMarkAll(Object mark) throws NullPointerException;
+
+ /**
+ * Remove all the marker to all the vertex. edge) throws NullPointerException, IllegalArgumentException;
+
+ /**
+ * This particular function add an edge to the graph. edge) throws NullPointerException, IllegalArgumentException;
+
+ /**
+ * Add all the edges of the collection to the graph.> edges) throws NullPointerException;
+
+ /**
+ * Get the weight of the selected edge. vertices();
+
+ /**
+ * Get all the edges in the graph.> edges();
+
+ /**
+ * Retrieve all the edges of a particular vertex.> edgesOf(V vertex) throws NullPointerException, IllegalArgumentException;
+
+ /**
+ * Retrieve all the edges of a particular vertex.> getEdgesIn(V vertex) throws NullPointerException, IllegalArgumentException;
+
+ /**
+ * Retrieve all the edges that goes OUT of a particular vertex.> getEdgesOut(V vertex) throws NullPointerException, IllegalArgumentException;
+
+ /**
+ * Get all the vertices that are children of the vertex passed as parameter. getChildren(V vertex) throws NullPointerException, IllegalArgumentException;
+
+ /**
+ * Get all the vertices that have the vertex passed as their child. getAncestors(V vertex) throws NullPointerException, IllegalArgumentException;
+
+ /**
+ * Tells the degree of all the edges that goes to this vertex. visit(V source, VisitStrategy strategy, Consumer visit) throws NullPointerException, IllegalArgumentException;
+
+ /**
+ * This method will create a new Graph that is the transposed version of the original. transpose();
+
+ /**
+ * If the current graph is a DAG, it returns a topological sort of this graph. topologicalSort() throws UnsupportedOperationException;
+
+ /**
+ * The strongly connected components or disconnected components of an arbitrary directed graph
+ * form a partition into subgraphs that are themselves strongly connected.
+ *
+ * @return a collection containing the strongly connected components
+ */
+ Collection> stronglyConnectedComponents();
+
+ /**
+ * Get a sub-graph of the current one based on the maximum depth that is given. subGraph(V source, int depth) throws NullPointerException, IllegalArgumentException;
+
+ /**
+ * Get a sub-graph of the current one with only the vertex marked with the selected marker. subGraph(Object marker);
+
+ /**
+ * Get the minimum path from the source vertex to the destination vertex.> distance(V source, V destination) throws NullPointerException, IllegalArgumentException, UnsupportedOperationException;
+
+ /**
+ * Get the minimum path from the source vertex to all the possible reachable vertices.
+ *
+ * @param source the vertex where to start
+ * @return a map containing all the possible reachable vertices from the source and the minimum path to reach them
+ * @throws NullPointerException if one of the parameter is null (except the consumer)
+ * @throws IllegalArgumentException if the vertex is not in the graph
+ */
+ Map>> distance(V source) throws NullPointerException, IllegalArgumentException;
+
+ // TODO maybe -> STATIC saveOnFile(orString) INSTANCE loadFromFile(orString), but need JSON parser
+ // TODO maybe, but i don't think so... STATIC DISTANCE V* -> V*
+}
diff --git a/src/berack96/sim/util/graph/MapGraph.java b/src/berack96/sim/util/graph/MapGraph.java
index d13b04d..6e50cce 100644
--- a/src/berack96/sim/util/graph/MapGraph.java
+++ b/src/berack96/sim/util/graph/MapGraph.java
@@ -1,488 +1,500 @@
-package berack96.sim.util.graph;
-
-import berack96.sim.util.graph.visit.Dijkstra;
-import berack96.sim.util.graph.visit.Tarjan;
-import berack96.sim.util.graph.visit.VisitInfo;
-import berack96.sim.util.graph.visit.VisitStrategy;
-
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-
-/**
- * Graph that uses HashMap for vertices and edges the vertices
- * @param the weight of the edges
- * @author Berack96
- */
-public class MapGraph implements Graph {
-
- /**
- * Map that contains the edges from a vertex to another> edges = new HashMap<>();
-
- /**
- * Map that contains the vertex as key and all the marker as the value associated with that vertex.
- */
- private final Map> marked = new HashMap<>();
-
- /**
- * Need this variable for not calculating each time the SCC or the cyclic part if the graph doesn't change
- */
- private Tarjan tarjan = null;
-
- /**
- * Need this variable for not calculating each time the distance from a vertex to all his destinations if the graph doesn't change
- */
- private Map> dijkstra = null;
-
- @Override
- public boolean isCyclic() {
- return stronglyConnectedComponents().size() != numberOfVertices();
- }
-
- @Override
- public boolean isDAG() {
- return !isCyclic();
- }
-
- @Override
- public Vertex getVertex(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
- return new Vertex<>(this, vertex);
- }
-
- @Override
- public void addVertex(V vertex) throws NullPointerException {
- checkNull(vertex);
- graphChanged();
- edges.put(vertex, new HashMap<>());
- }
-
- @Override
- public boolean addVertexIfAbsent(V vertex) throws NullPointerException {
- if (contains(vertex))
- return false;
- addVertex(vertex);
- return true;
- }
-
- @Override
- public void addAllVertices(Collection vertices) throws NullPointerException {
- checkNull(vertices);
- vertices.forEach(this::addVertexIfAbsent);
- }
-
- @Override
- public void removeVertex(V vertex) throws NullPointerException {
- if (contains(vertex)) {
- graphChanged();
- edges.remove(vertex);
- edges.forEach((v, map) -> map.remove(vertex));
- }
- }
-
- @Override
- public void removeAllVertex() {
- graphChanged();
- edges.clear();
- }
-
- @Override
- public boolean contains(V vertex) throws NullPointerException {
- checkNull(vertex);
- return edges.containsKey(vertex);
- }
-
- @Override
- public void mark(V vertex, Object mark) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
- checkNull(mark);
-
- Set set = marked.computeIfAbsent(vertex, (m) -> new HashSet<>());
- set.add(mark);
- }
-
- @Override
- public void unMark(V vertex, Object mark) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
- checkNull(mark);
- marked.get(vertex).remove(mark);
- }
-
- @Override
- public void unMark(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
- marked.get(vertex).clear();
- }
-
- @Override
- public Set getMarks(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
- return marked.computeIfAbsent(vertex, (m) -> new HashSet<>());
- }
-
- @Override
- public void unMarkAll(Object mark) {
- checkNull(mark);
- marked.forEach((v, m) -> m.remove(mark));
- }
-
- @Override
- public void unMarkAll() {
- marked.clear();
- }
-
- @Override
- public W addEdge(V vertex1, V vertex2, W weight) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex1);
- checkNullAndExist(vertex2);
- checkNull(weight);
-
- graphChanged();
- return edges.get(vertex1).put(vertex2, weight);
- }
-
- @Override
- public W addEdge(Edge edge) throws NullPointerException, IllegalArgumentException {
- return addEdge(edge.getSource(), edge.getDestination(), edge.getWeight());
- }
-
- @Override
- public W addEdgeAndVertices(V vertex1, V vertex2, W weight) throws NullPointerException {
- addVertexIfAbsent(vertex1);
- addVertexIfAbsent(vertex2);
- return addEdge(vertex1, vertex2, weight);
- }
-
- @Override
- public W addEdgeAndVertices(Edge edge) throws NullPointerException, IllegalArgumentException {
- return addEdgeAndVertices(edge.getSource(), edge.getDestination(), edge.getWeight());
- }
-
- @Override
- public void addAllEdges(Collection> edges) throws NullPointerException {
- edges.forEach((edge) -> addEdgeAndVertices(edge.getSource(), edge.getDestination(), edge.getWeight()));
- }
-
- @Override
- public W getWeight(V vertex1, V vertex2) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex1);
- checkNullAndExist(vertex2);
-
- return edges.get(vertex1).get(vertex2);
- }
-
- @Override
- public void removeEdge(V vertex1, V vertex2) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex1);
- checkNullAndExist(vertex2);
-
- graphChanged();
- edges.get(vertex1).remove(vertex2);
- }
-
- @Override
- public void removeAllInEdge(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
-
- graphChanged();
- edges.forEach((v, map) -> map.remove(vertex));
- }
-
- @Override
- public void removeAllOutEdge(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
-
- graphChanged();
- edges.put(vertex, new HashMap<>());
- }
-
- @Override
- public void removeAllEdge(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
- removeVertex(vertex);
- addVertex(vertex);
- }
-
- @Override
- public void removeAllEdge() {
- graphChanged();
- edges.forEach((v, map) -> map.clear());
- }
-
- @Override
- public boolean containsEdge(V vertex1, V vertex2) throws NullPointerException {
- return (contains(vertex1) && contains(vertex2)) && edges.get(vertex1).get(vertex2) != null;
- }
-
- @Override
- public Set vertices() {
- return new HashSet<>(edges.keySet());
- }
-
- @Override
- public Set> edges() {
- Set> allEdges = new HashSet<>();
- edges.forEach((source, map) -> map.forEach((destination, weight) -> allEdges.add(new Edge<>(source, destination, weight))));
- return allEdges;
- }
-
- @Override
- public Set> edgesOf(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
-
- Set> set = new HashSet<>();
- edges.forEach((source, map) -> map.forEach((destination, weight) -> {
- if (destination.equals(vertex) || source.equals(vertex))
- set.add(new Edge<>(source, destination, weight));
- }));
- return set;
- }
-
- @Override
- public Collection> getEdgesIn(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
- Collection> collection = new HashSet<>();
- edges.forEach((source, edge) -> {
- if (edge.get(vertex) != null)
- collection.add(new Edge<>(source, vertex, edge.get(vertex)));
- });
-
- return collection;
- }
-
- @Override
- public Collection> getEdgesOut(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
- Collection> collection = new HashSet<>();
- edges.get(vertex).forEach((dest, weight) -> collection.add(new Edge<>(vertex, dest, weight)));
-
- return collection;
- }
-
- @Override
- public Set getChildren(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
-
- return new HashSet<>(edges.get(vertex).keySet());
- }
-
- @Override
- public Set getAncestors(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
-
- Set set = new HashSet<>();
- edges.forEach((v, map) -> {
- if (map.containsKey(vertex)) set.add(v);
- });
- return set;
- }
-
- @Override
- public int degreeIn(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
-
- AtomicInteger sum = new AtomicInteger();
- edges.forEach((v, map) -> {
- if (map.containsKey(vertex))
- sum.getAndIncrement();
- });
-
- return sum.get();
- }
-
- @Override
- public int degreeOut(V vertex) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(vertex);
-
- return edges.get(vertex).size();
- }
-
- @Override
- public int degree(V vertex) throws NullPointerException, IllegalArgumentException {
- return degreeIn(vertex) + degreeOut(vertex);
- }
-
- @Override
- public int numberOfVertices() {
- return edges.size();
- }
-
- @Override
- public int numberOfEdges() {
- AtomicInteger sum = new AtomicInteger(0);
- edges.forEach((v, map) -> sum.getAndAdd(map.size()));
-
- return sum.get();
- }
-
- @Override
- public VisitInfo visit(V source, VisitStrategy strategy, Consumer visit) throws NullPointerException, IllegalArgumentException {
- return strategy.visit(this, source, visit);
- }
-
- @Override
- public Graph transpose() {
- Graph graph = new MapGraph<>();
- for (V vertex : edges.keySet())
- graph.addVertex(vertex);
-
- edges.forEach((source, map) -> map.forEach((destination, weight) -> graph.addEdge(destination, source, weight)));
-
- return graph;
- }
-
- @Override
- public List topologicalSort() throws UnsupportedOperationException {
- if (!isDAG())
- throw new UnsupportedOperationException(NOT_DAG);
- return getTarjan().getTopologicalSort();
- }
-
- @Override
- public Collection> stronglyConnectedComponents() {
- return getTarjan().getSCC();
- }
-
- @Override
- public Graph subGraph(V source, int depth) throws NullPointerException, IllegalArgumentException {
- Graph sub = new MapGraph<>();
- Set vertices = new HashSet<>();
-
- int finalDepth = depth > 0 ? depth : 0;
- VisitStrategy strategy = (graph, sourceVertex, visit) -> {
- int currentDepth = 0;
- final LinkedList> toVisitChildren = new LinkedList<>();
- toVisitChildren.add(new AbstractMap.SimpleEntry<>(sourceVertex, 0));
- vertices.add(source);
-
- while (!toVisitChildren.isEmpty() && currentDepth + 1 <= finalDepth) {
- final Map.Entry current = toVisitChildren.removeFirst();
- currentDepth = current.getValue() + 1;
- final int finalCurrentDepth = currentDepth;
-
- for (V child : graph.getChildren(current.getKey()))
- if (!vertices.contains(child)) {
- toVisitChildren.addLast(new AbstractMap.SimpleEntry<>(child, finalCurrentDepth));
- vertices.add(child);
- }
- }
- return null;
- };
-
- strategy.visit(this, source, null);
-
- sub.addAllVertices(vertices);
- for (V vertex : vertices)
- getEdgesOut(vertex).forEach((edge) -> {
- try {
- sub.addEdge(edge);
- } catch (Exception ignored) {
- }
- });
-
- return sub;
- }
-
- @Override
- public Graph subGraph(final Object marker) {
- final Graph graph = new MapGraph<>();
- final Set allVertices = new HashSet<>();
-
- marked.forEach((vertex, mark) -> {
- if (mark.contains(marker) || (marker == null && !mark.isEmpty()))
- allVertices.add(vertex);
- });
-
- if (marker == null) {
- Collection toAdd = graph.vertices();
- toAdd.removeAll(allVertices);
- allVertices.clear();
- allVertices.addAll(toAdd);
- }
-
- graph.addAllVertices(allVertices);
- for (V vertex : graph.vertices())
- getEdgesOut(vertex).forEach((edge) -> {
- try {
- graph.addEdge(edge);
- } catch (Exception ignored) {
- }
- });
-
- return graph;
- }
-
- @Override
- public List> distance(V source, V destination) throws NullPointerException, IllegalArgumentException, UnsupportedOperationException {
- checkNullAndExist(source);
- checkNullAndExist(destination);
-
- Dijkstra dijkstra = getDijkstra(source);
- List> path = dijkstra.getLastDistance().get(destination);
- if (path == null)
- throw new UnsupportedOperationException(NOT_CONNECTED);
- return new ArrayList<>(path);
- }
-
- @Override
- public Map>> distance(V source) throws NullPointerException, IllegalArgumentException {
- checkNullAndExist(source);
- return new HashMap<>(getDijkstra(source).getLastDistance());
- }
-
- @Override
- public Iterator iterator() {
- return edges.keySet().iterator();
- }
-
-
- /**
- * Simple function that set all the memory vars at null if the graph changed
- */
- private void graphChanged() {
- tarjan = null;
- dijkstra = null;
- }
-
- private Dijkstra getDijkstra(V source) {
- if (dijkstra == null)
- dijkstra = new HashMap<>();
- if (dijkstra.get(source) == null) {
- Dijkstra newDijkstra = new Dijkstra<>();
- newDijkstra.visit(this, source, null);
- dijkstra.put(source, newDijkstra);
- }
-
- return dijkstra.get(source);
- }
-
- private Tarjan getTarjan() {
- if (tarjan == null) {
- tarjan = new Tarjan<>();
- tarjan.visit(this, null, null);
- }
-
- return tarjan;
- }
-
- private void checkNull(Object object) {
- if (object == null)
- throw new NullPointerException(PARAM_NULL);
- }
-
- private void checkNullAndExist(V vertex) {
- checkNull(vertex);
- if (!edges.containsKey(vertex))
- throw new IllegalArgumentException(VERTEX_NOT_CONTAINED);
- }
-}
+package berack96.sim.util.graph;
+
+import berack96.sim.util.graph.visit.Dijkstra;
+import berack96.sim.util.graph.visit.Tarjan;
+import berack96.sim.util.graph.visit.VisitInfo;
+import berack96.sim.util.graph.visit.VisitStrategy;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+
+/**
+ * Graph that uses HashMap for vertices and edges the vertices
+ * @param the weight of the edges
+ * @author Berack96
+ */
+public class MapGraph implements Graph {
+
+ /**
+ * Map that contains the edges from a vertex to another> edges = new HashMap<>();
+
+ /**
+ * Map that contains the vertex as key and all the marker as the value associated with that vertex.
+ */
+ private final Map> marked = new HashMap<>();
+
+ /**
+ * Need this variable for not calculating each time the SCC or the cyclic part if the graph doesn't change
+ */
+ private Tarjan tarjan = null;
+
+ /**
+ * Need this variable for not calculating each time the distance from a vertex to all his destinations if the graph doesn't change
+ */
+ private Map> dijkstra = null;
+
+ @Override
+ public boolean isCyclic() {
+ return stronglyConnectedComponents().size() != numberOfVertices();
+ }
+
+ @Override
+ public boolean isDAG() {
+ return !isCyclic();
+ }
+
+ @Override
+ public Vertex getVertex(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+ return new Vertex<>(this, vertex);
+ }
+
+ @Override
+ public void addVertex(V vertex) throws NullPointerException {
+ checkNull(vertex);
+ graphChanged();
+ edges.put(vertex, new HashMap<>());
+ }
+
+ @Override
+ public boolean addVertexIfAbsent(V vertex) throws NullPointerException {
+ if (contains(vertex))
+ return false;
+ addVertex(vertex);
+ return true;
+ }
+
+ @Override
+ public void addAllVertices(Collection vertices) throws NullPointerException {
+ checkNull(vertices);
+ vertices.forEach(this::addVertexIfAbsent);
+ }
+
+ @Override
+ public void removeVertex(V vertex) throws NullPointerException {
+ if (contains(vertex)) {
+ graphChanged();
+ edges.remove(vertex);
+ edges.forEach((v, map) -> map.remove(vertex));
+ }
+ }
+
+ @Override
+ public void removeAllVertex() {
+ graphChanged();
+ edges.clear();
+ }
+
+ @Override
+ public boolean contains(V vertex) throws NullPointerException {
+ checkNull(vertex);
+ return edges.containsKey(vertex);
+ }
+
+ @Override
+ public void mark(V vertex, Object mark) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+ checkNull(mark);
+
+ Set set = marked.computeIfAbsent(vertex, (m) -> new HashSet<>());
+ set.add(mark);
+ }
+
+ @Override
+ public void unMark(V vertex, Object mark) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+ checkNull(mark);
+ marked.get(vertex).remove(mark);
+ }
+
+ @Override
+ public void unMark(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+ marked.get(vertex).clear();
+ }
+
+ @Override
+ public Collection getMarkedWith(Object mark) throws NullPointerException {
+ checkNull(mark);
+ Collection ret = new HashSet();
+ marked.forEach((v, set) -> {
+ if(set.contains(mark))
+ ret.add(v);
+ });
+
+ return ret;
+ }
+
+ @Override
+ public Set getMarks(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+ return marked.computeIfAbsent(vertex, (m) -> new HashSet<>());
+ }
+
+ @Override
+ public void unMarkAll(Object mark) {
+ checkNull(mark);
+ marked.forEach((v, m) -> m.remove(mark));
+ }
+
+ @Override
+ public void unMarkAll() {
+ marked.clear();
+ }
+
+ @Override
+ public W addEdge(V vertex1, V vertex2, W weight) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex1);
+ checkNullAndExist(vertex2);
+ checkNull(weight);
+
+ graphChanged();
+ return edges.get(vertex1).put(vertex2, weight);
+ }
+
+ @Override
+ public W addEdge(Edge edge) throws NullPointerException, IllegalArgumentException {
+ return addEdge(edge.getSource(), edge.getDestination(), edge.getWeight());
+ }
+
+ @Override
+ public W addEdgeAndVertices(V vertex1, V vertex2, W weight) throws NullPointerException {
+ addVertexIfAbsent(vertex1);
+ addVertexIfAbsent(vertex2);
+ return addEdge(vertex1, vertex2, weight);
+ }
+
+ @Override
+ public W addEdgeAndVertices(Edge edge) throws NullPointerException, IllegalArgumentException {
+ return addEdgeAndVertices(edge.getSource(), edge.getDestination(), edge.getWeight());
+ }
+
+ @Override
+ public void addAllEdges(Collection> edges) throws NullPointerException {
+ edges.forEach((edge) -> addEdgeAndVertices(edge.getSource(), edge.getDestination(), edge.getWeight()));
+ }
+
+ @Override
+ public W getWeight(V vertex1, V vertex2) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex1);
+ checkNullAndExist(vertex2);
+
+ return edges.get(vertex1).get(vertex2);
+ }
+
+ @Override
+ public void removeEdge(V vertex1, V vertex2) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex1);
+ checkNullAndExist(vertex2);
+
+ graphChanged();
+ edges.get(vertex1).remove(vertex2);
+ }
+
+ @Override
+ public void removeAllInEdge(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+
+ graphChanged();
+ edges.forEach((v, map) -> map.remove(vertex));
+ }
+
+ @Override
+ public void removeAllOutEdge(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+
+ graphChanged();
+ edges.put(vertex, new HashMap<>());
+ }
+
+ @Override
+ public void removeAllEdge(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+ removeVertex(vertex);
+ addVertex(vertex);
+ }
+
+ @Override
+ public void removeAllEdge() {
+ graphChanged();
+ edges.forEach((v, map) -> map.clear());
+ }
+
+ @Override
+ public boolean containsEdge(V vertex1, V vertex2) throws NullPointerException {
+ return (contains(vertex1) && contains(vertex2)) && edges.get(vertex1).get(vertex2) != null;
+ }
+
+ @Override
+ public Set vertices() {
+ return new HashSet<>(edges.keySet());
+ }
+
+ @Override
+ public Set> edges() {
+ Set> allEdges = new HashSet<>();
+ edges.forEach((source, map) -> map.forEach((destination, weight) -> allEdges.add(new Edge<>(source, destination, weight))));
+ return allEdges;
+ }
+
+ @Override
+ public Set> edgesOf(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+
+ Set> set = new HashSet<>();
+ edges.forEach((source, map) -> map.forEach((destination, weight) -> {
+ if (destination.equals(vertex) || source.equals(vertex))
+ set.add(new Edge<>(source, destination, weight));
+ }));
+ return set;
+ }
+
+ @Override
+ public Collection> getEdgesIn(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+ Collection> collection = new HashSet<>();
+ edges.forEach((source, edge) -> {
+ if (edge.get(vertex) != null)
+ collection.add(new Edge<>(source, vertex, edge.get(vertex)));
+ });
+
+ return collection;
+ }
+
+ @Override
+ public Collection> getEdgesOut(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+ Collection> collection = new HashSet<>();
+ edges.get(vertex).forEach((dest, weight) -> collection.add(new Edge<>(vertex, dest, weight)));
+
+ return collection;
+ }
+
+ @Override
+ public Set getChildren(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+
+ return new HashSet<>(edges.get(vertex).keySet());
+ }
+
+ @Override
+ public Set getAncestors(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+
+ Set set = new HashSet<>();
+ edges.forEach((v, map) -> {
+ if (map.containsKey(vertex)) set.add(v);
+ });
+ return set;
+ }
+
+ @Override
+ public int degreeIn(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+
+ AtomicInteger sum = new AtomicInteger();
+ edges.forEach((v, map) -> {
+ if (map.containsKey(vertex))
+ sum.getAndIncrement();
+ });
+
+ return sum.get();
+ }
+
+ @Override
+ public int degreeOut(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(vertex);
+
+ return edges.get(vertex).size();
+ }
+
+ @Override
+ public int degree(V vertex) throws NullPointerException, IllegalArgumentException {
+ return degreeIn(vertex) + degreeOut(vertex);
+ }
+
+ @Override
+ public int numberOfVertices() {
+ return edges.size();
+ }
+
+ @Override
+ public int numberOfEdges() {
+ AtomicInteger sum = new AtomicInteger(0);
+ edges.forEach((v, map) -> sum.getAndAdd(map.size()));
+
+ return sum.get();
+ }
+
+ @Override
+ public VisitInfo visit(V source, VisitStrategy strategy, Consumer visit) throws NullPointerException, IllegalArgumentException {
+ return strategy.visit(this, source, visit);
+ }
+
+ @Override
+ public Graph transpose() {
+ Graph graph = new MapGraph<>();
+ for (V vertex : edges.keySet())
+ graph.addVertex(vertex);
+
+ edges.forEach((source, map) -> map.forEach((destination, weight) -> graph.addEdge(destination, source, weight)));
+
+ return graph;
+ }
+
+ @Override
+ public List topologicalSort() throws UnsupportedOperationException {
+ if (!isDAG())
+ throw new UnsupportedOperationException(NOT_DAG);
+ return getTarjan().getTopologicalSort();
+ }
+
+ @Override
+ public Collection> stronglyConnectedComponents() {
+ return getTarjan().getSCC();
+ }
+
+ @Override
+ public Graph subGraph(V source, int depth) throws NullPointerException, IllegalArgumentException {
+ Graph sub = new MapGraph<>();
+ Set vertices = new HashSet<>();
+
+ int finalDepth = depth > 0 ? depth : 0;
+ VisitStrategy strategy = (graph, sourceVertex, visit) -> {
+ int currentDepth = 0;
+ final LinkedList> toVisitChildren = new LinkedList<>();
+ toVisitChildren.add(new AbstractMap.SimpleEntry<>(sourceVertex, 0));
+ vertices.add(source);
+
+ while (!toVisitChildren.isEmpty() && currentDepth + 1 <= finalDepth) {
+ final Map.Entry current = toVisitChildren.removeFirst();
+ currentDepth = current.getValue() + 1;
+ final int finalCurrentDepth = currentDepth;
+
+ for (V child : graph.getChildren(current.getKey()))
+ if (!vertices.contains(child)) {
+ toVisitChildren.addLast(new AbstractMap.SimpleEntry<>(child, finalCurrentDepth));
+ vertices.add(child);
+ }
+ }
+ return null;
+ };
+
+ strategy.visit(this, source, null);
+
+ sub.addAllVertices(vertices);
+ for (V vertex : vertices)
+ getEdgesOut(vertex).forEach((edge) -> {
+ try {
+ sub.addEdge(edge);
+ } catch (Exception ignored) {
+ }
+ });
+
+ return sub;
+ }
+
+ @Override
+ public Graph subGraph(final Object marker) {
+ final Graph graph = new MapGraph<>();
+ final Set allVertices = new HashSet<>();
+
+ marked.forEach((vertex, mark) -> {
+ if (mark.contains(marker) || (marker == null && !mark.isEmpty()))
+ allVertices.add(vertex);
+ });
+
+ if (marker == null) {
+ Collection toAdd = graph.vertices();
+ toAdd.removeAll(allVertices);
+ allVertices.clear();
+ allVertices.addAll(toAdd);
+ }
+
+ graph.addAllVertices(allVertices);
+ for (V vertex : graph.vertices())
+ getEdgesOut(vertex).forEach((edge) -> {
+ try {
+ graph.addEdge(edge);
+ } catch (Exception ignored) {
+ }
+ });
+
+ return graph;
+ }
+
+ @Override
+ public List> distance(V source, V destination) throws NullPointerException, IllegalArgumentException, UnsupportedOperationException {
+ checkNullAndExist(source);
+ checkNullAndExist(destination);
+
+ Dijkstra dijkstra = getDijkstra(source);
+ List> path = dijkstra.getLastDistance().get(destination);
+ if (path == null)
+ throw new UnsupportedOperationException(NOT_CONNECTED);
+ return new ArrayList<>(path);
+ }
+
+ @Override
+ public Map>> distance(V source) throws NullPointerException, IllegalArgumentException {
+ checkNullAndExist(source);
+ return new HashMap<>(getDijkstra(source).getLastDistance());
+ }
+
+ @Override
+ public Iterator iterator() {
+ return edges.keySet().iterator();
+ }
+
+
+ /**
+ * Simple function that set all the memory vars at null if the graph changed
+ */
+ private void graphChanged() {
+ tarjan = null;
+ dijkstra = null;
+ }
+
+ private Dijkstra getDijkstra(V source) {
+ if (dijkstra == null)
+ dijkstra = new HashMap<>();
+ if (dijkstra.get(source) == null) {
+ Dijkstra newDijkstra = new Dijkstra<>();
+ newDijkstra.visit(this, source, null);
+ dijkstra.put(source, newDijkstra);
+ }
+
+ return dijkstra.get(source);
+ }
+
+ private Tarjan getTarjan() {
+ if (tarjan == null) {
+ tarjan = new Tarjan<>();
+ tarjan.visit(this, null, null);
+ }
+
+ return tarjan;
+ }
+
+ private void checkNull(Object object) {
+ if (object == null)
+ throw new NullPointerException(PARAM_NULL);
+ }
+
+ private void checkNullAndExist(V vertex) {
+ checkNull(vertex);
+ if (!edges.containsKey(vertex))
+ throw new IllegalArgumentException(VERTEX_NOT_CONTAINED);
+ }
+}
diff --git a/src/berack96/sim/util/graph/Vertex.java b/src/berack96/sim/util/graph/Vertex.java
index 3e29425..d369555 100644
--- a/src/berack96/sim/util/graph/Vertex.java
+++ b/src/berack96/sim/util/graph/Vertex.java
@@ -15,7 +15,7 @@ import java.util.function.Consumer;
* @param the vertex
* @author Berack96
*/
-@SuppressWarnings("unchecked")
+@SuppressWarnings({"unchecked", "rawtypes"})
public class Vertex {
public static final String REMOVED = "The vertex is no longer in the graph";
@@ -240,7 +240,7 @@ public class Vertex {
* @throws NullPointerException if the strategy is null
* @throws UnsupportedOperationException if the vertex is not in the graph anymore
*/
- public VisitInfo visit(final VisitStrategy strategy, final Consumer visit) throws NullPointerException, UnsupportedOperationException {
+ public VisitInfo visit(final VisitStrategy strategy, final Consumer visit) throws NullPointerException, UnsupportedOperationException {
throwIfNotContained();
return graph.visit(vertex, (VisitStrategy) strategy, visit);
}
diff --git a/src/berack96/sim/util/graph/view/GraphInfo.java b/src/berack96/sim/util/graph/view/GraphInfo.java
new file mode 100644
index 0000000..7794dca
--- /dev/null
+++ b/src/berack96/sim/util/graph/view/GraphInfo.java
@@ -0,0 +1,162 @@
+package berack96.sim.util.graph.view;
+
+import berack96.sim.util.graph.Graph;
+import berack96.sim.util.graph.view.edge.EdgeListener;
+import berack96.sim.util.graph.view.vertex.VertexListener;
+import berack96.sim.util.graph.visit.VisitStrategy;
+
+import javax.swing.*;
+import javax.swing.border.BevelBorder;
+import java.awt.*;
+import java.awt.event.ItemEvent;
+import java.util.*;
+import java.util.List;
+
+public class GraphInfo extends JPanel {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Map> visits;
+
+ public GraphInfo(GraphPanel graphPanel, VertexListener vListener, EdgeListener eListener, Set> visits) {
+ this.visits = new HashMap<>();
+
+ /* ZERO (DESCRIPTION) */
+ JLabel listenerDescription = new JLabel();
+
+ JPanel panelDescription = new JPanel();
+ panelDescription.setOpaque(false);
+ panelDescription.add(listenerDescription);
+
+ /* FIRST (GRAPH INFO) */
+
+ JLabel vNumber = new JLabel(String.valueOf(graphPanel.getGraph().numberOfVertices()));
+ JLabel eNumber = new JLabel(String.valueOf(graphPanel.getGraph().numberOfEdges()));
+ JLabel gCyclic = new JLabel(String.valueOf(graphPanel.getGraph().isCyclic()));
+
+ List components = new LinkedList<>();
+ JLabel selected = new JLabel();
+ JComboBox comboBox = new JComboBox<>();
+ comboBox.addItemListener(e -> {
+ if (e.getStateChange() == ItemEvent.SELECTED) {
+ try {
+ String clazz = (String) e.getItem();
+ VisitListener listener = this.visits.get(clazz);
+
+ selected.setText(listener != null? "visit":"nothing");
+ listenerDescription.setText(listener != null? listener.getDescription():"");
+
+ graphPanel.getGraph().unMarkAll();
+ graphPanel.repaint();
+ graphPanel.setGraphListener(listener);
+
+ } catch (Exception ignore) {}
+ }
+
+ });
+
+ comboBox.addItem("None");
+ for(VisitStrategy strategy: visits) {
+ String clazz = strategy.getClass().getSimpleName();
+ VisitListener visit = new VisitListener<>(graphPanel, strategy);
+ comboBox.addItem(clazz);
+ this.visits.put(clazz, visit);
+ }
+
+ components.add(new JLabel("Visit Strategy: "));
+ components.add(comboBox);
+ components.add(new JLabel("Selected modality: "));
+ components.add(selected);
+ components.add(new JLabel("Vertex Number: "));
+ components.add(vNumber);
+ components.add(new JLabel("Edge Number: "));
+ components.add(eNumber);
+ components.add(new JLabel("Is Cyclic: "));
+ components.add(gCyclic);
+
+ JPanel panelInfo = new JPanel();
+ panelInfo.setOpaque(false);
+ panelInfo.setBorder(BorderFactory.createLineBorder(Color.RED));
+ panelInfo.setLayout(new GridLayout(components.size()/2, 2, 2*2, 2*2));
+ components.forEach(panelInfo::add);
+ components.clear();
+
+ /* SECOND (VERTEX) */
+ JLabel vVertex = new JLabel();
+ JLabel vEdgesNumber = new JLabel();
+ JLabel vEdgesInNumber = new JLabel();
+ JLabel vEdgesOutNumber = new JLabel();
+
+ JButton modVertex = new JButton("Modify Vertices");
+ modVertex.addActionListener(a -> {
+ comboBox.setSelectedIndex(0);
+ listenerDescription.setText(vListener.getDescription());
+ graphPanel.setGraphListener(vListener);
+ graphPanel.getGraph().unMarkAll();
+ graphPanel.repaint();
+ selected.setText("vertices");
+ });
+
+ JButton modEdge = new JButton("Modify Edges");
+ modEdge.addActionListener(a -> {
+ comboBox.setSelectedIndex(0);
+ listenerDescription.setText(eListener.getDescription());
+ graphPanel.setGraphListener(eListener);
+ graphPanel.getGraph().unMarkAll();
+ graphPanel.repaint();
+ selected.setText("edges");
+ });
+
+ components.add(modVertex);
+ components.add(modEdge);
+ components.add(new JLabel("Vertex name: "));
+ components.add(vVertex);
+ components.add(new JLabel("Edges: "));
+ components.add(vEdgesNumber);
+ components.add(new JLabel("Edges IN: "));
+ components.add(vEdgesInNumber);
+ components.add(new JLabel("Edges OUT: "));
+ components.add(vEdgesOutNumber);
+
+ JPanel panelVertex = new JPanel();
+ panelVertex.setOpaque(false);
+ panelVertex.setLayout(new GridLayout(components.size()/2, 2, 2*2, 2*2));
+ components.forEach(panelVertex::add);
+
+ /* Save/Load
+ JPanel panelSave = new JPanel(); */
+
+
+ /* ADDING COMPONENTS */
+ this.setBackground(Color.LIGHT_GRAY);
+ this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+ this.setOpaque(true);
+ this.setBorder(BorderFactory.createSoftBevelBorder(BevelBorder.RAISED, Color.GRAY, Color.DARK_GRAY));
+ this.add(panelDescription);
+ this.add(panelInfo);
+ this.add(panelVertex);
+ this.add(Box.createVerticalGlue());
+
+ modVertex.doClick();
+
+ graphPanel.addObserver((o, arg) -> {
+ Graph graph = graphPanel.getGraph();
+ if(arg.equals(graph)) {
+ vNumber.setText(String.valueOf(graph.numberOfVertices()));
+ eNumber.setText(String.valueOf(graph.numberOfEdges()));
+ gCyclic.setText(String.valueOf(graph.isCyclic()));
+
+ /* There should be only one */
+ for(V v : graph.getMarkedWith("selected")) {
+ int inE = graph.getEdgesIn(v).size();
+ int outE = graph.getEdgesOut(v).size();
+
+ vEdgesInNumber.setText(String.valueOf(inE));
+ vEdgesOutNumber.setText(String.valueOf(outE));
+ vEdgesNumber.setText(String.valueOf(inE + outE));
+ vVertex.setText(v.toString());
+ }
+ }
+ });
+ }
+}
diff --git a/src/berack96/sim/util/graph/view/GraphListener.java b/src/berack96/sim/util/graph/view/GraphListener.java
new file mode 100644
index 0000000..364d289
--- /dev/null
+++ b/src/berack96/sim/util/graph/view/GraphListener.java
@@ -0,0 +1,27 @@
+package berack96.sim.util.graph.view;
+
+import java.awt.event.KeyListener;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+
+/**
+ * An interface for creating a listener of the Graph.
+ *
+ * @author Berack96
+ */
+public interface GraphListener extends MouseListener, MouseMotionListener, KeyListener {
+
+ /**
+ * Remove the listener to the graph.
+ * This function is called when the listener is removed to the graph.
+ * Here you could remove any other thing that you have done.
+ */
+ public void remove();
+
+ /**
+ * Get the description of this listener, in a way to interact with the user.
+ *
+ * @return a string describing the functionalities of this listener
+ */
+ public String getDescription();
+}
diff --git a/src/berack96/sim/util/graph/view/GraphPanel.java b/src/berack96/sim/util/graph/view/GraphPanel.java
new file mode 100644
index 0000000..b547089
--- /dev/null
+++ b/src/berack96/sim/util/graph/view/GraphPanel.java
@@ -0,0 +1,174 @@
+package berack96.sim.util.graph.view;
+
+import berack96.sim.util.graph.Graph;
+import berack96.sim.util.graph.MapGraph;
+import berack96.sim.util.graph.Vertex;
+import berack96.sim.util.graph.view.edge.EdgeComponent;
+import berack96.sim.util.graph.view.vertex.VertexComponent;
+
+import java.awt.*;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Observer;
+import java.util.Set;
+
+@SuppressWarnings("unchecked")
+public class GraphPanel extends Component {
+
+ private static final long serialVersionUID = 1L;
+ private final GraphicalView> vertexRender;
+ private final GraphicalView> edgeRender;
+
+ private final Container vertices = new Container();
+ private final Container edges = new Container();
+
+ private final Graph graph = new MapGraph<>();
+ private final Set observers = new HashSet<>();
+
+ private GraphListener old = null;
+
+ public GraphPanel(GraphicalView> vertexRender, GraphicalView> edgeRender) {
+ this.vertexRender = vertexRender;
+ this.edgeRender = edgeRender;
+ }
+
+ public Graph getGraph() {
+ return graph;
+ }
+
+ public void setGraphListener(GraphListener listener) {
+ if(old != null)
+ old.remove();
+ for (MouseListener l : getMouseListeners())
+ removeMouseListener(l);
+ for (MouseMotionListener l : getMouseMotionListeners())
+ removeMouseMotionListener(l);
+ for (KeyListener l : getKeyListeners())
+ removeKeyListener(l);
+
+ old = listener;
+ addMouseListener(listener);
+ addMouseMotionListener(listener);
+ addKeyListener(listener);
+ }
+
+ public void addVertex(Point center, V vertex) {
+ VertexComponent component = getVertexAt(center);
+
+ if (component == null) {
+ VertexComponent v = new VertexComponent<>(new Vertex<>(graph, vertex));
+ if (!graph.contains(vertex)) {
+ v.vertex.addIfAbsent();
+ v.setBounds(vertexRender.getBox(v, center));
+ vertices.add(v);
+ }
+ }
+ }
+
+ public void removeVertex(Point center) {
+ try {
+ VertexComponent component = getVertexAt(center);
+ component.vertex.remove();
+ vertices.remove(component);
+ } catch (Exception ignore) {}
+ }
+
+ public void moveVertex(VertexComponent vertex, Point destination) {
+ Rectangle rectangle = vertexRender.getBox(vertex, destination);
+ vertex.setLocation(rectangle.x, rectangle.y);
+ }
+
+ public void addEdge(VertexComponent source, VertexComponent dest, W weight) {
+ try {
+ Point center = new Point(Math.abs(source.getX() - dest.getY()), Math.abs(source.getY() - dest.getY()));
+ EdgeComponent edgeComponent = new EdgeComponent<>(source, dest, weight);
+ edgeComponent.setBounds(edgeRender.getBox(edgeComponent, center));
+ edges.add(edgeComponent);
+ graph.addEdge(edgeComponent.edge);
+ } catch (Exception ignore) {}
+ }
+
+ public void removeEdge(VertexComponent source, VertexComponent dest) {
+ try {
+ graph.removeEdge(source.vertex.getValue(), dest.vertex.getValue());
+ EdgeComponent toRemove = null;
+ for (Component c : edges.getComponents()) {
+ EdgeComponent edge = (EdgeComponent) c;
+ if (edge.source.equals(source) && edge.destination.equals(dest))
+ toRemove = edge;
+ }
+ edges.remove(toRemove);
+
+ } catch (Exception ignore) {}
+ }
+
+ public void modEdge(VertexComponent source, VertexComponent dest, W weight) {
+ removeEdge(source, dest);
+ addEdge(source, dest, weight);
+ }
+
+ public VertexComponent getVertexAt(Point point) {
+ Component component = vertices.getComponentAt(point);
+ return component instanceof VertexComponent ? (VertexComponent) component : null;
+ }
+
+ public EdgeComponent getEdgeAt(Point point) {
+ Component component = edges.getComponentAt(point);
+ return component instanceof EdgeComponent ? (EdgeComponent) component : null;
+ }
+
+ public void addObserver(Observer observer) {
+ observers.add(observer);
+ }
+
+ public void removeObserver(Observer observer) {
+ observers.remove(observer);
+ }
+
+
+ @Override
+ public void setBounds(int x, int y, int width, int height) {
+ super.setBounds(x, y, width, height);
+ vertices.setBounds(x, y, width, height);
+ edges.setBounds(x, y, width, height);
+ }
+
+ @Override
+ public void paint(Graphics g) {
+ Graphics2D g2 = (Graphics2D) g.create();
+ g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+
+ Collection> toRemove = new HashSet<>();
+ for (Component component : edges.getComponents()) {
+ EdgeComponent edge = (EdgeComponent) component;
+ Vertex source = edge.source.vertex;
+ Vertex dest = edge.destination.vertex;
+ if (source.isStillContained() && dest.isStillContained() && graph.containsEdge(source.getValue(), dest.getValue())) {
+ Point center = new Point(edge.getX() + edge.getWidth() / 2, edge.getY() + edge.getHeight() / 2);
+ edge.setBounds(edgeRender.getBox(edge, center));
+ edgeRender.paint((Graphics2D) g2.create(), edge, center);
+ }
+ else
+ toRemove.add(edge);
+ }
+ toRemove.forEach(edges::remove);
+
+ for (Component component : vertices.getComponents()) {
+ VertexComponent vertex = (VertexComponent) component;
+ if (graph.contains(vertex.vertex.getValue())) {
+ Point center = new Point(vertex.getX() + vertex.getWidth() / 2, vertex.getY() + vertex.getHeight() / 2);
+ vertexRender.paint((Graphics2D) g2.create(), vertex, center);
+ }
+ }
+
+ updateObservers();
+ }
+
+ private void updateObservers() {
+ observers.forEach(observer -> observer.update(null, this.graph));
+ }
+
+}
diff --git a/src/berack96/sim/util/graph/view/GraphWindow.java b/src/berack96/sim/util/graph/view/GraphWindow.java
new file mode 100644
index 0000000..f64c821
--- /dev/null
+++ b/src/berack96/sim/util/graph/view/GraphWindow.java
@@ -0,0 +1,65 @@
+package berack96.sim.util.graph.view;
+
+import berack96.sim.util.graph.view.edge.EdgeIntListener;
+import berack96.sim.util.graph.view.edge.EdgeListener;
+import berack96.sim.util.graph.view.edge.EdgeView;
+import berack96.sim.util.graph.view.vertex.VertexIntListener;
+import berack96.sim.util.graph.view.vertex.VertexListener;
+import berack96.sim.util.graph.view.vertex.VertexView;
+import berack96.sim.util.graph.visit.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * This class is the Window that appear for building the graph and playing around with it
+ *
+ * @author Berack96
+ */
+public class GraphWindow extends JFrame {
+
+ private static final long serialVersionUID = 1L;
+
+ public static void main(String[] args) {
+ GraphPanel panel = new GraphPanel<>(new VertexView<>(), new EdgeView<>());
+ GraphWindow win = new GraphWindow<>(panel, new VertexIntListener(panel), new EdgeIntListener<>(panel));
+ Dimension dim = Toolkit.getDefaultToolkit().getScreenSize(); // full screen
+ dim.setSize(dim.width / 2, dim.height / 2);
+ win.setSize(dim);
+ win.setLocationRelativeTo(null); //centered
+ win.visitRefresh(500);
+
+ win.setVisible(true);
+ }
+
+ private final GraphPanel graphPanel;
+ private final GraphInfo infoPanel;
+
+ private GraphWindow(GraphPanel graphPanel, VertexListener vListener, EdgeListener eListener) {
+ this.setTitle("Grafo");
+ this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ this.setLayout(new BorderLayout());
+
+ Set> strats = new LinkedHashSet<>();
+ strats.add(new DFS<>());
+ strats.add(new BFS<>());
+ strats.add(new Dijkstra<>());
+ strats.add(new Tarjan<>());
+
+ this.infoPanel = new GraphInfo<>(graphPanel, vListener, eListener, strats);
+ this.graphPanel = graphPanel;
+
+ this.add(infoPanel, BorderLayout.EAST);
+ this.add(graphPanel);
+ }
+
+ public void visitRefresh(int millisec) {
+ VisitListener.changeRefresh(millisec);
+ }
+
+ public GraphPanel getGraphPanel() {
+ return graphPanel;
+ }
+}
diff --git a/src/berack96/sim/util/graph/view/GraphicalView.java b/src/berack96/sim/util/graph/view/GraphicalView.java
new file mode 100644
index 0000000..9d29e2f
--- /dev/null
+++ b/src/berack96/sim/util/graph/view/GraphicalView.java
@@ -0,0 +1,29 @@
+package berack96.sim.util.graph.view;
+
+import java.awt.*;
+
+/**
+ * An interface for divide the "hitbox" and the "paint" of the various items
+ *
+ * @param the object to paint
+ * @author Berack96
+ */
+public interface GraphicalView {
+ /**
+ * Box where the object is sensible at listeners (like Hitbox)
+ *
+ * @param obj the object to draw
+ * @param center the center point of the object
+ * @return a rectangle where the object is sensible to the listeners
+ */
+ Rectangle getBox(O obj, Point center);
+
+ /**
+ * The paint function, aka the part where you can draw things (like Mesh)
+ *
+ * @param g2 the graphics object used for painting
+ * @param obj the object to paint
+ * @param center the center point of the object
+ */
+ void paint(Graphics2D g2, O obj, Point center);
+}
diff --git a/src/berack96/sim/util/graph/view/VisitListener.java b/src/berack96/sim/util/graph/view/VisitListener.java
new file mode 100644
index 0000000..9dd40a3
--- /dev/null
+++ b/src/berack96/sim/util/graph/view/VisitListener.java
@@ -0,0 +1,112 @@
+package berack96.sim.util.graph.view;
+
+import berack96.sim.util.graph.Graph;
+import berack96.sim.util.graph.view.vertex.VertexComponent;
+import berack96.sim.util.graph.visit.VisitInfo;
+import berack96.sim.util.graph.visit.VisitStrategy;
+
+import javax.swing.*;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class VisitListener implements GraphListener {
+
+ private final GraphPanel panel;
+ private final VisitStrategy strategy;
+ private final Set timers = new HashSet<>();
+
+ private static int refreshTime = 1000;
+
+ public VisitListener(GraphPanel panel, VisitStrategy strategy) {
+ this.panel = panel;
+ this.strategy = strategy;
+ }
+
+ public static void changeRefresh(int millisec) {
+ refreshTime = millisec;
+ }
+
+ @Override
+ public void remove() {
+ timers.forEach(t -> t.stop());
+ timers.clear();
+ }
+
+ @Override
+ public String getDescription() {
+ return ""
+ + "Start a visit by pressing graph = panel.getGraph();
+ graph.unMarkAll();
+ panel.repaint();
+
+ if (e.getButton() == MouseEvent.BUTTON1)
+ try {
+ VertexComponent vertex = panel.getVertexAt(e.getPoint());
+ AtomicInteger count = new AtomicInteger(0);
+ VisitInfo info = vertex.vertex.visit(strategy, null);
+
+ info.forEach(v -> {
+ final boolean visited = v.timeVisited == count.get();
+ Timer timer = new Timer(count.getAndIncrement() * refreshTime, e1 -> {
+ if (visited && v.parent !=null)
+ graph.mark(v.vertex, v.parent);
+ graph.mark(v.vertex, visited ? "visited" : "discovered");
+ panel.repaint();
+ });
+
+ timers.add(timer);
+ timer.setRepeats(false);
+ timer.start();
+ });
+
+ } catch (Exception ignore) {}
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseEntered(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseExited(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseDragged(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseMoved(MouseEvent e) {
+ }
+
+ @Override
+ public void keyPressed(KeyEvent e) {
+ }
+
+ @Override
+ public void keyReleased(KeyEvent e) {
+ }
+
+ @Override
+ public void keyTyped(KeyEvent e) {
+ }
+}
diff --git a/src/berack96/sim/util/graph/view/edge/EdgeComponent.java b/src/berack96/sim/util/graph/view/edge/EdgeComponent.java
new file mode 100644
index 0000000..cd52048
--- /dev/null
+++ b/src/berack96/sim/util/graph/view/edge/EdgeComponent.java
@@ -0,0 +1,22 @@
+package berack96.sim.util.graph.view.edge;
+
+import berack96.sim.util.graph.Edge;
+import berack96.sim.util.graph.view.vertex.VertexComponent;
+
+import java.awt.*;
+
+public class EdgeComponent extends Component {
+ private static final long serialVersionUID = 1L;
+
+ public final VertexComponent source;
+ public final VertexComponent destination;
+ public final W weight;
+ public final Edge edge;
+
+ public EdgeComponent(VertexComponent source, VertexComponent destination, W weight) {
+ this.source = source;
+ this.destination = destination;
+ this.weight = weight;
+ this.edge = new Edge<>(source.vertex.getValue(), destination.vertex.getValue(), weight);
+ }
+}
diff --git a/src/berack96/sim/util/graph/view/edge/EdgeIntListener.java b/src/berack96/sim/util/graph/view/edge/EdgeIntListener.java
new file mode 100644
index 0000000..03c61e1
--- /dev/null
+++ b/src/berack96/sim/util/graph/view/edge/EdgeIntListener.java
@@ -0,0 +1,24 @@
+package berack96.sim.util.graph.view.edge;
+
+import berack96.sim.util.graph.Vertex;
+import berack96.sim.util.graph.view.GraphPanel;
+
+public class EdgeIntListener extends EdgeListener {
+
+ public EdgeIntListener(GraphPanel graphPanel) {
+ super(graphPanel);
+ }
+
+ @Override
+ public void remove() {}
+
+ @Override
+ protected Integer buildNewEdge(Vertex vertex, Vertex vertex1) {
+ return (int) (Math.random() * 100);
+ }
+
+ @Override
+ protected Integer buildEdgeFrom(String string) {
+ return Integer.parseInt(string.replaceAll("[^0-9]+", ""));
+ }
+}
diff --git a/src/berack96/sim/util/graph/view/edge/EdgeListener.java b/src/berack96/sim/util/graph/view/edge/EdgeListener.java
new file mode 100644
index 0000000..fee506a
--- /dev/null
+++ b/src/berack96/sim/util/graph/view/edge/EdgeListener.java
@@ -0,0 +1,128 @@
+package berack96.sim.util.graph.view.edge;
+
+import berack96.sim.util.graph.Vertex;
+import berack96.sim.util.graph.view.GraphListener;
+import berack96.sim.util.graph.view.GraphPanel;
+import berack96.sim.util.graph.view.vertex.VertexComponent;
+
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.util.concurrent.atomic.AtomicReference;
+
+public abstract class EdgeListener implements GraphListener {
+
+ private final GraphPanel graphPanel;
+ private final AtomicReference> componentPressed = new AtomicReference<>();
+ private final AtomicReference buttonPressed = new AtomicReference<>();
+ private final AtomicReference> edge = new AtomicReference<>();
+ private final StringBuilder string = new StringBuilder();
+
+ public EdgeListener(GraphPanel graphPanel) {
+ this.graphPanel = graphPanel;
+ }
+
+ protected abstract W buildNewEdge(Vertex