refactoring

Author: HendrixString

src/main/java/com/hendrix/erdos/Erdos.java

@@ -61,13 +61,13 @@ static public AbstractGraph cloneGraphOf(IGraph graph) {
      *
      * @return a new graph
      */
-    static public <T extends IGraphEngine> AbstractGraph newGraphWithEngine(final T graphEngine, final EDGE_DIRECTION direction,
+    static public <T extends IGraphEngine, R extends AbstractGraph> R newGraphWithEngine(final T graphEngine, final EDGE_DIRECTION direction,
                                                                             final boolean selfLoops, final boolean multiEdges) {
         switch (direction) {
             case DIRECTED:
-                return newDirectedGraphWithEngine(graphEngine, selfLoops, multiEdges);
+                return (R) newDirectedGraphWithEngine(graphEngine, selfLoops, multiEdges);
             case UNDIRECTED:
-                return newUndirectedGraphWithEngine(graphEngine, selfLoops, multiEdges);
+                return (R) newUndirectedGraphWithEngine(graphEngine, selfLoops, multiEdges);
         }
 
         return null;
@@ -83,7 +83,7 @@ static public <T extends IGraphEngine> AbstractGraph newGraphWithEngine(final T
      *
      * @return a new graph
      */
-    static private <T extends IGraphEngine> DirectedGraph newDirectedGraphWithEngine(final T graphEngine, final boolean selfLoops,
+    static public  <T extends IGraphEngine> DirectedGraph newDirectedGraphWithEngine(final T graphEngine, final boolean selfLoops,
                                                                                      final boolean multiEdges) {
         return new DirectedGraph() {
             @Override
@@ -113,7 +113,7 @@ public IGraphEngine graphEngineFactory() {
      *
      * @return a new graph
      */
-    static private <T extends IGraphEngine> UndirectedGraph newUndirectedGraphWithEngine(final T graphEngine, final boolean selfLoops,
+    static public <T extends IGraphEngine> UndirectedGraph newUndirectedGraphWithEngine(final T graphEngine, final boolean selfLoops,
                                                                                          final boolean multiEdges) {
         return new UndirectedGraph() {
             @Override

src/main/java/com/hendrix/erdos/algorithms/GraphAlgorithm.java renamed to src/main/java/com/hendrix/erdos/algorithms/AbstractGraphAlgorithm.java

@@ -8,26 +8,26 @@
  * @param <T> the return type of the algorithm
  * @param <E> the input type of the algorithm
  */
-abstract public class GraphAlgorithm<T, E extends IGraph> implements IGraphAlgorithm<T, E>
+abstract public class AbstractGraphAlgorithm<T, E extends IGraph> implements IGraphAlgorithm<T, E>
 {
     protected E         _graph_input       = null;
     protected T         _result_algorithm  = null;
     protected String    _tag               = "empty";
 
-    public GraphAlgorithm(E graph_input, String tag) {
+    public AbstractGraphAlgorithm(E graph_input, String tag) {
         _graph_input  = graph_input;
         _tag          = tag;
     }
 
-    public GraphAlgorithm(E graph_input) {
+    public AbstractGraphAlgorithm(E graph_input) {
         this(graph_input, null);
     }
 
-    public GraphAlgorithm(String tag) {
+    public AbstractGraphAlgorithm(String tag) {
         this(null, tag);
     }
 
-    public GraphAlgorithm() {}
+    public AbstractGraphAlgorithm() {}
 
         @Override
     public void setInputGraph(E graph) {

src/main/java/com/hendrix/erdos/algorithms/AbstractShortestPathAlgorithm.java

@@ -18,7 +18,7 @@
  * @author Tomer Shalev
  */
 @SuppressWarnings("UnusedDeclaration")
-abstract public class AbstractShortestPathAlgorithm<E extends IGraph> extends GraphAlgorithm<ShortestPathsTree, E> {
+abstract public class AbstractShortestPathAlgorithm<E extends IGraph> extends AbstractGraphAlgorithm<ShortestPathsTree, E> {
     /**
      * the predecessor of u is stored in PIE. If u has no predecessor (for example, if u = s or u has not been discovered), then π[u] = NIL
      */

src/main/java/com/hendrix/erdos/algorithms/BFS.java

@@ -19,7 +19,7 @@
 /**
  * @author Tomer Shalev
  */
-public class BFS extends GraphAlgorithm<BreadthFirstTree, IGraph>
+public class BFS extends AbstractGraphAlgorithm<BreadthFirstTree, IGraph>
 {
     protected IVertex _sourceIVertex     = null;
     /**

src/main/java/com/hendrix/erdos/algorithms/DFS.java

@@ -17,7 +17,7 @@
 /**
  * @author Tomer Shalev
  */
-public class DFS extends GraphAlgorithm<DFS.DepthFirstForest, IGraph>
+public class DFS extends AbstractGraphAlgorithm<DFS.DepthFirstForest, IGraph>
 {
     /**
      * edge classification

src/main/java/com/hendrix/erdos/algorithms/FloydWarshall.java

@@ -9,7 +9,7 @@
  * @author Tomer Shalev
  */
 @SuppressWarnings("UnusedDeclaration")
-public class FloydWarshall extends GraphAlgorithm<AllPairsShortPathResult, IDirectedGraph> {
+public class FloydWarshall extends AbstractGraphAlgorithm<AllPairsShortPathResult, IDirectedGraph> {
 
     public FloydWarshall(IDirectedGraph graph_input) {
         super(graph_input, "result Floyd Warshall Algorithm");

src/main/java/com/hendrix/erdos/algorithms/Johnson.java

@@ -26,7 +26,7 @@
  * @author Tomer Shalev
  */
 @SuppressWarnings("UnusedDeclaration")
-public class Johnson extends GraphAlgorithm<AllPairsShortPathResult, IDirectedGraph> {
+public class Johnson extends AbstractGraphAlgorithm<AllPairsShortPathResult, IDirectedGraph> {
     private HashMap<IVertex, Float> H = null;
     private EdgeFunction W_cap = null;
 

src/main/java/com/hendrix/erdos/algorithms/MSTKruskal.java

@@ -19,7 +19,7 @@
  * @see MinSpanTreeFactory
  */
 @SuppressWarnings("UnusedDeclaration")
-public class MSTKruskal extends GraphAlgorithm<UndirectedGraph, IUndirectedGraph> {
+public class MSTKruskal extends AbstractGraphAlgorithm<UndirectedGraph, IUndirectedGraph> {
 
     public MSTKruskal(IUndirectedGraph graph_input) {
         super(graph_input, "MST_Kruskal");

src/main/java/com/hendrix/erdos/algorithms/MSTPrim.java

@@ -17,7 +17,7 @@
  * @author Tomer Shalev
  */
 @SuppressWarnings("UnusedDeclaration")
-public class MSTPrim extends GraphAlgorithm<UndirectedGraph, IUndirectedGraph> {
+public class MSTPrim extends AbstractGraphAlgorithm<UndirectedGraph, IUndirectedGraph> {
     /**
      * the predecessor of u is stored in PIE. If u has no predecessor (for example, if u = s or u has not been discovered), then π[u] = NIL
      */
@@ -54,7 +54,7 @@ public UndirectedGraph applyAlgorithm() {
      *
      * @param vertex the starting vertex
      */
-    public GraphAlgorithm<UndirectedGraph, IUndirectedGraph> setStartVertex(IVertex vertex) {
+    public AbstractGraphAlgorithm<UndirectedGraph, IUndirectedGraph> setStartVertex(IVertex vertex) {
         _startVertex = vertex;
 
         return this;

src/main/java/com/hendrix/erdos/algorithms/SCC.java

@@ -16,7 +16,7 @@
  * computes the Strongly Connected Components of input Graph G
  * @author Tomer Shalev
  */
-public class SCC extends GraphAlgorithm<ArrayList<HashSet<IVertex>>, IDirectedGraph> {
+public class SCC extends AbstractGraphAlgorithm<ArrayList<HashSet<IVertex>>, IDirectedGraph> {
 
     public SCC(IDirectedGraph graph_input) {
         super(graph_input, "Strongly Connected Components");