Author: simonetripodi
Date: Sat Jan 28 09:04:15 2012
New Revision: 1237028
URL: http://svn.apache.org/viewvc?rev=1237028&view=rev
Log:
changed flow related generics order, to be coherent how already declared
elsewhere
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/CommonsGraph.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultFromHeadBuilder.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultMaxFlowAlgorithmSelector.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultToTailBuilder.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/FromHeadBuilder.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/MaxFlowAlgorithmSelector.java
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/ToTailBuilder.java
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/CommonsGraph.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/CommonsGraph.java?rev=1237028&r1=1237027&r2=1237028&view=diff
==============================================================================
---
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/CommonsGraph.java
(original)
+++
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/CommonsGraph.java
Sat Jan 28 09:04:15 2012
@@ -69,16 +69,16 @@ public final class CommonsGraph<V extend
* Find the maximum flow on the input {@link Graph}.
*
* @param <V>
- * @param <W>
* @param <WE>
+ * @param <W>
* @param <G>
* @param graph the input edge-weighted graph
* @return
*/
- public static <V extends Vertex, WE extends WeightedEdge<W>, W, G extends
DirectedGraph<V, WE>> FromHeadBuilder<V, W, WE, G> findMaxFlow( G graph )
+ public static <V extends Vertex, WE extends WeightedEdge<W>, W, G extends
DirectedGraph<V, WE>> FromHeadBuilder<V, WE, W, G> findMaxFlow( G graph )
{
graph = checkNotNull( graph, "Max flow can not be calculated on null
graph" );
- return new DefaultFromHeadBuilder<V, W, WE, G>( graph );
+ return new DefaultFromHeadBuilder<V, WE, W, G>( graph );
}
/**
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultFromHeadBuilder.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultFromHeadBuilder.java?rev=1237028&r1=1237027&r2=1237028&view=diff
==============================================================================
---
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultFromHeadBuilder.java
(original)
+++
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultFromHeadBuilder.java
Sat Jan 28 09:04:15 2012
@@ -33,8 +33,8 @@ import org.apache.commons.graph.Weighted
* @param <WE>
* @param <G>
*/
-public final class DefaultFromHeadBuilder<V extends Vertex, W, WE extends
WeightedEdge<W>, G extends DirectedGraph<V, WE>>
- implements FromHeadBuilder<V, W, WE, G>
+public final class DefaultFromHeadBuilder<V extends Vertex, WE extends
WeightedEdge<W>, W, G extends DirectedGraph<V, WE>>
+ implements FromHeadBuilder<V, WE, W, G>
{
private final G graph;
@@ -44,10 +44,10 @@ public final class DefaultFromHeadBuilde
this.graph = graph;
}
- public ToTailBuilder<V, W, WE, G> from( V head )
+ public ToTailBuilder<V, WE, W, G> from( V head )
{
head = checkNotNull( head, "head vertex has to be specifies when
looking for the max flow" );
- return new DefaultToTailBuilder<V, W, WE, G>( graph, head );
+ return new DefaultToTailBuilder<V, WE, W, G>( graph, head );
}
}
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultMaxFlowAlgorithmSelector.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultMaxFlowAlgorithmSelector.java?rev=1237028&r1=1237027&r2=1237028&view=diff
==============================================================================
---
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultMaxFlowAlgorithmSelector.java
(original)
+++
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultMaxFlowAlgorithmSelector.java
Sat Jan 28 09:04:15 2012
@@ -39,8 +39,8 @@ import org.apache.commons.graph.weight.O
* @param <WE>
* @param <G>
*/
-final class DefaultMaxFlowAlgorithmSelector<V extends Vertex, W, WE extends
WeightedEdge<W>, G extends DirectedGraph<V, WE>>
- implements MaxFlowAlgorithmSelector<V, W, WE, G>
+final class DefaultMaxFlowAlgorithmSelector<V extends Vertex, WE extends
WeightedEdge<W>, W, G extends DirectedGraph<V, WE>>
+ implements MaxFlowAlgorithmSelector<V, WE, W, G>
{
private final G graph;
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultToTailBuilder.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultToTailBuilder.java?rev=1237028&r1=1237027&r2=1237028&view=diff
==============================================================================
---
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultToTailBuilder.java
(original)
+++
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/DefaultToTailBuilder.java
Sat Jan 28 09:04:15 2012
@@ -33,8 +33,8 @@ import org.apache.commons.graph.Weighted
* @param <WE>
* @param <G>
*/
-final class DefaultToTailBuilder<V extends Vertex, W, WE extends
WeightedEdge<W>, G extends DirectedGraph<V, WE>>
- implements ToTailBuilder<V, W, WE, G>
+final class DefaultToTailBuilder<V extends Vertex, WE extends WeightedEdge<W>,
W, G extends DirectedGraph<V, WE>>
+ implements ToTailBuilder<V, WE, W, G>
{
private final G graph;
@@ -47,10 +47,10 @@ final class DefaultToTailBuilder<V exten
this.head = head;
}
- public MaxFlowAlgorithmSelector<V, W, WE, G> to( V tail )
+ public MaxFlowAlgorithmSelector<V, WE, W, G> to( V tail )
{
tail = checkNotNull( tail, "tail vertex has to be specifies when
looking for the max flow" );
- return new DefaultMaxFlowAlgorithmSelector<V, W, WE, G>( graph, head,
tail );
+ return new DefaultMaxFlowAlgorithmSelector<V, WE, W, G>( graph, head,
tail );
}
}
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/FromHeadBuilder.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/FromHeadBuilder.java?rev=1237028&r1=1237027&r2=1237028&view=diff
==============================================================================
---
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/FromHeadBuilder.java
(original)
+++
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/FromHeadBuilder.java
Sat Jan 28 09:04:15 2012
@@ -23,7 +23,7 @@ import org.apache.commons.graph.Directed
import org.apache.commons.graph.Vertex;
import org.apache.commons.graph.WeightedEdge;
-public interface FromHeadBuilder<V extends Vertex, W, WE extends
WeightedEdge<W>, G extends DirectedGraph<V, WE>>
+public interface FromHeadBuilder<V extends Vertex, WE extends WeightedEdge<W>,
W, G extends DirectedGraph<V, WE>>
{
/**
@@ -32,6 +32,6 @@ public interface FromHeadBuilder<V exten
* @param head
* @return
*/
- ToTailBuilder<V, W, WE, G> from( V head );
+ ToTailBuilder<V, WE, W, G> from( V head );
}
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/MaxFlowAlgorithmSelector.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/MaxFlowAlgorithmSelector.java?rev=1237028&r1=1237027&r2=1237028&view=diff
==============================================================================
---
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/MaxFlowAlgorithmSelector.java
(original)
+++
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/MaxFlowAlgorithmSelector.java
Sat Jan 28 09:04:15 2012
@@ -24,7 +24,7 @@ import org.apache.commons.graph.Vertex;
import org.apache.commons.graph.WeightedEdge;
import org.apache.commons.graph.weight.OrderedMonoid;
-public interface MaxFlowAlgorithmSelector<V extends Vertex, W, WE extends
WeightedEdge<W>, G extends DirectedGraph<V, WE>>
+public interface MaxFlowAlgorithmSelector<V extends Vertex, WE extends
WeightedEdge<W>, W, G extends DirectedGraph<V, WE>>
{
/**
Modified:
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/ToTailBuilder.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/ToTailBuilder.java?rev=1237028&r1=1237027&r2=1237028&view=diff
==============================================================================
---
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/ToTailBuilder.java
(original)
+++
commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/flow/ToTailBuilder.java
Sat Jan 28 09:04:15 2012
@@ -23,7 +23,7 @@ import org.apache.commons.graph.Directed
import org.apache.commons.graph.Vertex;
import org.apache.commons.graph.WeightedEdge;
-public interface ToTailBuilder<V extends Vertex, W, WE extends
WeightedEdge<W>, G extends DirectedGraph<V, WE>>
+public interface ToTailBuilder<V extends Vertex, WE extends WeightedEdge<W>,
W, G extends DirectedGraph<V, WE>>
{
/**
@@ -32,6 +32,6 @@ public interface ToTailBuilder<V extends
* @param tail
* @return
*/
- MaxFlowAlgorithmSelector<V, W, WE, G> to( V tail );
+ MaxFlowAlgorithmSelector<V, WE, W, G> to( V tail );
}
