Committing, but will remove much of the work that has been done to take a different approach.

Author: jimbethancourt

dsm/src/main/java/org/hjug/dsm/DSM.java

@@ -278,6 +278,8 @@ void printDSM(Graph<String, DefaultWeightedEdge> graph, List<String> sortedActiv
         }
     }
 
+    // TODO: Delete all code below this line
+    // Will be superseded by Minimum Feedback Arc + Vertex calculations
     /////////////////////////////////////////////////////////
     // "Standard" Graph implementation to find edge to remove
     /////////////////////////////////////////////////////////

dsm/src/main/java/org/hjug/dsm/SparseIntDWGEdgeRemovalCalculator.java

@@ -15,6 +15,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+// TODO: Delete
 class SparseIntDWGEdgeRemovalCalculator {
     private final Graph<String, DefaultWeightedEdge> graph;
     SparseIntDirectedWeightedGraph sparseGraph;
@@ -35,7 +36,6 @@ class SparseIntDWGEdgeRemovalCalculator {
             int vertexCount,
             Map<String, Integer> vertexToInt,
             Map<Integer, String> intToVertex) {
-        //TODO: Use concurrent types where possible
         this.graph = graph;
         this.sparseGraph = sparseGraph;
         this.sparseEdges = new CopyOnWriteArrayList<>(sparseEdges);
@@ -83,7 +83,8 @@ private EdgeToRemoveInfo calculateSparseEdgeToRemoveInfo(Integer edgeToRemove) {
 
     private List<Integer> orderVertices(SparseIntDirectedWeightedGraph sparseGraph) {
         List<Set<Integer>> sccs = new CopyOnWriteArrayList<>(findStronglyConnectedSparseGraphComponents(sparseGraph));
-        List<Integer> sparseIntSortedActivities = topologicalSortSparseGraph(sccs, sparseGraph);
+//        List<Integer> sparseIntSortedActivities = topologicalSortSparseGraph(sccs, sparseGraph);
+        List<Integer> sparseIntSortedActivities = topologicalParallelSortSparseGraph(sccs, sparseGraph);
         // reversing corrects rendering of the DSM
         // with sources as rows and targets as columns
         // was needed after AI solution was generated and iterated
@@ -155,7 +156,7 @@ private List<Integer> topologicalParallelSortSparseGraph(List<Set<Integer>> sccs
         ConcurrentLinkedQueue<Integer> sortedActivities = new ConcurrentLinkedQueue<>();
         Set<Integer> visited = new ConcurrentSkipListSet<>();
 
-        sccs.stream()
+        sccs.parallelStream()
                 .flatMap(Set::parallelStream)
                 .filter(activity -> !visited.contains(activity))
                 .forEach(activity -> topologicalSortUtilSparseGraph(activity, visited, sortedActivities, graph));
@@ -169,11 +170,9 @@ private void topologicalSortUtilSparseGraph(
             Integer activity, Set<Integer> visited, ConcurrentLinkedQueue<Integer> sortedActivities, Graph<Integer, Integer> graph) {
         visited.add(activity);
 
-        for (Integer neighbor : Graphs.successorListOf(graph, activity)) {
-            if (!visited.contains(neighbor)) {
-                topologicalSortUtilSparseGraph(neighbor, visited, sortedActivities, graph);
-            }
-        }
+        Graphs.successorListOf(graph, activity).parallelStream()
+                .filter(neighbor -> !visited.contains(neighbor))
+                .forEach(neighbor -> topologicalSortUtilSparseGraph(neighbor, visited, sortedActivities, graph));
 
         sortedActivities.add(activity);
     }

pom.xml

@@ -390,7 +390,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.30.0</version>
+                <version>2.44.5</version>
                 <configuration>
                     <formats>
                         <!-- you can define as many formats as you want, each is independent -->

report/src/main/java/org/hjug/refactorfirst/report/SimpleHtmlReport.java

@@ -215,10 +215,10 @@ public StringBuilder generateReport(
         edgesAboveDiagonal = dsm.getEdgesAboveDiagonal();
 
         log.info("Performing edge removal what-if analysis");
-        List<EdgeToRemoveInfo> edgeToRemoveInfos = dsm.getImpactOfSparseEdgesAboveDiagonalIfRemoved();
+//        List<EdgeToRemoveInfo> edgeToRemoveInfos = dsm.getImpactOfSparseEdgesAboveDiagonalIfRemoved();
 
-        if (edgeToRemoveInfos.isEmpty()
-                && rankedGodClassDisharmonies.isEmpty()
+        if (/*edgeToRemoveInfos.isEmpty()
+                &&*/ rankedGodClassDisharmonies.isEmpty()
                 && rankedCBODisharmonies.isEmpty()
                 && rankedCycles.isEmpty()) {
             stringBuilder
@@ -232,10 +232,10 @@ public StringBuilder generateReport(
             return stringBuilder;
         }
 
-        if (!edgeToRemoveInfos.isEmpty()) {
-            stringBuilder.append("<a href=\"#EDGES\">Back Edges</a>\n");
-            stringBuilder.append("<br/>\n");
-        }
+//        if (!edgeToRemoveInfos.isEmpty()) {
+//            stringBuilder.append("<a href=\"#EDGES\">Back Edges</a>\n");
+//            stringBuilder.append("<br/>\n");
+//        }
 
         if (!rankedGodClassDisharmonies.isEmpty()) {
             stringBuilder.append("<a href=\"#GOD\">God Classes</a>\n");
@@ -259,13 +259,13 @@ public StringBuilder generateReport(
 
         // Display impact of each edge if removed
         stringBuilder.append("<br/>\n");
-        String edgeInfos = renderEdgeToRemoveInfos(edgeToRemoveInfos);
-
-        if (!edgeToRemoveInfos.isEmpty()) {
-            stringBuilder.append(edgeInfos);
-            stringBuilder.append(renderGithubButtons());
-            stringBuilder.append("<br/>\n" + "<br/>\n" + "<br/>\n" + "<br/>\n" + "<hr/>\n" + "<br/>\n" + "<br/>\n");
-        }
+//        String edgeInfos = renderEdgeToRemoveInfos(edgeToRemoveInfos);
+//
+//        if (!edgeToRemoveInfos.isEmpty()) {
+//            stringBuilder.append(edgeInfos);
+//            stringBuilder.append(renderGithubButtons());
+//            stringBuilder.append("<br/>\n" + "<br/>\n" + "<br/>\n" + "<br/>\n" + "<hr/>\n" + "<br/>\n" + "<br/>\n");
+//        }
 
         if (!rankedGodClassDisharmonies.isEmpty()) {
             final String[] godClassTableHeadings =