Fixed review comments

Author: Joris Kinable

jgrapht-core/src/test/java/org/jgrapht/graph/IntegerVertexFactory.java renamed to jgrapht-core/src/main/java/org/jgrapht/alg/util/IntegerVertexFactory.java

@@ -15,7 +15,7 @@
  * (b) the terms of the Eclipse Public License v1.0 as published by
  * the Eclipse Foundation.
  */
-package org.jgrapht.graph;
+package org.jgrapht.alg.util;
 
 import org.jgrapht.*;
 

jgrapht-core/src/main/java/org/jgrapht/generate/GeneralizedPetersenGraphGenerator.java

@@ -59,8 +59,8 @@ public GeneralizedPetersenGraphGenerator(int n, int k){
 
     @Override
     public void generateGraph(Graph<V, E> target, VertexFactory<V> vertexFactory, Map<String, V> resultMap) {
-        List<V> verticesU=new ArrayList<>(n);
-        List<V> verticesV=new ArrayList<>(n);
+        List<V> verticesU=new ArrayList<>(n); //Polygon vertices
+        List<V> verticesV=new ArrayList<>(n); //Star vertices
         for(int i=0; i<n; i++){
             verticesU.add(vertexFactory.createVertex());
             verticesV.add(vertexFactory.createVertex());

jgrapht-core/src/main/java/org/jgrapht/generate/NamedGraphGenerator.java

@@ -19,6 +19,7 @@
 
 import org.jgrapht.Graph;
 import org.jgrapht.VertexFactory;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.graph.DefaultEdge;
 import org.jgrapht.graph.SimpleGraph;
 
@@ -378,20 +379,6 @@ public void generateClebschGraph(Graph<V,E> targetGraph){
             addEdge(targetGraph, i, i-6);
         addEdge(targetGraph, 6, 5);
     }
-    ///////////////////////////////////////////////
-
-    //-------------Hall-Janko Graph-----------//
-    /* Graph has 1800 edges: too big to include as edge array. Need sparse6 dependency
-    public static Graph<Integer, DefaultEdge> hallJankoGraph(){
-        Graph<Integer, DefaultEdge> g=new SimpleGraph<>(DefaultEdge.class);
-        new NamedGraphGenerator<Integer, DefaultEdge>(new IntegerVertexFactory()).generateHallJankoGraph(g);
-        return g;
-    }
-    public void generateHallJankoGraph(Graph<V,E> targetGraph){
-        int[][] edges=;
-        for(int[] edge : edges)
-            addEdge(targetGraph, edge[0], edge[1]);
-    }*/
 
     //-------------Bidiakis cube Graph-----------//
     /**
@@ -1014,20 +1001,4 @@ private void addEdge(Graph<V,E> targetGraph, int i, int j){
         V v = addVertex(targetGraph, j);
         targetGraph.addEdge(u, v);
     }
-
-    /**
-     * Creates vertices of the type Integer
-     */
-    public static class IntegerVertexFactory implements VertexFactory<Integer>
-    {
-        private int counter = 0;
-
-        @Override
-        public Integer createVertex()
-        {
-            return counter++;
-        }
-
-    }
-
 }

jgrapht-core/src/test/java/org/jgrapht/GraphMetricsTest.java

@@ -18,6 +18,7 @@
 package org.jgrapht;
 
 import org.jgrapht.alg.cycle.TarjanSimpleCycles;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 import org.junit.Test;

jgrapht-core/src/test/java/org/jgrapht/GraphTestsTest.java

@@ -19,6 +19,7 @@
 
 import java.util.*;
 
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 import org.junit.*;

jgrapht-core/src/test/java/org/jgrapht/alg/StrongConnectivityAlgorithmTest.java

@@ -21,6 +21,7 @@
 
 import org.jgrapht.*;
 import org.jgrapht.alg.interfaces.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 

jgrapht-core/src/test/java/org/jgrapht/alg/TransitiveClosureTest.java

@@ -19,6 +19,7 @@
 
 
 import junit.framework.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 

jgrapht-core/src/test/java/org/jgrapht/alg/VertexCoverTest.java

@@ -22,6 +22,7 @@
 import org.jgrapht.*;
 import org.jgrapht.alg.interfaces.*;
 import org.jgrapht.alg.interfaces.MinimumVertexCoverAlgorithm.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.alg.vertexcover.*;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;

jgrapht-core/src/test/java/org/jgrapht/alg/clique/AllVariantsBronKerboschCliqueFinderTest.java

@@ -27,7 +27,7 @@
 import org.jgrapht.generate.GnpRandomGraphGenerator;
 import org.jgrapht.generate.GraphGenerator;
 import org.jgrapht.graph.DefaultEdge;
-import org.jgrapht.graph.IntegerVertexFactory;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.graph.SimpleGraph;
 import org.junit.Test;
 

jgrapht-core/src/test/java/org/jgrapht/alg/clique/CliqueMinimalSeparatorDecompositionTest.java

@@ -21,6 +21,7 @@
 
 import org.jgrapht.*;
 import org.jgrapht.alg.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 

jgrapht-core/src/test/java/org/jgrapht/alg/color/BaseColoringTest.java

@@ -39,7 +39,7 @@
 import org.jgrapht.generate.GnpRandomGraphGenerator;
 import org.jgrapht.generate.GraphGenerator;
 import org.jgrapht.graph.DefaultEdge;
-import org.jgrapht.graph.IntegerVertexFactory;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.graph.SimpleGraph;
 import org.junit.Test;
 

jgrapht-core/src/test/java/org/jgrapht/alg/cycle/HierholzerEulerianCycleTest.java

@@ -25,6 +25,7 @@
 import java.util.stream.*;
 
 import org.jgrapht.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 import org.junit.*;

jgrapht-core/src/test/java/org/jgrapht/alg/flow/GusfieldTreeAlgorithmsTestBase.java

@@ -20,6 +20,7 @@
 import java.util.*;
 
 import org.jgrapht.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 

jgrapht-core/src/test/java/org/jgrapht/alg/flow/MaximumFlowMinimumCutAlgorithmTestBase.java

@@ -20,6 +20,7 @@
 import java.util.*;
 
 import org.jgrapht.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 

jgrapht-core/src/test/java/org/jgrapht/alg/flow/PadbergRaoOddMinimumCutsetTest.java

@@ -22,6 +22,7 @@
 
 import org.jgrapht.*;
 import org.jgrapht.alg.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 

jgrapht-core/src/test/java/org/jgrapht/alg/shortestpath/AllPairsShortestPathsTest.java

@@ -24,6 +24,7 @@
 
 import org.jgrapht.*;
 import org.jgrapht.alg.interfaces.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 import org.junit.*;

jgrapht-core/src/test/java/org/jgrapht/alg/shortestpath/FloydWarshallPseudographsTest.java

@@ -26,6 +26,7 @@
 
 import org.jgrapht.*;
 import org.jgrapht.alg.interfaces.ShortestPathAlgorithm.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 import org.junit.*;

jgrapht-core/src/test/java/org/jgrapht/alg/shortestpath/FloydWarshallShortestPathsTest.java

@@ -20,6 +20,7 @@
 import java.util.*;
 
 import org.jgrapht.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 

jgrapht-core/src/test/java/org/jgrapht/alg/shortestpath/GraphMeasurerTest.java

@@ -20,6 +20,7 @@
 import org.jgrapht.Graph;
 import org.jgrapht.Graphs;
 import org.jgrapht.alg.interfaces.ShortestPathAlgorithm;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.graph.*;
 import org.junit.Test;
 

jgrapht-core/src/test/java/org/jgrapht/alg/shortestpath/JohnsonShortestPathsTest.java

@@ -34,7 +34,7 @@
 import org.jgrapht.graph.DefaultEdge;
 import org.jgrapht.graph.DefaultWeightedEdge;
 import org.jgrapht.graph.DirectedWeightedPseudograph;
-import org.jgrapht.graph.IntegerVertexFactory;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.graph.SimpleDirectedGraph;
 import org.junit.Test;
 

jgrapht-core/src/test/java/org/jgrapht/alg/shortestpath/KSPPathValidatorTest.java

@@ -21,6 +21,7 @@
 import java.util.*;
 
 import org.jgrapht.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 

jgrapht-core/src/test/java/org/jgrapht/alg/shortestpath/ListSingleSourcePathsTest.java

@@ -22,6 +22,7 @@
 import java.util.*;
 
 import org.jgrapht.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 import org.junit.*;

jgrapht-core/src/test/java/org/jgrapht/alg/spanning/MinimumSpanningTreeTest.java

@@ -22,6 +22,7 @@
 import org.jgrapht.*;
 import org.jgrapht.alg.interfaces.*;
 import org.jgrapht.alg.interfaces.SpanningTreeAlgorithm.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.generate.*;
 import org.jgrapht.graph.*;
 

jgrapht-core/src/test/java/org/jgrapht/generate/BarabasiAlbertGraphGeneratorTest.java

@@ -22,7 +22,7 @@
 
 import org.jgrapht.Graph;
 import org.jgrapht.graph.DefaultEdge;
-import org.jgrapht.graph.IntegerVertexFactory;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.graph.SimpleDirectedGraph;
 import org.jgrapht.graph.SimpleGraph;
 import org.junit.Test;

jgrapht-core/src/test/java/org/jgrapht/generate/GeneralizedPetersenGraphGeneratorTest.java

@@ -22,7 +22,7 @@
 import org.jgrapht.GraphTests;
 import org.jgrapht.alg.shortestpath.GraphMeasurer;
 import org.jgrapht.graph.DefaultEdge;
-import org.jgrapht.graph.IntegerVertexFactory;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.graph.SimpleGraph;
 import org.junit.Test;
 

jgrapht-core/src/test/java/org/jgrapht/generate/GnmRandomBipartiteGraphGeneratorTest.java

@@ -18,6 +18,7 @@
 package org.jgrapht.generate;
 
 import org.jgrapht.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.graph.*;
 
 import junit.framework.*;
@@ -69,7 +70,7 @@ public void testDirectedGraphGnm1()
         GraphGenerator<Integer, DefaultEdge, Integer> gen =
             new GnmRandomBipartiteGraphGenerator<>(4, 4, 20, SEED);
         Graph<Integer, DefaultEdge> g = new DirectedPseudograph<>(DefaultEdge.class);
-        gen.generateGraph(g, new IntegerVertexFactory(), null);
+        gen.generateGraph(g, new IntegerVertexFactory(1), null);
 
         int[][] edges = { { 3, 5 }, { 6, 3 }, { 2, 8 }, { 7, 2 }, { 6, 2 }, { 4, 5 }, { 7, 4 },
             { 2, 5 }, { 6, 1 }, { 5, 1 }, { 2, 7 }, { 1, 7 }, { 2, 6 }, { 3, 6 }, { 1, 5 },
@@ -87,7 +88,7 @@ public void testUndirectedGraphGnm1()
         GraphGenerator<Integer, DefaultEdge, Integer> gen =
             new GnmRandomBipartiteGraphGenerator<>(4, 4, 10, SEED);
         Graph<Integer, DefaultEdge> g = new SimpleGraph<>(DefaultEdge.class);
-        gen.generateGraph(g, new IntegerVertexFactory(), null);
+        gen.generateGraph(g, new IntegerVertexFactory(1), null);
 
         int[][] edges = { { 3, 5 }, { 1, 7 }, { 2, 8 }, { 2, 6 }, { 3, 8 }, { 4, 8 }, { 1, 6 },
             { 4, 7 }, { 4, 6 }, { 4, 5 } };
@@ -119,19 +120,6 @@ public void testGnmEdgesLimit()
         } catch (IllegalArgumentException e) {
         }
     }
-
-    private class IntegerVertexFactory
-        implements VertexFactory<Integer>
-    {
-        private int id;
-
-        @Override
-        public Integer createVertex()
-        {
-            return ++id;
-        }
-    };
-
 }
 
 // End GnmRandomBipartiteGraphGeneratorTest.java

jgrapht-core/src/test/java/org/jgrapht/generate/GnmRandomGraphGeneratorTest.java

@@ -20,6 +20,7 @@
 import java.util.*;
 
 import org.jgrapht.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.graph.*;
 import org.jgrapht.util.TypeUtil;
 

jgrapht-core/src/test/java/org/jgrapht/generate/GnpRandomBipartiteGraphGeneratorTest.java

@@ -18,6 +18,7 @@
 package org.jgrapht.generate;
 
 import org.jgrapht.*;
+import org.jgrapht.alg.util.IntegerVertexFactory;
 import org.jgrapht.graph.*;
 
 import junit.framework.*;