git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated coding rules.
[utils]
/
system
/
general
/
src
/
main
/
java
/
org
/
wamblee
/
system
/
graph
/
Graph.java
diff --git
a/system/general/src/main/java/org/wamblee/system/graph/Graph.java
b/system/general/src/main/java/org/wamblee/system/graph/Graph.java
index 0e4f6ccb0b28c82020ed8dd0e17b8aab5c5f3164..ddfd2cf783a9003bb5a3db98d20ff02eb0631455 100644
(file)
--- a/
system/general/src/main/java/org/wamblee/system/graph/Graph.java
+++ b/
system/general/src/main/java/org/wamblee/system/graph/Graph.java
@@
-26,15
+26,15
@@
import java.util.List;
*/
public class Graph {
*/
public class Graph {
- private List<Node>
_
nodes;
- private List<Edge>
_
edges;
+ private List<Node> nodes;
+ private List<Edge> edges;
/**
* Constructs the graph.
*/
public Graph() {
/**
* Constructs the graph.
*/
public Graph() {
-
_
nodes = new ArrayList<Node>();
-
_
edges = new ArrayList<Edge>();
+ nodes = new ArrayList<Node>();
+ edges = new ArrayList<Edge>();
}
/**
}
/**
@@
-47,11
+47,11
@@
public class Graph {
* using <code>equals</code>.
*/
public void addNode(Node aNode) {
* using <code>equals</code>.
*/
public void addNode(Node aNode) {
- if (
_
nodes.contains(aNode)) {
+ if (nodes.contains(aNode)) {
throw new IllegalArgumentException("Node '" + aNode.getName()
+ "' already exists");
}
throw new IllegalArgumentException("Node '" + aNode.getName()
+ "' already exists");
}
-
_
nodes.add(aNode);
+ nodes.add(aNode);
}
/**
}
/**
@@
-62,7
+62,7
@@
public class Graph {
* @return Node or null if not found.
*/
public Node findNode(String aName) {
* @return Node or null if not found.
*/
public Node findNode(String aName) {
- for (Node node :
_
nodes) {
+ for (Node node : nodes) {
if (node.getName().equals(aName)) {
return node;
}
if (node.getName().equals(aName)) {
return node;
}
@@
-85,7
+85,7
@@
public class Graph {
+ aNode.getName()
+ "' because it is connected to one or more edges");
}
+ aNode.getName()
+ "' because it is connected to one or more edges");
}
- return
_
nodes.remove(aNode);
+ return nodes.remove(aNode);
}
/**
}
/**
@@
-113,19
+113,19
@@
public class Graph {
* {@link #equals(Object)} is already a part of the graph.
*/
public void addEdge(Edge aEdge) {
* {@link #equals(Object)} is already a part of the graph.
*/
public void addEdge(Edge aEdge) {
- if (
_
edges.contains(aEdge)) {
+ if (edges.contains(aEdge)) {
throw new IllegalArgumentException("Edge '" + aEdge
+ "' already exists");
}
throw new IllegalArgumentException("Edge '" + aEdge
+ "' already exists");
}
- if (!
_
nodes.contains(aEdge.getFrom())) {
+ if (!nodes.contains(aEdge.getFrom())) {
throw new IllegalArgumentException("From node '" + aEdge.getFrom()
+ "' from edge '" + aEdge + "' is not part of the graph");
}
throw new IllegalArgumentException("From node '" + aEdge.getFrom()
+ "' from edge '" + aEdge + "' is not part of the graph");
}
- if (!
_
nodes.contains(aEdge.getTo())) {
+ if (!nodes.contains(aEdge.getTo())) {
throw new IllegalArgumentException("To node '" + aEdge.getTo()
+ "' from edge '" + aEdge + "' is not part of the graph");
}
throw new IllegalArgumentException("To node '" + aEdge.getTo()
+ "' from edge '" + aEdge + "' is not part of the graph");
}
-
_
edges.add(aEdge);
+ edges.add(aEdge);
}
/**
}
/**
@@
-134,7
+134,7
@@
public class Graph {
* @return True if the edge was removed.
*/
public boolean removeEdge(Edge aEdge) {
* @return True if the edge was removed.
*/
public boolean removeEdge(Edge aEdge) {
- return
_
edges.remove(aEdge);
+ return edges.remove(aEdge);
}
/**
}
/**
@@
-152,7
+152,7
@@
public class Graph {
* @return Copy of the list of nodes of the graph.
*/
public List<Node> getNodes() {
* @return Copy of the list of nodes of the graph.
*/
public List<Node> getNodes() {
- return new ArrayList<Node>(
_
nodes);
+ return new ArrayList<Node>(nodes);
}
/**
}
/**
@@
-160,7
+160,7
@@
public class Graph {
* @return Copy of the list of edges of the graph.
*/
public List<Edge> getEdges() {
* @return Copy of the list of edges of the graph.
*/
public List<Edge> getEdges() {
- return new ArrayList<Edge>(
_
edges);
+ return new ArrayList<Edge>(edges);
}
/**
}
/**
@@
-169,9
+169,9
@@
public class Graph {
* @param aFactory Edge factory.
*/
public void extend(EdgeFactory aFactory) {
* @param aFactory Edge factory.
*/
public void extend(EdgeFactory aFactory) {
- for (Node from :
_
nodes) {
- for (Node to :
_
nodes) {
-
_
edges.addAll(aFactory.create(from, to));
+ for (Node from : nodes) {
+ for (Node to : nodes) {
+ edges.addAll(aFactory.create(from, to));
}
}
}
}
}
}
@@
-181,7
+181,7
@@
public class Graph {
* @param aFilter Filter to apply.
*/
public void applyFilter(EdgeFilter aFilter) {
* @param aFilter Filter to apply.
*/
public void applyFilter(EdgeFilter aFilter) {
- for (Iterator<Edge> edge =
_
edges.iterator(); edge.hasNext(); ) {
+ for (Iterator<Edge> edge = edges.iterator(); edge.hasNext(); ) {
if (aFilter.isViolated(edge.next())) {
edge.remove();
}
if (aFilter.isViolated(edge.next())) {
edge.remove();
}
@@
-196,7
+196,7
@@
public class Graph {
*/
public List<Edge> findOutgoing(Node aNode) {
List<Edge> result = new ArrayList<Edge>();
*/
public List<Edge> findOutgoing(Node aNode) {
List<Edge> result = new ArrayList<Edge>();
- for (Edge edge :
_
edges) {
+ for (Edge edge : edges) {
if (edge.getFrom().getName().equals(aNode.getName())) {
result.add(edge);
}
if (edge.getFrom().getName().equals(aNode.getName())) {
result.add(edge);
}
@@
-213,7
+213,7
@@
public class Graph {
*/
public List<Edge> findIncoming(Node aNode) {
List<Edge> result = new ArrayList<Edge>();
*/
public List<Edge> findIncoming(Node aNode) {
List<Edge> result = new ArrayList<Edge>();
- for (Edge edge :
_
edges) {
+ for (Edge edge : edges) {
if (edge.getTo().getName().equals(aNode.getName())) {
result.add(edge);
}
if (edge.getTo().getName().equals(aNode.getName())) {
result.add(edge);
}