From 871aa556ba99010dada318cc18fe3212a654d482 Mon Sep 17 00:00:00 2001
From: WrinklyNinja <wrinklyninja1@gmail.com>
Date: Sat, 21 Sep 2013 17:21:10 +0100
Subject: [PATCH] Priority edges are now calculated after all but overlap
 edges.

---
 src/backend/graph.cpp | 18 +++++++++++++-----
 src/backend/graph.h   |  4 +++-
 src/gui/main.cpp      |  5 ++++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/backend/graph.cpp b/src/backend/graph.cpp
index ceb8d7c1..98d702ba 100644
--- a/src/backend/graph.cpp
+++ b/src/backend/graph.cpp
@@ -121,13 +121,13 @@ namespace boss {
         boost::depth_first_search(graph, visitor(vis).vertex_index_map(v_index_map));
     }
 
-    void AddNonOverlapEdges(PluginGraph& graph) {
-        //Add edges for all relationships that aren't overlaps.
+    void AddSpecificEdges(PluginGraph& graph) {
+        //Add edges for all relationships that aren't overlaps or priority differences.
         boss::vertex_it vit, vitend;
         for (boost::tie(vit, vitend) = boost::vertices(graph); vit != vitend; ++vit) {
             vertex_t parentVertex;
 
-            BOOST_LOG_TRIVIAL(trace) << "Adding non-overlap edges to vertex for \"" << graph[*vit].Name() << "\".";
+            BOOST_LOG_TRIVIAL(trace) << "Adding specific edges to vertex for \"" << graph[*vit].Name() << "\".";
 
             BOOST_LOG_TRIVIAL(trace) << "Adding edges for master flag differences.";
 
@@ -191,9 +191,17 @@ namespace boss {
                     boost::add_edge(parentVertex, *vit, graph);
                 }
             }
+        }
+    }
 
-            BOOST_LOG_TRIVIAL(trace) << "Adding edges for priority differences.";
-            vit2 = vit;
+    void AddPriorityEdges(PluginGraph& graph) {
+        boss::vertex_it vit, vitend;
+
+        for (boost::tie(vit, vitend) = boost::vertices(graph); vit != vitend; ++vit) {
+            vertex_t parentVertex;
+
+            BOOST_LOG_TRIVIAL(trace) << "Adding priority difference edges to vertex for \"" << graph[*vit].Name() << "\".";
+            boss::vertex_it vit2 = vit;
             ++vit2;
             for (vit2,vitend; vit2 != vitend; ++vit2) {
                 BOOST_LOG_TRIVIAL(trace) << "Checking for priority difference between \"" << graph[*vit].Name() << "\" and \"" << graph[*vit2].Name() << "\".";
diff --git a/src/backend/graph.h b/src/backend/graph.h
index 1750bc22..09dea24f 100644
--- a/src/backend/graph.h
+++ b/src/backend/graph.h
@@ -55,7 +55,9 @@ namespace boss {
 
     void CheckForCycles(const PluginGraph& graph);
 
-    void AddNonOverlapEdges(PluginGraph& graph);
+    void AddSpecificEdges(PluginGraph& graph);
+
+    void AddPriorityEdges(PluginGraph& graph);
 
     void AddOverlapEdges(PluginGraph& graph);
 
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index d0f1fba3..a50f4083 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -628,7 +628,10 @@ void Launcher::OnSortPlugins(wxCommandEvent& event) {
 
     //Now add the interactions between plugins to the graph as edges.
     BOOST_LOG_TRIVIAL(trace) << "Adding non-overlap edges.";
-    AddNonOverlapEdges(graph);
+    AddSpecificEdges(graph);
+
+    BOOST_LOG_TRIVIAL(trace) << "Adding priority edges.";
+    AddPriorityEdges(graph);
 
     BOOST_LOG_TRIVIAL(trace) << "Adding overlap edges.";
     AddOverlapEdges(graph);