commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1240992 - /commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeAlgorithmSelector.java
Date Mon, 06 Feb 2012 12:04:47 GMT
Author: simonetripodi
Date: Mon Feb  6 12:04:46 2012
New Revision: 1240992

URL: http://svn.apache.org/viewvc?rev=1240992&view=rev
Log:
trivial format

Modified:
    commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeAlgorithmSelector.java

Modified: commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeAlgorithmSelector.java
URL: http://svn.apache.org/viewvc/commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeAlgorithmSelector.java?rev=1240992&r1=1240991&r2=1240992&view=diff
==============================================================================
--- commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeAlgorithmSelector.java
(original)
+++ commons/sandbox/graph/trunk/src/main/java/org/apache/commons/graph/spanning/DefaultSpanningTreeAlgorithmSelector.java
Mon Feb  6 12:04:46 2012
@@ -77,13 +77,13 @@ final class DefaultSpanningTreeAlgorithm
          *     end while
          * <pre>
          */
-        
+
         final MutableSpanningTree<V, WE, W> spanningTree =
             new MutableSpanningTree<V, WE, W>( orderedMonoid );
-        
+
         final Set<SuperVertex<V, W, WE, G, OM>> components =
             new HashSet<SuperVertex<V, W, WE, G, OM>>( graph.getOrder() );
-        
+
         final Map<V, SuperVertex<V, W, WE, G, OM>> mapping =
             new HashMap<V, SuperVertex<V, W, WE, G, OM>>( graph.getOrder() );
 
@@ -99,52 +99,59 @@ final class DefaultSpanningTreeAlgorithm
             spanningTree.addVertex( v );
         }
 
-        while ( components.size() > 1 ) {
+        while ( components.size() > 1 )
+        {
             List<WE> edges = new LinkedList<WE>();
-            for ( SuperVertex<V, W, WE, G, OM> v : components ) {
+            for ( SuperVertex<V, W, WE, G, OM> v : components )
+            {
                 // get the minimum edge for each component to any other component
                 WE edge = v.getMinimumWeightEdge();
-                if (edge != null) {
+                if ( edge != null )
+                {
                     edges.add( edge );
                 }
             }
 
             // if there is no edge anymore for a component, and there is still more than
1 component,
             // the graph is unconnected
-            checkState(!edges.isEmpty() || components.size() == 1, "unconnected graph");
-            
-            for ( WE edge : edges ) {
+            checkState( !edges.isEmpty() || components.size() == 1, "unconnected graph" );
+
+            for ( WE edge : edges )
+            {
                 VertexPair<V> pair = graph.getVertices( edge );
                 V head = pair.getHead();
                 V tail = pair.getTail();
-                
+
                 // find the super vertices corresponding to this edge
                 SuperVertex<V, W, WE, G, OM> headSuper = mapping.get( head );
                 SuperVertex<V, W, WE, G, OM> tailSuper = mapping.get( tail );
-                
+
                 // merge them, if they are not the same
-                if ( headSuper != tailSuper ) {
+                if ( headSuper != tailSuper )
+                {
                     headSuper.merge( tailSuper );
-                
+
                     // update the mapping for each merged vertex
-                    for ( V v : tailSuper ) {
+                    for ( V v : tailSuper )
+                    {
                         mapping.put( v, headSuper );
                     }
-                
+
                     // remove the merged super vertex from the components set
                     components.remove( tailSuper );
 
                     // add the edge to the spanning tree
-                    if ( spanningTree.getVertices( edge ) == null ) {
+                    if ( spanningTree.getVertices( edge ) == null )
+                    {
                         spanningTree.addEdge( head, edge, tail );
                     }
                 }
-            }            
+            }
         }
-        
+
         return spanningTree;
     }
-    
+
     /**
      * {@inheritDoc}
      */



Mime
View raw message