From 0892c9e1a0863afd762034e66e265d03dedf7773 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 22 Aug 2020 10:07:04 -0700
Subject: [PATCH] dismbiguate lib/sfdpgen/*.c #includes

Related to #1242 and #1785.
---
 lib/sfdpgen/CMakeLists.txt      | 29 +++++++++++++++--------------
 lib/sfdpgen/Makefile.am         |  1 +
 lib/sfdpgen/Multilevel.c        | 12 ++++++------
 lib/sfdpgen/PriorityQueue.c     | 12 ++++++------
 lib/sfdpgen/layout_similarity.c |  6 +++---
 lib/sfdpgen/post_process.c      | 20 ++++++++++----------
 lib/sfdpgen/sfdp.vcxproj        |  4 ++--
 lib/sfdpgen/sfdpinit.c          | 18 +++++++++---------
 lib/sfdpgen/sparse_solve.c      | 16 ++++++++--------
 lib/sfdpgen/spring_electrical.c | 24 ++++++++++++------------
 lib/sfdpgen/stress_model.c      | 14 +++++++-------
 lib/sfdpgen/uniform_stress.c    | 12 ++++++------
 12 files changed, 85 insertions(+), 83 deletions(-)

diff --git a/lib/sfdpgen/CMakeLists.txt b/lib/sfdpgen/CMakeLists.txt
index 73e6a0ff6..2076884e3 100644
--- a/lib/sfdpgen/CMakeLists.txt
+++ b/lib/sfdpgen/CMakeLists.txt
@@ -1,18 +1,5 @@
 if (with_sfdp)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-    ${GRAPHVIZ_LIB_DIR}/common
-    ${GRAPHVIZ_LIB_DIR}/gvc
-    ${GRAPHVIZ_LIB_DIR}/neatogen
-    ${GRAPHVIZ_LIB_DIR}/pack
-    ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${GRAPHVIZ_LIB_DIR}/rbtree
-    ${GRAPHVIZ_LIB_DIR}/sparse
-)
-
 add_library(sfdpgen STATIC
     # Header files
     Multilevel.h
@@ -36,4 +23,18 @@ add_library(sfdpgen STATIC
     uniform_stress.c
 )
 
-endif (with_sfdp)
\ No newline at end of file
+target_include_directories(sfdpgen PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${GRAPHVIZ_LIB_DIR}/cdt
+    ${GRAPHVIZ_LIB_DIR}/cgraph
+    ${GRAPHVIZ_LIB_DIR}/common
+    ${GRAPHVIZ_LIB_DIR}/gvc
+    ${GRAPHVIZ_LIB_DIR}/neatogen
+    ${GRAPHVIZ_LIB_DIR}/pack
+    ${GRAPHVIZ_LIB_DIR}/pathplan
+    ${GRAPHVIZ_LIB_DIR}/rbtree
+    ${GRAPHVIZ_LIB_DIR}/sparse
+)
+
+endif (with_sfdp)
diff --git a/lib/sfdpgen/Makefile.am b/lib/sfdpgen/Makefile.am
index c8368531d..5ddf95887 100644
--- a/lib/sfdpgen/Makefile.am
+++ b/lib/sfdpgen/Makefile.am
@@ -2,6 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
         -I$(top_srcdir)/lib/common \
 	-I$(top_srcdir)/lib/gvc \
 	-I$(top_srcdir)/lib/neatogen \
diff --git a/lib/sfdpgen/Multilevel.c b/lib/sfdpgen/Multilevel.c
index 16597b46f..06bf3f604 100644
--- a/lib/sfdpgen/Multilevel.c
+++ b/lib/sfdpgen/Multilevel.c
@@ -11,12 +11,12 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "Multilevel.h"
-#include "PriorityQueue.h"
-#include "memory.h"
-#include "logic.h"
-#include "assert.h"
-#include "arith.h"
+#include <sfdpgen/Multilevel.h>
+#include <sfdpgen/PriorityQueue.h>
+#include <common/memory.h>
+#include <common/logic.h>
+#include <assert.h>
+#include <common/arith.h>
 
 
 Multilevel_control Multilevel_control_new(int scheme, int mode){
diff --git a/lib/sfdpgen/PriorityQueue.c b/lib/sfdpgen/PriorityQueue.c
index 5ff20af8c..41a356ca0 100644
--- a/lib/sfdpgen/PriorityQueue.c
+++ b/lib/sfdpgen/PriorityQueue.c
@@ -11,12 +11,12 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "LinkedList.h"
-#include "PriorityQueue.h"
-#include "memory.h"
-#include "logic.h"
-#include "assert.h"
-#include "arith.h"
+#include <sparse/LinkedList.h>
+#include <sfdpgen/PriorityQueue.h>
+#include <common/memory.h>
+#include <common/logic.h>
+#include <assert.h>
+#include <common/arith.h>
 
 PriorityQueue PriorityQueue_new(int n, int ngain){
   PriorityQueue q;
diff --git a/lib/sfdpgen/layout_similarity.c b/lib/sfdpgen/layout_similarity.c
index d708ca6bc..1e9fbe8d4 100644
--- a/lib/sfdpgen/layout_similarity.c
+++ b/lib/sfdpgen/layout_similarity.c
@@ -2,9 +2,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include "general.h"
-#include "SparseMatrix.h"
-#include "call_tri.h"
+#include <common/general.h>
+#include <sparse/SparseMatrix.h>
+#include <neatogen/call_tri.h>
 
 static double boundingbox_area(int n, double *x){
   double xmax, xmin, ymax, ymin;
diff --git a/lib/sfdpgen/post_process.c b/lib/sfdpgen/post_process.c
index 4e6669cc2..33b54f007 100644
--- a/lib/sfdpgen/post_process.c
+++ b/lib/sfdpgen/post_process.c
@@ -18,16 +18,16 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include "types.h"
-#include "memory.h"
-#include "globals.h"
-
-#include "sparse_solve.h"
-#include "post_process.h"
-#include "overlap.h"
-#include "spring_electrical.h"
-#include "call_tri.h"
-#include "sfdpinternal.h"
+#include <common/types.h>
+#include <common/memory.h>
+#include <common/globals.h>
+
+#include <sfdpgen/sparse_solve.h>
+#include <sfdpgen/post_process.h>
+#include <neatogen/overlap.h>
+#include <sfdpgen/spring_electrical.h>
+#include <neatogen/call_tri.h>
+#include <sfdpgen/sfdpinternal.h>
 
 #define node_degree(i) (ia[(i)+1] - ia[(i)])
 
diff --git a/lib/sfdpgen/sfdp.vcxproj b/lib/sfdpgen/sfdp.vcxproj
index edc184147..037765a8e 100644
--- a/lib/sfdpgen/sfdp.vcxproj
+++ b/lib/sfdpgen/sfdp.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -66,7 +66,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
diff --git a/lib/sfdpgen/sfdpinit.c b/lib/sfdpgen/sfdpinit.c
index f509c3b1b..94db5c95d 100644
--- a/lib/sfdpgen/sfdpinit.c
+++ b/lib/sfdpgen/sfdpinit.c
@@ -14,17 +14,17 @@
 
 #include "config.h"
 #include <limits.h>
-#include <sfdp.h>
-#include <neato.h>
-#include <adjust.h>
-#include <pack.h>
+#include <sfdpgen/sfdp.h>
+#include <neatogen/neato.h>
+#include <neatogen/adjust.h>
+#include <pack/pack.h>
 #include <assert.h>
 #include <ctype.h>
-#include <spring_electrical.h>
-#include <overlap.h>
-#include <uniform_stress.h>
-#include <stress_model.h>
-#include "strcasecmp.h"
+#include <sfdpgen/spring_electrical.h>
+#include <neatogen/overlap.h>
+#include <sfdpgen/uniform_stress.h>
+#include <sfdpgen/stress_model.h>
+#include <cgraph/strcasecmp.h>
 
 static void sfdp_init_edge(edge_t * e)
 {
diff --git a/lib/sfdpgen/sparse_solve.c b/lib/sfdpgen/sparse_solve.c
index 1a81ab6ef..90ac8d117 100644
--- a/lib/sfdpgen/sparse_solve.c
+++ b/lib/sfdpgen/sparse_solve.c
@@ -13,14 +13,14 @@
 
 #include <assert.h>
 #include <string.h>
-#include "sparse_solve.h"
-#include "sfdpinternal.h"
-#include "memory.h"
-#include "logic.h"
-#include "math.h"
-#include "arith.h"
-#include "types.h"
-#include "globals.h"
+#include <sfdpgen/sparse_solve.h>
+#include <sfdpgen/sfdpinternal.h>
+#include <common/memory.h>
+#include <common/logic.h>
+#include <math.h>
+#include <common/arith.h>
+#include <common/types.h>
+#include <common/globals.h>
 
 /* #define DEBUG_PRINT */
 
