diff --git a/.gitignore b/.gitignore
index 786237e..689f042 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,8 +125,9 @@ local.properties
# mine
+target/
.idea/*
.project
*.iml
-.classpath
-/.gradle/
+.classpath
+/.gradle/
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 58ef372..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-apply plugin: 'java'
-apply plugin: 'eclipse'
-
-version='1.0-SNAPSHOT'
-
-jar {
- manifest {
- attributes 'Main-Class': 'berack96.lib.graph.view.Main'
- }
- from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-}
-
-test {
- useJUnitPlatform()
-}
-
-sourceSets.main.java {
- srcDirs "src"
- srcDirs "test"
-}
-
-repositories {
- mavenCentral()
-}
-
-dependencies {
- implementation 'org.junit.jupiter:junit-jupiter:5.5.2'
- compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
-
- /*compile group: 'commons-collections', name: 'commons-collections', version: '3.2'*/
- testCompile 'junit:junit:5.5.2'
-}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..5cfc0ad
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,80 @@
+
+
+ 4.0.0
+
+ berack96
+ Graph
+ 1.0-SNAPSHOT
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ 5.9.0
+ test
+
+
+ org.junit.jupiter
+ junit-jupiter-params
+ 5.9.0
+ test
+
+
+ com.google.code.gson
+ gson
+ 2.9.1
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 2.2
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+ 2.2
+
+
+ jar-with-dependencies
+
+
+
+ berack96.lib.graph.view.Main
+
+
+
+
+
+ package
+
+ single
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ attach-javadocs
+ prepare-package
+
+ jar
+
+
+
+
+
+
+
+ 17
+ 17
+
+
+
\ No newline at end of file
diff --git a/src/berack96/lib/graph/Edge.java b/src/main/java/berack96/lib/graph/Edge.java
similarity index 100%
rename from src/berack96/lib/graph/Edge.java
rename to src/main/java/berack96/lib/graph/Edge.java
diff --git a/src/berack96/lib/graph/Graph.java b/src/main/java/berack96/lib/graph/Graph.java
similarity index 86%
rename from src/berack96/lib/graph/Graph.java
rename to src/main/java/berack96/lib/graph/Graph.java
index 7d58ece..a6c93e5 100644
--- a/src/berack96/lib/graph/Graph.java
+++ b/src/main/java/berack96/lib/graph/Graph.java
@@ -1,638 +1,669 @@
-package berack96.lib.graph;
-
-import berack96.lib.graph.visit.VisitStrategy;
-import berack96.lib.graph.visit.impl.BFS;
-import berack96.lib.graph.visit.impl.Dijkstra;
-import berack96.lib.graph.visit.impl.VisitInfo;
-
-import java.util.*;
-import java.util.function.Consumer;
-
-/**
- * An abstract class for the graphs. The Object that represent a vertex
- * @author Berack96
- */
-public abstract class Graph implements Iterable {
-
- public static final int NO_EDGE = 0;
- public final static String NOT_CONNECTED = "The source vertex doesn't have a path that reach the destination";
- public final static String PARAM_NULL = "The parameter must not be null";
- public final static String VERTEX_NOT_CONTAINED = "The vertex must be contained in the graph";
-
- /**
- * Map that contains the vertex as key and a set of all the marker associated with it.
- */
- private final Map> markers = new HashMap<>();
-
- /**
- * Get a new instance of this Graph.
- *
- * @return A new instance of the graph
- */
- protected abstract Graph getNewInstance();
-
- /**
- * Check if the vertex passed is contained in the graph or not. get(V vertex) throws IllegalArgumentException {
- checkVert(vertex);
- return new Vertex<>(this, vertex);
- }
-
- /**
- * Add the vertex to the graph. If it's already in the graph it will be replaced and all its edges will be reset. vertices) throws NullPointerException {
- check(vertices);
- for (V vertex : vertices)
- addIfAbsent(vertex);
- }
-
- /**
- * Remove the selected vertex from the graph. edge) throws NullPointerException, IllegalArgumentException {
- return addEdge(edge.getSource(), edge.getDestination(), edge.getWeight());
- }
-
- /**
- * Add an edge between the two vertex. edge) throws NullPointerException, IllegalArgumentException {
- return addEdgeAndVertices(edge.getSource(), edge.getDestination(), edge.getWeight());
- }
-
- /**
- * This particular function add an edge to the graph.> edges) throws NullPointerException {
- edges.forEach(edge -> addEdgeAndVertices(edge.getSource(), edge.getDestination(), edge.getWeight()));
- }
-
- /**
- * Remove the edge between the two vertex by setting it's value to 0. vertices = vertices();
- removeAll();
- addAll(vertices);
- }
-
- /**
- * Retrieve all the edges of a particular vertex.> edgesOf(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;
-
- /**
- * Get all the marks of this graph. marks() {
- Collection ret = new HashSet<>();
- markers.forEach((v, set) -> ret.addAll(set));
- return ret;
- }
-
- /**
- * Add to the specified vertex the mark passed. marks = markers.computeIfAbsent(vertex, v -> new HashSet<>());
- marks.add(mark);
- }
-
- /**
- * Remove the selected mark from the vertex. getMarkedWith(Object mark) throws NullPointerException {
- check(mark);
- Collection vertices = new ArrayList<>(markers.size());
- markers.forEach((v, set) -> {
- if (set.contains(mark))
- vertices.add(v);
- });
- return vertices;
- }
-
- /**
- * Get all the marker of this vertex. getMarks(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- return markers.getOrDefault(vertex, new HashSet<>());
- }
-
- /**
- * Remove the selected mark from all the vertices
- *
- * @param mark the mark to remove
- * @throws NullPointerException if the mark is null
- */
- public final void unMarkAll(Object mark) throws NullPointerException {
- check(mark);
- Collection toRemove = new ArrayList<>(markers.size());
- markers.forEach((v, set) -> {
- set.remove(mark);
- if (set.size() == 0)
- toRemove.add(v);
- });
- markers.keySet().removeAll(toRemove);
- }
-
- /**
- * Remove all the marker to all the vertex. vertices() {
- Collection collection = new ArrayList<>();
- forEach(collection::add);
- return collection;
- }
-
- /**
- * Get all the edges in the graph.> edges();
-
- /**
- * Tells the degree of a vertex. visit(V source, VisitStrategy strategy, Consumer visit) throws NullPointerException, UnsupportedOperationException {
- return strategy.visit(this, source, visit);
- }
-
- /**
- * Get a sub-graph of the current one based on the maximum depth that is given. subGraph(V source, int depth) throws NullPointerException, IllegalArgumentException {
- checkVert(source);
- Graph sub = getNewInstance();
- Set vertices = new HashSet<>(this.size() + 1, 1);
- new BFS().setMaxDepth(Math.max(depth, 0)).visit(this, source, vertices::add);
-
- sub.addAll(vertices);
- for (V src : vertices)
- for (V dest : getChildren(src))
- if (sub.contains(dest))
- sub.addEdge(new Edge<>(src, dest, this.getWeight(src, dest)));
- return sub;
- }
-
- /**
- * Get a sub-graph of the current one with only the vertex marked with the selected markers. subGraph(Object... marker) {
- final Graph sub = getNewInstance();
- final Set allVertices = new HashSet<>();
- final Set allMarkers = new HashSet<>();
- final boolean isEmpty = (marker == null || marker.length == 0);
-
- if (!isEmpty) {
- Collections.addAll(allMarkers, marker);
- markers.forEach((v, set) -> {
- if (!Collections.disjoint(allMarkers, set))
- allVertices.add(v);
- });
- } else {
- Collection toAdd = vertices();
- toAdd.removeAll(markers.keySet());
- allVertices.addAll(toAdd);
- }
-
- sub.addAll(allVertices);
- for (V src : sub.vertices()) {
- for (Object mark : getMarks(src))
- sub.mark(src, mark);
- for (V dest : getChildren(src))
- if (sub.contains(dest))
- sub.addEdge(src, dest, getWeight(src, dest));
- }
- return sub;
- }
-
- /**
- * Get the minimum path from the source vertex to the destination vertex.> distance(V source, V destination) throws NullPointerException, IllegalArgumentException, UnsupportedOperationException {
- checkVert(source, destination);
- List> path = distance(source).get(destination);
- if (path == null)
- throw new UnsupportedOperationException(NOT_CONNECTED);
- return path;
- }
-
- /**
- * 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
- */
- public final Map>> distance(V source) throws NullPointerException, IllegalArgumentException {
- checkVert(source);
- Dijkstra dijkstra = new Dijkstra<>();
- dijkstra.visit(this, source, null);
- return dijkstra.getLastDistance();
- }
-
-
- /**
- * Check if the object passed is not null.
- * If it's null then throws eventual exception
- *
- * @param objects the objects to test
- */
- protected final void check(Object... objects) {
- for (Object obj : objects)
- if (obj == null)
- throw new NullPointerException(PARAM_NULL);
- }
-
- /**
- * Check if the vertex passed is not null and if exist in the graph.
- * If not then throws eventual exception
- *
- * @param vertices the vertices to test
- */
- @SafeVarargs
- protected final void checkVert(V... vertices) {
- check((Object[]) vertices);
- for (V vert : vertices)
- try {
- if (!contains(vert))
- throw new IllegalArgumentException(VERTEX_NOT_CONTAINED);
- } catch (ClassCastException ignore) {
- }
- }
-}
+package berack96.lib.graph;
+
+import berack96.lib.graph.visit.VisitStrategy;
+import berack96.lib.graph.visit.impl.BFS;
+import berack96.lib.graph.visit.impl.Dijkstra;
+import berack96.lib.graph.visit.impl.VisitInfo;
+
+import java.util.*;
+import java.util.function.Consumer;
+
+/**
+ * An abstract class for the graphs. The Object that represent a vertex
+ * @author Berack96
+ */
+public abstract class Graph implements Iterable {
+
+ //------------------- STAIC -----------------
+
+ public static final int NO_EDGE = 0;
+ public final static String NOT_CONNECTED = "The source vertex doesn't have a path that reach the destination";
+ public final static String PARAM_NULL = "The parameter must not be null";
+ public final static String VERTEX_NOT_CONTAINED = "The vertex must be contained in the graph";
+
+ /**
+ * Create the default map. All operations are O(log(n)) Map getDefaultMap() {
+ return new TreeMap(ObjectsComparator.instance);
+ }
+
+ /**
+ * Create the default set. All operations are O(log(n)) Set getDefaultSet() {
+ return new TreeSet(ObjectsComparator.instance);
+ }
+
+ //------------------- INSTANCE -----------------
+
+ /**
+ * Map that contains the vertex as key and a set of all the marker associated with it.
+ */
+ private final Map> markers = getDefaultMap();
+
+ /**
+ * Get a new instance of this graph.
+ *
+ * @return A new instance of the graph
+ */
+ protected abstract Graph getNewInstance();
+
+ /**
+ * Check if the vertex passed is contained in the graph or not. get(V vertex) throws IllegalArgumentException {
+ checkVert(vertex);
+ return new Vertex<>(this, vertex);
+ }
+
+ /**
+ * Add the vertex to the graph. If it's already in the graph it will be replaced and all its edges will be reset. vertices) throws NullPointerException {
+ check(vertices);
+ for (V vertex : vertices)
+ addIfAbsent(vertex);
+ }
+
+ /**
+ * Remove the selected vertex from the graph. edge) throws NullPointerException, IllegalArgumentException {
+ return addEdge(edge.getSource(), edge.getDestination(), edge.getWeight());
+ }
+
+ /**
+ * Add an edge between the two vertex. edge) throws NullPointerException, IllegalArgumentException {
+ return addEdgeAndVertices(edge.getSource(), edge.getDestination(), edge.getWeight());
+ }
+
+ /**
+ * This particular function add an edge to the graph.> edges) throws NullPointerException {
+ edges.forEach(edge -> addEdgeAndVertices(edge.getSource(), edge.getDestination(), edge.getWeight()));
+ }
+
+ /**
+ * Remove the edge between the two vertex by setting it's value to 0. vertices = vertices();
+ removeAll();
+ addAll(vertices);
+ }
+
+ /**
+ * Retrieve all the edges of a particular vertex.> edgesOf(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;
+
+ /**
+ * Get all the marks of this graph. marks() {
+ Set ret = getDefaultSet();
+ markers.forEach((v, set) -> ret.addAll(set));
+ return ret;
+ }
+
+ /**
+ * Add to the specified vertex the mark passed. marks = markers.computeIfAbsent(vertex, v -> getDefaultSet());
+ marks.add(mark);
+ }
+
+ /**
+ * Remove the selected mark from the vertex. getMarkedWith(Object mark) throws NullPointerException {
+ check(mark);
+ Set vertices = getDefaultSet();
+ markers.forEach((v, set) -> {
+ if (set.contains(mark))
+ vertices.add(v);
+ });
+ return vertices;
+ }
+
+ /**
+ * Get all the marker of this vertex. getMarks(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ return markers.getOrDefault(vertex, getDefaultSet());
+ }
+
+ /**
+ * Remove the selected mark from all the vertices
+ *
+ * @param mark the mark to remove
+ * @throws NullPointerException if the mark is null
+ */
+ public final void unMarkAll(Object mark) throws NullPointerException {
+ check(mark);
+ Set toRemove = getDefaultSet();
+ markers.forEach((v, set) -> {
+ set.remove(mark);
+ if (set.size() == 0)
+ toRemove.add(v);
+ });
+ markers.keySet().removeAll(toRemove);
+ }
+
+ /**
+ * Remove all the marker to all the vertex. vertices() {
+ Set vertices = getDefaultSet();
+ forEach(vertices::add);
+ return vertices;
+ }
+
+ /**
+ * Get all the edges in the graph.> edges();
+
+ /**
+ * Tells the degree of a vertex. visit(V source, VisitStrategy strategy, Consumer visit) throws NullPointerException, UnsupportedOperationException {
+ return strategy.visit(this, source, visit);
+ }
+
+ /**
+ * Get a sub-graph of the current one based on the maximum depth that is given. subGraph(V source, int depth) throws NullPointerException, IllegalArgumentException {
+ checkVert(source);
+ Graph sub = getNewInstance();
+ Set vertices = getDefaultSet();
+ new BFS().setMaxDepth(Math.max(depth, 0)).visit(this, source, vertices::add);
+
+ sub.addAll(vertices);
+ for (V src : vertices)
+ for (V dest : getChildren(src))
+ if (sub.contains(dest))
+ sub.addEdge(src, dest, this.getWeight(src, dest));
+ return sub;
+ }
+
+ /**
+ * Get a sub-graph of the current one with only the vertex marked with the selected markers. (OR set operation) subGraph(Object... marker) {
+ final Graph sub = getNewInstance();
+ final Set allVertices = getDefaultSet();
+ final Set allMarkers = getDefaultSet();
+
+ if (marker != null && marker.length > 0)
+ for(int i=0; i 0)
+ markers.forEach((v, set) -> {
+ if (!Collections.disjoint(allMarkers, set))
+ allVertices.add(v);
+ });
+ else {
+ Set toAdd = vertices();
+ toAdd.removeAll(markers.keySet());
+ allVertices.addAll(toAdd);
+ }
+
+ sub.addAll(allVertices);
+ for (V src : sub.vertices()) {
+ for (Object mark : getMarks(src))
+ sub.mark(src, mark);
+ for (V dest : getChildren(src))
+ if (sub.contains(dest))
+ sub.addEdge(src, dest, getWeight(src, dest));
+ }
+ return sub;
+ }
+
+ /**
+ * Get the minimum path from the source vertex to the destination vertex.> distance(V source, V destination) throws NullPointerException, IllegalArgumentException, UnsupportedOperationException {
+ checkVert(source, destination);
+ List> path = distance(source).get(destination);
+ if (path == null)
+ throw new UnsupportedOperationException(NOT_CONNECTED);
+ return path;
+ }
+
+ /**
+ * 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
+ */
+ public final Map>> distance(V source) throws NullPointerException, IllegalArgumentException {
+ checkVert(source);
+ Dijkstra dijkstra = new Dijkstra<>();
+ dijkstra.visit(this, source, null);
+ return dijkstra.getLastDistance();
+ }
+
+ /**
+ * Check if the object passed is not null.
+ * If it's null then throws eventual exception
+ *
+ * @param objects the objects to test
+ */
+ protected final void check(Object... objects) {
+ for (Object obj : objects)
+ if (obj == null)
+ throw new NullPointerException(PARAM_NULL);
+ }
+
+ /**
+ * Check if the vertex passed is not null and if exist in the graph.
+ * If not then throws eventual exception
+ *
+ * @param vertices the vertices to test
+ */
+ @SafeVarargs
+ protected final void checkVert(V... vertices) {
+ check((Object[]) vertices);
+ for (V vert : vertices)
+ try {
+ if (!contains(vert))
+ throw new IllegalArgumentException(VERTEX_NOT_CONTAINED);
+ } catch (ClassCastException ignore) {
+ }
+ }
+}
diff --git a/src/berack96/lib/graph/GraphDirected.java b/src/main/java/berack96/lib/graph/GraphDirected.java
similarity index 86%
rename from src/berack96/lib/graph/GraphDirected.java
rename to src/main/java/berack96/lib/graph/GraphDirected.java
index bd2abe5..9bbce28 100644
--- a/src/berack96/lib/graph/GraphDirected.java
+++ b/src/main/java/berack96/lib/graph/GraphDirected.java
@@ -4,10 +4,8 @@ import berack96.lib.graph.visit.VisitSCC;
import berack96.lib.graph.visit.VisitTopological;
import berack96.lib.graph.visit.impl.Tarjan;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
+import java.util.Set;
/**
* This is a more specific interface for an implementation of a Undirected Graph. extends Graph {
/**
* Retrieve all the edges of a particular vertex.> getEdgesIn(V vertex) throws NullPointerException, IllegalArgumentException {
- Collection ancestors = getAncestors(vertex);
- Collection> edgesIn = new HashSet<>(ancestors.size());
+ public Set> getEdgesIn(V vertex) throws NullPointerException, IllegalArgumentException {
+ Set ancestors = getAncestors(vertex);
+ Set> edgesIn = getDefaultSet();
for (V ancestor : ancestors) {
int weight = getWeight(ancestor, vertex);
@@ -93,17 +91,17 @@ public abstract class GraphDirected extends Graph {
/**
* Retrieve all the edges that goes OUT of a particular vertex.> getEdgesOut(V vertex) throws NullPointerException, IllegalArgumentException {
- Collection children = getChildren(vertex);
- Collection> edgesOut = new HashSet<>(children.size());
+ public Set> getEdgesOut(V vertex) throws NullPointerException, IllegalArgumentException {
+ Set children = getChildren(vertex);
+ Set> edgesOut = getDefaultSet();
for (V child : children) {
int weight = getWeight(vertex, child);
@@ -178,26 +176,26 @@ public abstract class GraphDirected extends Graph {
* 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
+ * @return a Set containing the strongly connected components
*/
- public final Collection> stronglyConnectedComponents() {
+ public final Set> stronglyConnectedComponents() {
VisitSCC visit = new Tarjan<>();
visit.visit(this, null, null);
return visit.getSCC();
}
@Override
- public Collection> edgesOf(V vertex) throws NullPointerException, IllegalArgumentException {
- Collection> edges = getEdgesIn(vertex);
+ public Set> edgesOf(V vertex) throws NullPointerException, IllegalArgumentException {
+ Set> edges = getEdgesIn(vertex);
edges.addAll(getEdgesOut(vertex));
return edges;
}
@Override
- public Collection> edges() {
- Collection> collection = new ArrayList<>();
- forEach(v -> collection.addAll(getEdgesIn(v)));
- return collection;
+ public Set> edges() {
+ Set> set = getDefaultSet();
+ forEach(v -> set.addAll(getEdgesIn(v)));
+ return set;
}
@Override
diff --git a/src/berack96/lib/graph/GraphUndirected.java b/src/main/java/berack96/lib/graph/GraphUndirected.java
similarity index 70%
rename from src/berack96/lib/graph/GraphUndirected.java
rename to src/main/java/berack96/lib/graph/GraphUndirected.java
index e07fb47..96bcb37 100644
--- a/src/berack96/lib/graph/GraphUndirected.java
+++ b/src/main/java/berack96/lib/graph/GraphUndirected.java
@@ -3,8 +3,7 @@ package berack96.lib.graph;
import berack96.lib.graph.visit.VisitMST;
import berack96.lib.graph.visit.impl.Prim;
-import java.util.Collection;
-import java.util.LinkedList;
+import java.util.Set;
/**
* This is a more specific interface for an implementation of a Directed Graph. extends Graph {
/**
* The connected components of an arbitrary undirected graph form a partition into subgraphs that are themselves connected.
*
- * @return a collection containing the strongly connected components
+ * @return a Set containing the strongly connected components
*/
- public Collection> connectedComponents() {
+ public Set> connectedComponents() {
return null;
}
/**
* minimum spanning forest or minimum spamming tree of the graph
*
- * @return A collection of edges representing the M.S.F.
+ * @return A Set of edges representing the M.S.F.
*/
- public Collection> minimumSpanningForest() {
+ public Set> minimumSpanningForest() {
VisitMST visit = new Prim<>();
visit.visit(this, iterator().next(), null);
return visit.getMST();
}
@Override
- public Collection> edgesOf(V vertex) throws NullPointerException, IllegalArgumentException {
+ public Set> edgesOf(V vertex) throws NullPointerException, IllegalArgumentException {
checkVert(vertex);
- Collection> edges = new LinkedList<>();
+ Set> edges = getDefaultSet();
getChildren(vertex).forEach(v -> edges.add(new Edge<>(vertex, v, getWeight(vertex, v))));
return edges;
}
diff --git a/src/main/java/berack96/lib/graph/ObjectsComparator.java b/src/main/java/berack96/lib/graph/ObjectsComparator.java
new file mode 100644
index 0000000..e3668dd
--- /dev/null
+++ b/src/main/java/berack96/lib/graph/ObjectsComparator.java
@@ -0,0 +1,18 @@
+package berack96.lib.graph;
+import java.util.Comparator;
+
+/**
+ * Compare two arbitrary objects. {
+ static public final ObjectsComparator instance = new ObjectsComparator();
+
+ private ObjectsComparator(){};
+
+ @Override
+ public int compare(Object o1, Object o2) {
+ return o1.hashCode() - o2.hashCode();
+ }
+}
diff --git a/src/berack96/lib/graph/Vertex.java b/src/main/java/berack96/lib/graph/Vertex.java
similarity index 100%
rename from src/berack96/lib/graph/Vertex.java
rename to src/main/java/berack96/lib/graph/Vertex.java
diff --git a/src/berack96/lib/graph/impl/ListGraph.java b/src/main/java/berack96/lib/graph/impl/ListGraph.java
similarity index 86%
rename from src/berack96/lib/graph/impl/ListGraph.java
rename to src/main/java/berack96/lib/graph/impl/ListGraph.java
index fb29b81..88acea1 100644
--- a/src/berack96/lib/graph/impl/ListGraph.java
+++ b/src/main/java/berack96/lib/graph/impl/ListGraph.java
@@ -1,160 +1,161 @@
-package berack96.lib.graph.impl;
-
-import berack96.lib.graph.Graph;
-import berack96.lib.graph.GraphDirected;
-
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * An implementation of the graph using an adjacent list for representing the edges
- *
- * @param the vertex
- * @author Berack96
- */
-public class ListGraph extends GraphDirected {
-
- final private Map> adj = new Hashtable<>();
-
- @Override
- public Iterator iterator() {
- return adj.keySet().iterator();
- }
-
- @Override
- protected Graph getNewInstance() {
- return new ListGraph<>();
- }
-
- @Override
- public void add(V vertex) {
- check(vertex);
- if (adj.containsKey(vertex))
- removeAllEdge(vertex);
- else
- adj.put(vertex, new LinkedList<>());
- }
-
- @Override
- public boolean contains(V vertex) {
- check(vertex);
- return adj.containsKey(vertex);
- }
-
- @Override
- public void remove(V vertex) {
- checkVert(vertex);
- adj.remove(vertex);
- adj.forEach((v, list) -> list.remove(getAdj(list, vertex)));
- }
-
- @Override
- public int addEdge(V vertex1, V vertex2, int weight) {
- checkVert(vertex1, vertex2);
-
- List list = adj.get(vertex1);
- Adj a = getAdj(list, vertex2);
- int old = a == null ? NO_EDGE : a.weight;
-
- if (weight == NO_EDGE)
- list.remove(a);
- else if (old == NO_EDGE)
- list.add(new Adj(vertex2, weight));
- else
- a.weight = weight;
- return old;
- }
-
- @Override
- public int getWeight(V vertex1, V vertex2) {
- checkVert(vertex1, vertex2);
- Adj a = getAdj(adj.get(vertex1), vertex2);
- return a == null ? NO_EDGE : a.weight;
- }
-
- @Override
- public Collection getChildren(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- Collection children = new HashSet<>();
- for (Adj adj : adj.get(vertex))
- children.add(adj.vertex);
- return children;
- }
-
- @Override
- public Collection getAncestors(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- Collection ancestors = new HashSet<>();
- adj.forEach((v, list) -> {
- if (getAdj(list, vertex) != null)
- ancestors.add(v);
- });
-
- return ancestors;
- }
-
-
- /**
- * From here on there are some optimization for the methods of the generic DirectedGraph
- **/
-
- @Override
- public int size() {
- return adj.size();
- }
-
- @Override
- public int numberOfEdges() {
- AtomicInteger size = new AtomicInteger(0);
- adj.values().forEach(list -> size.addAndGet(list.size()));
- return size.get();
- }
-
- @Override
- public int degreeIn(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- AtomicInteger degree = new AtomicInteger(0);
- adj.values().forEach(list -> degree.addAndGet(getAdj(list, vertex) != null ? 1 : 0));
- return degree.get();
- }
-
- @Override
- public int degreeOut(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- return adj.get(vertex).size();
- }
-
- @Override
- public void removeAllEdge(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- adj.get(vertex).clear();
- adj.forEach((v, list) -> list.remove(getAdj(list, vertex)));
- }
-
- @Override
- public void removeAllEdge() {
- adj.forEach((v, list) -> list.clear());
- }
-
- @Override
- public void removeAll() {
- adj.clear();
- }
-
- private Adj getAdj(List list, V vertex) {
- for (Adj adj : list)
- if (Objects.equals(adj.vertex, vertex))
- return adj;
- return null;
- }
-
- private class Adj {
- private final V vertex;
- private int weight;
-
- private Adj(V vertex, int weight) {
- this.vertex = vertex;
- this.weight = weight;
- }
- }
-}
+package berack96.lib.graph.impl;
+
+import berack96.lib.graph.Graph;
+import berack96.lib.graph.GraphDirected;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * An implementation of the graph using an adjacent list for representing the edges
+ *
+ * @param the vertex
+ * @author Berack96
+ */
+public class ListGraph extends GraphDirected {
+
+ // in case of thread safety use -> Collections.synchronizedSortedMap(TreeMap)
+ final private Map> adj = getDefaultMap();
+
+ @Override
+ public Iterator iterator() {
+ return adj.keySet().iterator();
+ }
+
+ @Override
+ protected Graph getNewInstance() {
+ return new ListGraph<>();
+ }
+
+ @Override
+ public void add(V vertex) {
+ check(vertex);
+ if (adj.containsKey(vertex))
+ removeAllEdge(vertex);
+ else
+ adj.put(vertex, new LinkedList<>());
+ }
+
+ @Override
+ public boolean contains(V vertex) {
+ check(vertex);
+ return adj.containsKey(vertex);
+ }
+
+ @Override
+ public void remove(V vertex) {
+ checkVert(vertex);
+ adj.remove(vertex);
+ adj.forEach((v, list) -> list.remove(getAdj(list, vertex)));
+ }
+
+ @Override
+ public int addEdge(V vertex1, V vertex2, int weight) {
+ checkVert(vertex1, vertex2);
+
+ List list = adj.get(vertex1);
+ Adj a = getAdj(list, vertex2);
+ int old = a == null ? NO_EDGE : a.weight;
+
+ if (weight == NO_EDGE)
+ list.remove(a);
+ else if (old == NO_EDGE)
+ list.add(new Adj(vertex2, weight));
+ else
+ a.weight = weight;
+ return old;
+ }
+
+ @Override
+ public int getWeight(V vertex1, V vertex2) {
+ checkVert(vertex1, vertex2);
+ Adj a = getAdj(adj.get(vertex1), vertex2);
+ return a == null ? NO_EDGE : a.weight;
+ }
+
+ @Override
+ public Set getChildren(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ Set children = getDefaultSet();
+ for (Adj adj : adj.get(vertex))
+ children.add(adj.vertex);
+ return children;
+ }
+
+ @Override
+ public Set getAncestors(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ Set ancestors = getDefaultSet();
+ adj.forEach((v, list) -> {
+ if (getAdj(list, vertex) != null)
+ ancestors.add(v);
+ });
+
+ return ancestors;
+ }
+
+
+ /**
+ * From here on there are some optimization for the methods of the generic DirectedGraph
+ **/
+
+ @Override
+ public int size() {
+ return adj.size();
+ }
+
+ @Override
+ public int numberOfEdges() {
+ AtomicInteger size = new AtomicInteger(0);
+ adj.values().forEach(list -> size.addAndGet(list.size()));
+ return size.get();
+ }
+
+ @Override
+ public int degreeIn(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ AtomicInteger degree = new AtomicInteger(0);
+ adj.values().forEach(list -> degree.addAndGet(getAdj(list, vertex) != null ? 1 : 0));
+ return degree.get();
+ }
+
+ @Override
+ public int degreeOut(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ return adj.get(vertex).size();
+ }
+
+ @Override
+ public void removeAllEdge(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ adj.get(vertex).clear();
+ adj.forEach((v, list) -> list.remove(getAdj(list, vertex)));
+ }
+
+ @Override
+ public void removeAllEdge() {
+ adj.forEach((v, list) -> list.clear());
+ }
+
+ @Override
+ public void removeAll() {
+ adj.clear();
+ }
+
+ private Adj getAdj(List list, V vertex) {
+ for (Adj adj : list)
+ if (Objects.equals(adj.vertex, vertex))
+ return adj;
+ return null;
+ }
+
+ private class Adj {
+ private final V vertex;
+ private int weight;
+
+ private Adj(V vertex, int weight) {
+ this.vertex = vertex;
+ this.weight = weight;
+ }
+ }
+}
diff --git a/src/berack96/lib/graph/impl/MapGraph.java b/src/main/java/berack96/lib/graph/impl/MapGraph.java
similarity index 79%
rename from src/berack96/lib/graph/impl/MapGraph.java
rename to src/main/java/berack96/lib/graph/impl/MapGraph.java
index a477fa2..600de5c 100644
--- a/src/berack96/lib/graph/impl/MapGraph.java
+++ b/src/main/java/berack96/lib/graph/impl/MapGraph.java
@@ -1,115 +1,116 @@
-package berack96.lib.graph.impl;
-
-import berack96.lib.graph.Graph;
-import berack96.lib.graph.GraphDirected;
-
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * Graph that uses HashMap for vertices and edges the vertices
- * @author Berack96
- */
-public class MapGraph extends GraphDirected {
-
- /**
- * Map that contains the edges from a vertex to another> edges = new HashMap<>();
-
- @Override
- public Iterator iterator() {
- return edges.keySet().iterator();
- }
-
-
- @Override
- protected Graph getNewInstance() {
- return new MapGraph<>();
- }
-
- @Override
- public void add(V vertex) {
- check(vertex);
- edges.computeIfAbsent(vertex, v -> new HashMap<>());
- edges.forEach((v, adj) -> adj.remove(vertex));
- edges.get(vertex).clear();
- }
-
- @Override
- public boolean contains(V vertex) {
- check(vertex);
- return edges.containsKey(vertex);
- }
-
- @Override
- public void remove(V vertex) {
- checkVert(vertex);
- edges.remove(vertex);
- edges.forEach((v, map) -> map.remove(vertex));
- }
-
- @Override
- public int addEdge(V vertex1, V vertex2, int weight) {
- checkVert(vertex1, vertex2);
- Map edge = edges.get(vertex1);
- Integer old = edge.get(vertex2);
- old = old == null ? NO_EDGE : old;
-
- if (weight == NO_EDGE)
- edge.remove(vertex2);
- else
- edge.put(vertex2, weight);
- return old;
- }
-
- @Override
- public int getWeight(V vertex1, V vertex2) {
- checkVert(vertex1, vertex2);
- Integer weight = edges.get(vertex1).get(vertex2);
- return weight == null ? NO_EDGE : weight;
- }
-
- @Override
- public Collection getChildren(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- return new HashSet<>(edges.get(vertex).keySet());
- }
-
- @Override
- public Collection getAncestors(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- Collection ancestors = new HashSet<>();
- edges.forEach((v, adj) -> {
- if (adj.containsKey(vertex))
- ancestors.add(v);
- });
- return ancestors;
- }
-
- @Override
- public void removeAll() {
- edges.clear();
- }
-
- @Override
- public int size() {
- return edges.size();
- }
-
- @Override
- public int numberOfEdges() {
- AtomicInteger sum = new AtomicInteger(0);
- edges.forEach((v, map) -> sum.getAndAdd(map.size()));
-
- return sum.get();
- }
-}
+package berack96.lib.graph.impl;
+
+import berack96.lib.graph.Graph;
+import berack96.lib.graph.GraphDirected;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Graph that uses TreeMap for vertices and edges the vertices
+ * @author Berack96
+ */
+public class MapGraph extends GraphDirected {
+
+ /**
+ * Map that contains the edges from a vertex to another> edges = getDefaultMap();
+
+ @Override
+ public Iterator iterator() {
+ return edges.keySet().iterator();
+ }
+
+
+ @Override
+ protected Graph getNewInstance() {
+ return new MapGraph<>();
+ }
+
+ @Override
+ public void add(V vertex) {
+ check(vertex);
+ edges.computeIfAbsent(vertex, v -> new TreeMap<>());
+ edges.forEach((v, adj) -> adj.remove(vertex));
+ edges.get(vertex).clear();
+ }
+
+ @Override
+ public boolean contains(V vertex) {
+ check(vertex);
+ return edges.containsKey(vertex);
+ }
+
+ @Override
+ public void remove(V vertex) {
+ checkVert(vertex);
+ edges.remove(vertex);
+ edges.forEach((v, map) -> map.remove(vertex));
+ }
+
+ @Override
+ public int addEdge(V vertex1, V vertex2, int weight) {
+ checkVert(vertex1, vertex2);
+ Map edge = edges.get(vertex1);
+ Integer old = edge.get(vertex2);
+ old = old == null ? NO_EDGE : old;
+
+ if (weight == NO_EDGE)
+ edge.remove(vertex2);
+ else
+ edge.put(vertex2, weight);
+ return old;
+ }
+
+ @Override
+ public int getWeight(V vertex1, V vertex2) {
+ checkVert(vertex1, vertex2);
+ Integer weight = edges.get(vertex1).get(vertex2);
+ return weight == null ? NO_EDGE : weight;
+ }
+
+ @Override
+ public Set getChildren(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ return new HashSet<>(edges.get(vertex).keySet());
+ }
+
+ @Override
+ public Set getAncestors(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ Set ancestors = getDefaultSet();
+ edges.forEach((v, adj) -> {
+ if (adj.containsKey(vertex))
+ ancestors.add(v);
+ });
+ return ancestors;
+ }
+
+ @Override
+ public void removeAll() {
+ edges.clear();
+ }
+
+ @Override
+ public int size() {
+ return edges.size();
+ }
+
+ @Override
+ public int numberOfEdges() {
+ AtomicInteger sum = new AtomicInteger(0);
+ edges.forEach((v, map) -> sum.getAndAdd(map.size()));
+
+ return sum.get();
+ }
+}
diff --git a/src/berack96/lib/graph/impl/MatrixGraph.java b/src/main/java/berack96/lib/graph/impl/MatrixGraph.java
similarity index 87%
rename from src/berack96/lib/graph/impl/MatrixGraph.java
rename to src/main/java/berack96/lib/graph/impl/MatrixGraph.java
index 6023d32..b0debc1 100644
--- a/src/berack96/lib/graph/impl/MatrixGraph.java
+++ b/src/main/java/berack96/lib/graph/impl/MatrixGraph.java
@@ -1,196 +1,196 @@
-package berack96.lib.graph.impl;
-
-import berack96.lib.graph.Graph;
-import berack96.lib.graph.GraphDirected;
-
-import java.util.*;
-
-/**
- * An implementation of the graph using a matrix for representing the edges
- *
- * @param the vertex
- * @author Berack96
- */
-public class MatrixGraph extends GraphDirected {
-
- private final Map map = new HashMap<>();
- private int[][] matrix = new int[0][0];
-
- @Override
- public Iterator iterator() {
- return map.keySet().iterator();
- }
-
- @Override
- protected Graph getNewInstance() {
- return new MatrixGraph<>();
- }
-
- @Override
- public void add(V vertex) {
- check(vertex);
- if (map.containsKey(vertex))
- removeAllEdge(vertex);
- else {
- map.put(vertex, map.size());
- matrix = modifyMatrix(map.size());
- }
- }
-
- @Override
- public boolean contains(V vertex) {
- check(vertex);
- return map.containsKey(vertex);
- }
-
- @Override
- public void remove(V vertex) {
- checkVert(vertex);
- int x = map.remove(vertex);
- int newSize = map.size();
-
- int[][] newMatrix = new int[newSize][newSize];
- for (int i = 0; i < newSize; i++)
- for (int j = 0; j < newSize; j++) {
- int indexI = i + (i < x ? 0 : 1);
- int indexJ = j + (j < x ? 0 : 1);
-
- newMatrix[i][j] = matrix[indexI][indexJ];
- }
-
- matrix = newMatrix;
- map.replaceAll((vert, index) -> index > x ? index - 1 : index);
- }
-
- @Override
- public int addEdge(V vertex1, V vertex2, int weight) {
- checkVert(vertex1, vertex2);
- int i = map.get(vertex1);
- int j = map.get(vertex2);
-
- int old = matrix[i][j];
- matrix[i][j] = weight;
- return old;
- }
-
- @Override
- public int getWeight(V vertex1, V vertex2) {
- checkVert(vertex1, vertex2);
- return matrix[map.get(vertex1)][map.get(vertex2)];
- }
-
- @Override
- public Collection getChildren(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- int x = map.get(vertex);
- Collection children = new HashSet<>();
- Map invert = getInverted();
-
- for (int i = 0; i < matrix.length; i++)
- if (matrix[x][i] != NO_EDGE)
- children.add(invert.get(i));
- return children;
- }
-
- @Override
- public Collection getAncestors(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- int x = map.get(vertex);
- Collection ancestors = new HashSet<>();
- Map invert = getInverted();
-
- for (int i = 0; i < matrix.length; i++)
- if (matrix[i][x] != NO_EDGE)
- ancestors.add(invert.get(i));
- return ancestors;
- }
-
- /**
- * From here on there are some optimization for the methods of the generic DirectedGraph
- **/
-
- @Override
- public int size() {
- return map.size();
- }
-
- @Override
- public int numberOfEdges() {
- int sum = 0;
- for (int[] adj : matrix)
- for (int edge : adj)
- if (edge != NO_EDGE)
- sum++;
- return sum;
- }
-
- @Override
- public int degreeIn(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- int degree = 0, x = map.get(vertex);
- for (int[] ints : matrix) degree += ints[x] == NO_EDGE ? 0 : 1;
- return degree;
- }
-
- @Override
- public int degreeOut(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- int degree = 0, x = map.get(vertex);
- for (int ints : matrix[x]) degree += ints == NO_EDGE ? 0 : 1;
- return degree;
- }
-
- @Override
- public void removeAllEdge(V vertex) throws NullPointerException, IllegalArgumentException {
- checkVert(vertex);
- int x = map.get(vertex);
- Arrays.fill(matrix[x], NO_EDGE);
- for (int[] ints : matrix) ints[x] = NO_EDGE;
- }
-
- @Override
- public void removeAllEdge() {
- for (int[] ints : matrix)
- Arrays.fill(ints, NO_EDGE);
- }
-
- @Override
- public void removeAll() {
- map.clear();
- matrix = new int[0][0];
- }
-
- @Override
- public void addAll(Collection vertices) throws NullPointerException {
- check(vertices);
- for (V vert : vertices)
- if (vert != null)
- map.compute(vert, (v, i) -> {
- if (i == null)
- return map.size();
- removeAllEdge(vert);
- return i;
- });
- matrix = modifyMatrix(map.size());
- }
-
- private int[][] modifyMatrix(int newSize) {
- int oldSize = matrix.length;
- if (newSize <= oldSize)
- return matrix;
-
- int[][] newMatrix = new int[newSize][newSize];
- for (int[] ints : newMatrix)
- Arrays.fill(ints, NO_EDGE);
- for (int i = 0; i < oldSize; i++)
- System.arraycopy(matrix[i], 0, newMatrix[i], 0, oldSize);
-
- return newMatrix;
- }
-
- private Map getInverted() {
- Map invert = new HashMap<>(map.size() + 1, 1);
- map.forEach((v, i) -> invert.put(i, v));
- return invert;
- }
-}
+package berack96.lib.graph.impl;
+
+import berack96.lib.graph.Graph;
+import berack96.lib.graph.GraphDirected;
+
+import java.util.*;
+
+/**
+ * An implementation of the graph using a matrix for representing the edges
+ *
+ * @param the vertex
+ * @author Berack96
+ */
+public class MatrixGraph extends GraphDirected {
+
+ private final Map map = getDefaultMap();
+ private int[][] matrix = new int[0][0];
+
+ @Override
+ public Iterator iterator() {
+ return map.keySet().iterator();
+ }
+
+ @Override
+ protected Graph getNewInstance() {
+ return new MatrixGraph<>();
+ }
+
+ @Override
+ public void add(V vertex) {
+ check(vertex);
+ if (map.containsKey(vertex))
+ removeAllEdge(vertex);
+ else {
+ map.put(vertex, map.size());
+ matrix = modifyMatrix(map.size());
+ }
+ }
+
+ @Override
+ public boolean contains(V vertex) {
+ check(vertex);
+ return map.containsKey(vertex);
+ }
+
+ @Override
+ public void remove(V vertex) {
+ checkVert(vertex);
+ int x = map.remove(vertex);
+ int newSize = map.size();
+
+ int[][] newMatrix = new int[newSize][newSize];
+ for (int i = 0; i < newSize; i++)
+ for (int j = 0; j < newSize; j++) {
+ int indexI = i + (i < x ? 0 : 1);
+ int indexJ = j + (j < x ? 0 : 1);
+
+ newMatrix[i][j] = matrix[indexI][indexJ];
+ }
+
+ matrix = newMatrix;
+ map.replaceAll((vert, index) -> index > x ? index - 1 : index);
+ }
+
+ @Override
+ public int addEdge(V vertex1, V vertex2, int weight) {
+ checkVert(vertex1, vertex2);
+ int i = map.get(vertex1);
+ int j = map.get(vertex2);
+
+ int old = matrix[i][j];
+ matrix[i][j] = weight;
+ return old;
+ }
+
+ @Override
+ public int getWeight(V vertex1, V vertex2) {
+ checkVert(vertex1, vertex2);
+ return matrix[map.get(vertex1)][map.get(vertex2)];
+ }
+
+ @Override
+ public Set getChildren(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ int x = map.get(vertex);
+ Set children = getDefaultSet();
+ Map invert = getInverted();
+
+ for (int i = 0; i < matrix.length; i++)
+ if (matrix[x][i] != NO_EDGE)
+ children.add(invert.get(i));
+ return children;
+ }
+
+ @Override
+ public Set getAncestors(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ int x = map.get(vertex);
+ Set ancestors = getDefaultSet();
+ Map invert = getInverted();
+
+ for (int i = 0; i < matrix.length; i++)
+ if (matrix[i][x] != NO_EDGE)
+ ancestors.add(invert.get(i));
+ return ancestors;
+ }
+
+ /**
+ * From here on there are some optimization for the methods of the generic DirectedGraph
+ **/
+
+ @Override
+ public int size() {
+ return map.size();
+ }
+
+ @Override
+ public int numberOfEdges() {
+ int sum = 0;
+ for (int[] adj : matrix)
+ for (int edge : adj)
+ if (edge != NO_EDGE)
+ sum++;
+ return sum;
+ }
+
+ @Override
+ public int degreeIn(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ int degree = 0, x = map.get(vertex);
+ for (int[] ints : matrix) degree += ints[x] == NO_EDGE ? 0 : 1;
+ return degree;
+ }
+
+ @Override
+ public int degreeOut(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ int degree = 0, x = map.get(vertex);
+ for (int ints : matrix[x]) degree += ints == NO_EDGE ? 0 : 1;
+ return degree;
+ }
+
+ @Override
+ public void removeAllEdge(V vertex) throws NullPointerException, IllegalArgumentException {
+ checkVert(vertex);
+ int x = map.get(vertex);
+ Arrays.fill(matrix[x], NO_EDGE);
+ for (int[] ints : matrix) ints[x] = NO_EDGE;
+ }
+
+ @Override
+ public void removeAllEdge() {
+ for (int[] ints : matrix)
+ Arrays.fill(ints, NO_EDGE);
+ }
+
+ @Override
+ public void removeAll() {
+ map.clear();
+ matrix = new int[0][0];
+ }
+
+ @Override
+ public void addAll(Collection vertices) throws NullPointerException {
+ check(vertices);
+ for (V vert : vertices)
+ if (vert != null)
+ map.compute(vert, (v, i) -> {
+ if (i == null)
+ return map.size();
+ removeAllEdge(vert);
+ return i;
+ });
+ matrix = modifyMatrix(map.size());
+ }
+
+ private int[][] modifyMatrix(int newSize) {
+ int oldSize = matrix.length;
+ if (newSize <= oldSize)
+ return matrix;
+
+ int[][] newMatrix = new int[newSize][newSize];
+ for (int[] ints : newMatrix)
+ Arrays.fill(ints, NO_EDGE);
+ for (int i = 0; i < oldSize; i++)
+ System.arraycopy(matrix[i], 0, newMatrix[i], 0, oldSize);
+
+ return newMatrix;
+ }
+
+ private Map getInverted() {
+ Map invert = getDefaultMap();
+ map.forEach((v, i) -> invert.put(i, v));
+ return invert;
+ }
+}
diff --git a/src/berack96/lib/graph/impl/MatrixUndGraph.java b/src/main/java/berack96/lib/graph/impl/MatrixUndGraph.java
similarity index 83%
rename from src/berack96/lib/graph/impl/MatrixUndGraph.java
rename to src/main/java/berack96/lib/graph/impl/MatrixUndGraph.java
index 327af48..459a871 100644
--- a/src/berack96/lib/graph/impl/MatrixUndGraph.java
+++ b/src/main/java/berack96/lib/graph/impl/MatrixUndGraph.java
@@ -8,7 +8,7 @@ import java.util.*;
public class MatrixUndGraph extends GraphUndirected {
- Map map = new HashMap<>();
+ Map map = getDefaultMap();
private int[][] matrix = new int[0][0];
@Override
@@ -73,33 +73,33 @@ public class MatrixUndGraph extends GraphUndirected {
}
@Override
- public Collection getChildren(V vertex) throws NullPointerException, IllegalArgumentException {
+ public Set getChildren(V vertex) throws NullPointerException, IllegalArgumentException {
checkVert(vertex);
- Collection collection = new HashSet<>();
- Map inverted = getInverted();
+ V[] inverted = getInverted();
+ Set set = getDefaultSet();
int x = map.get(vertex);
for (int i = 0; i < matrix.length; i++)
if (i < x && matrix[x][i] != 0)
- collection.add(inverted.get(i));
+ set.add(inverted[i]);
else if (i > x && matrix[i][x] != 0)
- collection.add(inverted.get(i));
- return collection;
+ set.add(inverted[i]);
+ return set;
}
@Override
- public Collection getAncestors(V vertex) throws NullPointerException, IllegalArgumentException {
+ public Set getAncestors(V vertex) throws NullPointerException, IllegalArgumentException {
return getChildren(vertex);
}
@Override
- public Collection> edges() {
- Map inverted = getInverted();
- Collection> edges = new LinkedList<>();
+ public Set> edges() {
+ V[] inverted = getInverted();
+ Set> edges = getDefaultSet();
for (int i = 0; i < matrix.length; i++)
for (int j = 0; j < matrix[i].length; j++)
if (matrix[i][j] != NO_EDGE)
- edges.add(new Edge<>(inverted.get(i), inverted.get(j), matrix[i][j]));
+ edges.add(new Edge<>(inverted[i], inverted[j], matrix[i][j]));
return edges;
}
@@ -168,9 +168,10 @@ public class MatrixUndGraph extends GraphUndirected {
return newMatrix;
}
- private Map getInverted() {
- Map invert = new HashMap<>(map.size() + 1, 1);
- map.forEach((v, i) -> invert.put(i, v));
+ @SuppressWarnings("unchecked")
+ private V[] getInverted() {
+ V[] invert = (V[]) new Object[map.size()];
+ map.forEach((v, i) -> invert[i] = v);
return invert;
}
}
diff --git a/src/berack96/lib/graph/models/EdgeSaveStructure.java b/src/main/java/berack96/lib/graph/models/EdgeSaveStructure.java
similarity index 95%
rename from src/berack96/lib/graph/models/EdgeSaveStructure.java
rename to src/main/java/berack96/lib/graph/models/EdgeSaveStructure.java
index e8b161d..b775ab2 100644
--- a/src/berack96/lib/graph/models/EdgeSaveStructure.java
+++ b/src/main/java/berack96/lib/graph/models/EdgeSaveStructure.java
@@ -1,18 +1,18 @@
-package berack96.lib.graph.models;
-
-/**
- * Support class used for saving a Graph in a file.
- *
- * @author Berack96
- */
-public class EdgeSaveStructure {
- protected EdgeSaveStructure(String s, String d, int w) {
- this.src = s;
- this.dest = d;
- this.weight = w;
- }
-
- public String src;
- public String dest;
- public int weight;
+package berack96.lib.graph.models;
+
+/**
+ * Support class used for saving a Graph in a file.
+ *
+ * @author Berack96
+ */
+public class EdgeSaveStructure {
+ protected EdgeSaveStructure(String s, String d, int w) {
+ this.src = s;
+ this.dest = d;
+ this.weight = w;
+ }
+
+ public String src;
+ public String dest;
+ public int weight;
}
\ No newline at end of file
diff --git a/src/berack96/lib/graph/models/GraphSaveStructure.java b/src/main/java/berack96/lib/graph/models/GraphSaveStructure.java
similarity index 92%
rename from src/berack96/lib/graph/models/GraphSaveStructure.java
rename to src/main/java/berack96/lib/graph/models/GraphSaveStructure.java
index 4d2cc4f..526e9ef 100644
--- a/src/berack96/lib/graph/models/GraphSaveStructure.java
+++ b/src/main/java/berack96/lib/graph/models/GraphSaveStructure.java
@@ -1,105 +1,105 @@
-package berack96.lib.graph.models;
-
-import berack96.lib.graph.Edge;
-import berack96.lib.graph.Graph;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.InstanceCreator;
-import com.google.gson.JsonSyntaxException;
-import com.google.gson.stream.JsonReader;
-
-import java.io.*;
-
-/**
- * Support class used for saving a Graph in a file.
- *
- * @author Berack96
- */
-public class GraphSaveStructure {
- final static public Gson gson = new Gson();
- public String[] vertices;
- public EdgeSaveStructure[] edges;
- //public MarkSaveStructure[] marks;
-
- /**
- * Load the graph saved in this class in an instance of a graph passed.
- * Before loading the graph, it is emptied.
- *
- * @param graph the graph where insert the data
- * @param fileName the file path and name
- * @param classV the class of the vertices
- * @throws FileNotFoundException in the case the file is not found
- * @throws NullPointerException in the case the graph is null
- */
- public final void load(@SuppressWarnings("ConstantConditions") Graph graph, String fileName, Class classV) throws FileNotFoundException, NullPointerException {
- //this way i use this class for the load
- InstanceCreator> creator = type -> this;
- Gson gson = new GsonBuilder().registerTypeAdapter(this.getClass(), creator).create();
- JsonReader reader = new JsonReader(new FileReader(fileName));
- gson.fromJson(reader, GraphSaveStructure.class);
- loadGraph(graph, classV);
- }
-
- /**
- * This method can be used by sub-classes for saving other stuff from the graph
- *
- * @param graph the graph to load with
- * @param classV the class used for the Vertex
- * @throws NullPointerException if the graph is null
- * @throws JsonSyntaxException if the file is malformed or corrupted
- */
- protected void loadGraph(Graph graph, Class classV) throws NullPointerException, JsonSyntaxException {
- graph.removeAll();
- for (String str : vertices)
- graph.add(gson.fromJson(str, classV));
-
- for (EdgeSaveStructure edge : edges)
- graph.addEdge(gson.fromJson(edge.src, classV), gson.fromJson(edge.dest, classV), edge.weight);
- }
-
- /**
- * Save the Graph passed as input to a file inserted as parameter. graph, String file) throws IOException {
- saveGraph(graph);
- int slash = file.lastIndexOf("\\");
- if (slash == -1)
- slash = file.lastIndexOf("/");
- if (slash != -1) {
- String dir = file.substring(0, slash);
- File fDir = new File(dir);
- //noinspection ResultOfMethodCallIgnored
- fDir.mkdirs();
- }
-
- FileWriter writer = new FileWriter(file);
- gson.toJson(this, writer);
- writer.close();
- }
-
- /**
- * This method can be used by sub-classes for saving other stuff from the graph
- *
- * @param graph the graph to save
- */
- protected void saveGraph(Graph graph) {
- this.vertices = new String[graph.size()];
- int i = 0;
- for (Object o : graph.vertices())
- this.vertices[i++] = gson.toJson(o);
-
- this.edges = new EdgeSaveStructure[graph.numberOfEdges()];
- i = 0;
- for (Edge edge : graph.edges())
- this.edges[i++] = new EdgeSaveStructure(gson.toJson(edge.getSource()), gson.toJson(edge.getDestination()), edge.getWeight());
- }
+package berack96.lib.graph.models;
+
+import berack96.lib.graph.Edge;
+import berack96.lib.graph.Graph;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.InstanceCreator;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.stream.JsonReader;
+
+import java.io.*;
+
+/**
+ * Support class used for saving a Graph in a file.
+ *
+ * @author Berack96
+ */
+public class GraphSaveStructure {
+ final static public Gson gson = new Gson();
+ public String[] vertices;
+ public EdgeSaveStructure[] edges;
+ //public MarkSaveStructure[] marks;
+
+ /**
+ * Load the graph saved in this class in an instance of a graph passed.
+ * Before loading the graph, it is emptied.
+ *
+ * @param graph the graph where insert the data
+ * @param fileName the file path and name
+ * @param classV the class of the vertices
+ * @throws FileNotFoundException in the case the file is not found
+ * @throws NullPointerException in the case the graph is null
+ */
+ public final void load(Graph graph, String fileName, Class classV) throws FileNotFoundException, NullPointerException {
+ //this way i use this class for the load
+ InstanceCreator> creator = type -> this;
+ Gson gson = new GsonBuilder().registerTypeAdapter(this.getClass(), creator).create();
+ JsonReader reader = new JsonReader(new FileReader(fileName));
+ gson.fromJson(reader, GraphSaveStructure.class);
+ loadGraph(graph, classV);
+ }
+
+ /**
+ * This method can be used by sub-classes for saving other stuff from the graph
+ *
+ * @param graph the graph to load with
+ * @param classV the class used for the Vertex
+ * @throws NullPointerException if the graph is null
+ * @throws JsonSyntaxException if the file is malformed or corrupted
+ */
+ protected void loadGraph(Graph graph, Class classV) throws NullPointerException, JsonSyntaxException {
+ graph.removeAll();
+ for (String str : vertices)
+ graph.add(gson.fromJson(str, classV));
+
+ for (EdgeSaveStructure edge : edges)
+ graph.addEdge(gson.fromJson(edge.src, classV), gson.fromJson(edge.dest, classV), edge.weight);
+ }
+
+ /**
+ * Save the Graph passed as input to a file inserted as parameter. graph, String file) throws IOException {
+ saveGraph(graph);
+ int slash = file.lastIndexOf("\\");
+ if (slash == -1)
+ slash = file.lastIndexOf("/");
+ if (slash != -1) {
+ String dir = file.substring(0, slash);
+ File fDir = new File(dir);
+ //noinspection ResultOfMethodCallIgnored
+ fDir.mkdirs();
+ }
+
+ FileWriter writer = new FileWriter(file);
+ gson.toJson(this, writer);
+ writer.close();
+ }
+
+ /**
+ * This method can be used by sub-classes for saving other stuff from the graph
+ *
+ * @param graph the graph to save
+ */
+ protected void saveGraph(Graph graph) {
+ this.vertices = new String[graph.size()];
+ int i = 0;
+ for (Object o : graph.vertices())
+ this.vertices[i++] = gson.toJson(o);
+
+ this.edges = new EdgeSaveStructure[graph.numberOfEdges()];
+ i = 0;
+ for (Edge edge : graph.edges())
+ this.edges[i++] = new EdgeSaveStructure(gson.toJson(edge.getSource()), gson.toJson(edge.getDestination()), edge.getWeight());
+ }
}
\ No newline at end of file
diff --git a/src/berack96/lib/graph/models/MarkSaveStructure.java b/src/main/java/berack96/lib/graph/models/MarkSaveStructure.java
similarity index 94%
rename from src/berack96/lib/graph/models/MarkSaveStructure.java
rename to src/main/java/berack96/lib/graph/models/MarkSaveStructure.java
index 3b3c125..3e4ba2b 100644
--- a/src/berack96/lib/graph/models/MarkSaveStructure.java
+++ b/src/main/java/berack96/lib/graph/models/MarkSaveStructure.java
@@ -1,17 +1,17 @@
-package berack96.lib.graph.models;
-
-/**
- * Support class used for saving a Graph in a file.
- *
- * @author Berack96
- *
- */
-public class MarkSaveStructure {
- protected MarkSaveStructure(String v, Object m) {
- this.vert = v;
- this.mark = m;
- }
-
- public String vert;
- public Object mark;
-}
+package berack96.lib.graph.models;
+
+/**
+ * Support class used for saving a Graph in a file.
+ *
+ * @author Berack96
+ *
+ */
+public class MarkSaveStructure {
+ protected MarkSaveStructure(String v, Object m) {
+ this.vert = v;
+ this.mark = m;
+ }
+
+ public String vert;
+ public Object mark;
+}
diff --git a/src/berack96/lib/graph/struct/QuickFind.java b/src/main/java/berack96/lib/graph/struct/QuickFind.java
similarity index 85%
rename from src/berack96/lib/graph/struct/QuickFind.java
rename to src/main/java/berack96/lib/graph/struct/QuickFind.java
index 51cc7de..a2345b7 100644
--- a/src/berack96/lib/graph/struct/QuickFind.java
+++ b/src/main/java/berack96/lib/graph/struct/QuickFind.java
@@ -1,19 +1,20 @@
package berack96.lib.graph.struct;
import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
+import berack96.lib.graph.Graph;
+
/**
* Simple implementation of the {@link UnionFind} interface with priority to the find function.
*
* @param the elements to search and merge
*/
public class QuickFind implements UnionFind {
- Map> struct = new HashMap<>();
+ Map> struct = Graph.getDefaultMap();
@Override
public int size() {
@@ -22,7 +23,7 @@ public class QuickFind implements UnionFind {
@Override
public void makeSetAll(Collection elements) throws NullPointerException {
- Map> temp = new HashMap<>(elements.size() + 1, 1);
+ Map> temp = Graph.getDefaultMap();
for (X elem : elements)
temp.computeIfAbsent(elem, new AddElement());
struct.putAll(temp);
@@ -65,10 +66,10 @@ public class QuickFind implements UnionFind