diff --git a/lib/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c
index e44bc684d..2ca62fc3d 100644
--- a/lib/sfdpgen/spring_electrical.c
+++ b/lib/sfdpgen/spring_electrical.c
@@ -13,18 +13,18 @@
 
 #include "config.h"
 
-#include "SparseMatrix.h"
-#include "spring_electrical.h"
-#include "QuadTree.h"
-#include "Multilevel.h"
-#include "post_process.h"
-#include "overlap.h"
-#include "types.h"
-#include "memory.h"
-#include "arith.h"
-#include "logic.h"
-#include "math.h"
-#include "globals.h"
+#include <sparse/SparseMatrix.h>
+#include <sfdpgen/spring_electrical.h>
+#include <sparse/QuadTree.h>
+#include <sfdpgen/Multilevel.h>
+#include <sfdpgen/post_process.h>
+#include <neatogen/overlap.h>
+#include <common/types.h>
+#include <common/memory.h>
+#include <common/arith.h>
+#include <common/logic.h>
+#include <math.h>
+#include <common/globals.h>
 #include <string.h>
 #include <time.h>
 
diff --git a/lib/sfdpgen/stress_model.c b/lib/sfdpgen/stress_model.c
index f95bfb950..d8ae970b3 100644
--- a/lib/sfdpgen/stress_model.c
+++ b/lib/sfdpgen/stress_model.c
@@ -1,8 +1,8 @@
-#include "general.h"
-#include "SparseMatrix.h"
-#include "spring_electrical.h"
-#include "post_process.h"
-#include "stress_model.h"
+#include <sparse/general.h>
+#include <sparse/SparseMatrix.h>
+#include <sfdpgen/spring_electrical.h>
+#include <sfdpgen/post_process.h>
+#include <sfdpgen/stress_model.h>
 
 static void stress_model_core(int dim, SparseMatrix B, real **x, int edge_len_weighted, int maxit_sm, real tol, int *flag){
   int m;
@@ -58,8 +58,8 @@ static void stress_model_core(int dim, SparseMatrix B, real **x, int edge_len_we
 
 
 #ifdef GVIEWER
-#include "gviewer.h"
-#include "get_ps.h"
+#include <gviewer.h>
+#include <get_ps.h>
 struct stress_model_data {
   int dim;
   SparseMatrix D;
diff --git a/lib/sfdpgen/uniform_stress.c b/lib/sfdpgen/uniform_stress.c
index 20e6f9b39..02bf99766 100644
--- a/lib/sfdpgen/uniform_stress.c
+++ b/lib/sfdpgen/uniform_stress.c
@@ -11,14 +11,14 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "general.h"
+#include <sparse/general.h>
 #include <math.h>
-#include "SparseMatrix.h"
-#include "spring_electrical.h"
-#include "post_process.h"
-#include "sparse_solve.h"
+#include <sparse/SparseMatrix.h>
+#include <sfdpgen/spring_electrical.h>
+#include <sfdpgen/post_process.h>
+#include <sfdpgen/sparse_solve.h>
 #include <time.h>
-#include "uniform_stress.h"
+#include <sfdpgen/uniform_stress.h>
 
 /* uniform stress solves the model:
 
-- 
2.50.1