disambiguate lib/neatogen/*.c #includes

Related to #1785.

diff --git a/lib/neatogen/CMakeLists.txt b/lib/neatogen/CMakeLists.txt
index 7e1780d208c424e9ed17df84103ea0a7e3f3ba3c..5d4f032b7093d2c6271df27433a8d662dd7ab565 100644 (file)
--- a/lib/neatogen/CMakeLists.txt
+++ b/lib/neatogen/CMakeLists.txt
@@ -1,17 +1,3 @@
-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}/ortho
-    ${GRAPHVIZ_LIB_DIR}/pack
-    ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${GRAPHVIZ_LIB_DIR}/rbtree
-    ${GRAPHVIZ_LIB_DIR}/sfdpgen
-    ${GRAPHVIZ_LIB_DIR}/sparse
-)
-
 set(sources
     # Header files
     adjust.h
@@ -98,10 +84,25 @@ if (with_ipsepcola)
         mosek_quad_solve.h
         quad_prog_vpsc.c
     )
-    include_directories(${GRAPHVIZ_LIB_DIR}/vpsc)
+    target_include_directories(${GRAPHVIZ_LIB_DIR}/vpsc)
 endif (with_ipsepcola)
 
 
 add_library(neatogen STATIC
     ${sources}
 )
+
+target_include_directories(neatogen 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}/ortho
+    ${GRAPHVIZ_LIB_DIR}/pack
+    ${GRAPHVIZ_LIB_DIR}/pathplan
+    ${GRAPHVIZ_LIB_DIR}/rbtree
+    ${GRAPHVIZ_LIB_DIR}/sfdpgen
+    ${GRAPHVIZ_LIB_DIR}/sparse
+)

diff --git a/lib/neatogen/Makefile.am b/lib/neatogen/Makefile.am
index 97aac9fdb05b1a0c695bd585a648243412c84899..6c09d991add526685925f19e0df1c779fe64a128 100644 (file)
--- a/lib/neatogen/Makefile.am
+++ b/lib/neatogen/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/pack \

diff --git a/lib/neatogen/adjust.c b/lib/neatogen/adjust.c
index a42c24f735d3ec617001fdf2d1b3e4e07b3629eb..6734bc36c20470d10067fe3c1a3f212a3da5d787 100644 (file)
--- a/lib/neatogen/adjust.c
+++ b/lib/neatogen/adjust.c
@@ -16,25 +16,25 @@
  * order to reduce/remove node overlaps.
  */
 
-#include "neato.h"
-#include "agxbuf.h"
-#include "utils.h"
-#include "ctype.h"
-#include "voronoi.h"
-#include "info.h"
-#include "edges.h"
-#include "site.h"
-#include "heap.h"
-#include "hedges.h"
-#include "digcola.h"
+#include <neatogen/neato.h>
+#include <cgraph/agxbuf.h>
+#include <common/utils.h>
+#include <ctype.h>
+#include <neatogen/voronoi.h>
+#include <neatogen/info.h>
+#include <neatogen/edges.h>
+#include <neatogen/site.h>
+#include <neatogen/heap.h>
+#include <neatogen/hedges.h>
+#include <neatogen/digcola.h>
 #if ((defined(HAVE_GTS) || defined(HAVE_TRIANGLE)) && defined(SFDP))
-#include "overlap.h"
+#include <neatogen/overlap.h>
 #endif
 #ifdef IPSEPCOLA
-#include "csolve_VPSC.h"
-#include "quad_prog_vpsc.h"
+#include <vpsc/csolve_VPSC.h>
+#include <neatogen/quad_prog_vpsc.h>
 #endif
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 #define SEPFACT         0.8  /* default esep/sep */
 

diff --git a/lib/neatogen/bfs.c b/lib/neatogen/bfs.c
index 4ba1694792935b3517889739098543c18fa6adab..6b0a84a9240df297119ebf9b9825b57ed84aba74 100644 (file)
--- a/lib/neatogen/bfs.c
+++ b/lib/neatogen/bfs.c
@@ -20,7 +20,7 @@
 
 ******************************************/
 
-#include "bfs.h"
+#include <neatogen/bfs.h>
 #include <stdlib.h>
 /* #include <math.h> */
 

diff --git a/lib/neatogen/call_tri.c b/lib/neatogen/call_tri.c
index cf6605bf4ff7707a16c31c3be69dc436695e0073..611c5d244d838dbad65a92d34e65456561b532c0 100644 (file)
--- a/lib/neatogen/call_tri.c
+++ b/lib/neatogen/call_tri.c
@@ -13,10 +13,10 @@
 
 #include "config.h"
 
-#include "SparseMatrix.h"
-#include "logic.h"
-#include "memory.h"
-#include "delaunay.h"
+#include <sparse/SparseMatrix.h>
+#include <common/logic.h>
+#include <common/memory.h>
+#include <neatogen/delaunay.h>
 
 SparseMatrix call_tri(int n, int dim, real * x)
 {

diff --git a/lib/neatogen/circuit.c b/lib/neatogen/circuit.c
index d04fa058125a1ebbae09baf562c104511091bd4f..2df45fdcb71f4dde1d477cdc675d3ebf09e434c2 100644 (file)
--- a/lib/neatogen/circuit.c
+++ b/lib/neatogen/circuit.c
@@ -17,7 +17,7 @@
  * likely it could be improved by using edge weights, somehow.
  * Return 1 if successful; 0 otherwise (e.g., graph is disconnected).
  */
-#include       "neato.h"
+#include       <neatogen/neato.h>
 
 int solveCircuit(int nG, double **Gm, double **Gm_inv)
 {

diff --git a/lib/neatogen/closest.c b/lib/neatogen/closest.c
index 15516f4c210e3847d8591652eab135395257448d..e75a3113c0366d056d0cda63f5a61040a5379957 100644 (file)
--- a/lib/neatogen/closest.c
+++ b/lib/neatogen/closest.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 
-#include "kkutils.h"
-#include "closest.h"
+#include <neatogen/kkutils.h>
+#include <neatogen/closest.h>
 #include <stdlib.h>
 
 /*****************************************

diff --git a/lib/neatogen/compute_hierarchy.c b/lib/neatogen/compute_hierarchy.c
index 4f95289072907864922f47d0c36a7a75d3a1f00e..11d05b497ac4d3deaa4bf343f7f3f9145dd82d27 100644 (file)
--- a/lib/neatogen/compute_hierarchy.c
+++ b/lib/neatogen/compute_hierarchy.c
@@ -11,9 +11,9 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include <digcola.h>
+#include <neatogen/digcola.h>
 #ifdef DIGCOLA
-#include "kkutils.h"
+#include <neatogen/kkutils.h>
 
 static int *given_levels = NULL;
 /*

diff --git a/lib/neatogen/conjgrad.c b/lib/neatogen/conjgrad.c
index b90f0a4098c90f82904f6555dafff4a25f68e1e0..c1918e60be9fc87866e401272c6389f5ccc9b847 100644 (file)
--- a/lib/neatogen/conjgrad.c
+++ b/lib/neatogen/conjgrad.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 
-#include "matrix_ops.h"
-#include "conjgrad.h"
+#include <neatogen/matrix_ops.h>
+#include <neatogen/conjgrad.h>
 /* #include <math.h> */
 #include <stdlib.h>
 

diff --git a/lib/neatogen/constrained_majorization.c b/lib/neatogen/constrained_majorization.c
index b5802bd1696d04a2693d7d6a543834b4703cfba9..cc56339088139dda4ddf80cff9ea08dcf2a8b4ee 100644 (file)
--- a/lib/neatogen/constrained_majorization.c
+++ b/lib/neatogen/constrained_majorization.c
@@ -11,21 +11,21 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #ifdef DIGCOLA
 #include <math.h>
 #include <stdlib.h>
 #include <time.h>
 #include <stdio.h>
 #include <float.h>
-#include "stress.h"
-#include "dijkstra.h"
-#include "bfs.h"
-#include "matrix_ops.h"
-#include "kkutils.h"
-#include "conjgrad.h"
-#include "quad_prog_solver.h"
-#include "matrix_ops.h"
+#include <neatogen/stress.h>
+#include <neatogen/dijkstra.h>
+#include <neatogen/bfs.h>
+#include <neatogen/matrix_ops.h>
+#include <neatogen/kkutils.h>
+#include <neatogen/conjgrad.h>
+#include <neatogen/quad_prog_solver.h>
+#include <neatogen/matrix_ops.h>
 
 #define localConstrMajorIterations 15
 #define levels_sep_tol 1e-1

diff --git a/lib/neatogen/constrained_majorization_ipsep.c b/lib/neatogen/constrained_majorization_ipsep.c
index cd054025161a0c3c55376505a465f9e29fedb9d0..c10d68e6cc5fb3d689e551909452c276046c6fcd 100644 (file)
--- a/lib/neatogen/constrained_majorization_ipsep.c
+++ b/lib/neatogen/constrained_majorization_ipsep.c
@@ -34,23 +34,23 @@
  * Tim Dwyer, 2006
  **********************************************************/
 
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #ifdef IPSEPCOLA
 #include <math.h>
 #include <stdlib.h>
 #include <time.h>
 #include <stdio.h>
 #include <float.h>
-#include "stress.h"
-#include "dijkstra.h"
-#include "bfs.h"
-#include "matrix_ops.h"
-#include "kkutils.h"
-#include "conjgrad.h"
-#include <csolve_VPSC.h>
-#include "quad_prog_vpsc.h"
-#include "quad_prog_solver.h"
-#include "matrix_ops.h"
+#include <neatogen/stress.h>
+#include <neatogen/dijkstra.h>
+#include <neatogen/bfs.h>
+#include <neatogen/matrix_ops.h>
+#include <neatogen/kkutils.h>
+#include <neatogen/conjgrad.h>
+#include <vpsc/csolve_VPSC.h>
+#include <neatogen/quad_prog_vpsc.h>
+#include <neatogen/quad_prog_solver.h>
+#include <neatogen/matrix_ops.h>
 
 #define localConstrMajorIterations 1000
 

diff --git a/lib/neatogen/constraint.c b/lib/neatogen/constraint.c
index 87873f31b480ea0863f59939a588b5cf8a8a7583..01f8893f0558ef4356a1442c27341077d180fa30 100644 (file)
--- a/lib/neatogen/constraint.c
+++ b/lib/neatogen/constraint.c
@@ -14,8 +14,8 @@
 
 #include "config.h"
 
-#include "neato.h"
-#include "adjust.h"
+#include <neatogen/neato.h>
+#include <neatogen/adjust.h>
 
 /* For precision, scale up before algorithms, then scale down */
 #define SCALE 10   

diff --git a/lib/neatogen/delaunay.c b/lib/neatogen/delaunay.c
index ab39c09ea78200f34989a545dc96a946f0cc020e..aa0c334aeb959e4448846fde74f9b2f8c3e47402 100644 (file)
--- a/lib/neatogen/delaunay.c
+++ b/lib/neatogen/delaunay.c
@@ -17,10 +17,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "cgraph.h"     /* for agerr() and friends */
-#include "delaunay.h"
-#include "memory.h"
-#include "logic.h"
+#include <cgraph/cgraph.h>     /* for agerr() and friends */
+#include <neatogen/delaunay.h>
+#include <common/memory.h>
+#include <common/logic.h>
 
 #if HAVE_GTS
 #include <gts.h>
@@ -540,9 +540,9 @@ freeSurface (surface_t* s)
 }
 #elif HAVE_TRIANGLE
 #define TRILIBRARY
-#include "triangle.c"
-#include "assert.h"
-#include "general.h"
+#include <triangle.c>
+#include <assert.h>
+#include <sparse/general.h>
 
 int*
 get_triangles (double *x, int n, int* tris)

diff --git a/lib/neatogen/dijkstra.c b/lib/neatogen/dijkstra.c
index 0fec6482a8db5e2c70d17ecb7af5b98492e82b82..f5c3c190964153d405d0e487977aa9e661d15fb4 100644 (file)
--- a/lib/neatogen/dijkstra.c
+++ b/lib/neatogen/dijkstra.c
@@ -21,8 +21,8 @@
 ******************************************/
 
 
-#include "bfs.h"
-#include "dijkstra.h"
+#include <neatogen/bfs.h>
+#include <neatogen/dijkstra.h>
 #include <limits.h>
 #include <stdlib.h>
 /* #include <math.h> */

diff --git a/lib/neatogen/edges.c b/lib/neatogen/edges.c
index 168ad5a3b1787720ff42a8ece709b4dd4725f3eb..c3bb89ea73db96491daf2267b3309160ac530b7a 100644 (file)
--- a/lib/neatogen/edges.c
+++ b/lib/neatogen/edges.c
@@ -11,10 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "neato.h"
-#include "mem.h"
-#include "info.h"
-#include "edges.h"
+#include <neatogen/neato.h>
+#include <neatogen/mem.h>
+#include <neatogen/info.h>
+#include <neatogen/edges.h>
 #include <math.h>
 
 

diff --git a/lib/neatogen/embed_graph.c b/lib/neatogen/embed_graph.c
index d6ffe731860d541f3b4b19ae5414fea0ecbe73ef..91f002ae1f7daa2e8fbac986b82c1445198f3082 100644 (file)
--- a/lib/neatogen/embed_graph.c
+++ b/lib/neatogen/embed_graph.c
@@ -20,10 +20,10 @@
 ************************************************/
 
 
-#include "dijkstra.h"
-#include "bfs.h"
-#include "kkutils.h"
-#include "embed_graph.h"
+#include <neatogen/dijkstra.h>
+#include <neatogen/bfs.h>
+#include <neatogen/kkutils.h>
+#include <neatogen/embed_graph.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>

diff --git a/lib/neatogen/geometry.c b/lib/neatogen/geometry.c
index 8760b2f45043f9db2a02c2dff4791609d35279f3..916e936d3773117c9a2bab99ace9bd83b71b5c3c 100644 (file)
--- a/lib/neatogen/geometry.c
+++ b/lib/neatogen/geometry.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "geometry.h"
+#include <neatogen/geometry.h>
 #include <math.h>
 
 

diff --git a/lib/neatogen/gvneatogen.vcxproj b/lib/neatogen/gvneatogen.vcxproj
index c661481280dff2ea5135a992b249c47aaf827bd2..da174636c61f7c9d8b947754acf1a4de3794f137 100644 (file)
--- a/lib/neatogen/gvneatogen.vcxproj
+++ b/lib/neatogen/gvneatogen.vcxproj
@@ -52,7 +52,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\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\ortho;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\ortho;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -71,7 +71,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\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\ortho;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\ortho;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/neatogen/heap.c b/lib/neatogen/heap.c
index f101fc9bab2ff9a15dabdb4df08ef0332e69f7d8..66c6448332ac9371eed61005492dcc304735e63d 100644 (file)
--- a/lib/neatogen/heap.c
+++ b/lib/neatogen/heap.c
@@ -12,12 +12,12 @@
  *************************************************************************/
 
 
-#include "render.h"
+#include <common/render.h>
 #include <stdio.h>
 
-#include "mem.h"
-#include "hedges.h"
-#include "heap.h"
+#include <neatogen/mem.h>
+#include <neatogen/hedges.h>
+#include <neatogen/heap.h>
 
 
 static Halfedge *PQhash;

diff --git a/lib/neatogen/hedges.c b/lib/neatogen/hedges.c
index 3e205c49f7c5f0e2d70ac817136f038662ad27ef..7af3299cd3ed7ae2dbed164c4465a2c146a88638 100644 (file)
--- a/lib/neatogen/hedges.c
+++ b/lib/neatogen/hedges.c
@@ -11,9 +11,9 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "mem.h"
-#include "hedges.h"
-#include "render.h"
+#include <neatogen/mem.h>
+#include <neatogen/hedges.h>
+#include <common/render.h>
 
 
 #define DELETED -2

diff --git a/lib/neatogen/info.c b/lib/neatogen/info.c
index c7b38e3a9ea0a18d6ba3f9e52d8004496db2ba02..d414cb3bdac9d1009ab6e35cd7f9cf4b6daf3714 100644 (file)
--- a/lib/neatogen/info.c
+++ b/lib/neatogen/info.c
@@ -11,10 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "neato.h"
+#include <neatogen/neato.h>
 #include <stdio.h>
-#include "mem.h"
-#include "info.h"
+#include <neatogen/mem.h>
+#include <neatogen/info.h>
 
 
 Info_t *nodeInfo;              /* Array of node info */

diff --git a/lib/neatogen/kkutils.c b/lib/neatogen/kkutils.c
index 0c9f07abe8f7aaaad62c81fba8f5c3c674e3c0ed..164d28f66ef5509053e596b09546febcdc86f42f 100644 (file)
--- a/lib/neatogen/kkutils.c
+++ b/lib/neatogen/kkutils.c
@@ -12,9 +12,9 @@
  *************************************************************************/
 
 
-#include "bfs.h"
-#include "dijkstra.h"
-#include "kkutils.h"
+#include <neatogen/bfs.h>
+#include <neatogen/dijkstra.h>
+#include <neatogen/kkutils.h>
 #include <stdlib.h>
 #include <math.h>
 

diff --git a/lib/neatogen/legal.c b/lib/neatogen/legal.c
index 58d85e4413018cb0200ffac25470a65625975b76..6f48c73851e11a70e67edac2a0692fdd0f224e7a 100644 (file)
--- a/lib/neatogen/legal.c
+++ b/lib/neatogen/legal.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 #include <math.h>
-#include "neato.h"
-#include "pathutil.h"
+#include <neatogen/neato.h>
+#include <pathplan/pathutil.h>
 #include <setjmp.h>
 
 static jmp_buf jbuf;

diff --git a/lib/neatogen/lu.c b/lib/neatogen/lu.c
index aaebf736d60fd83fcdcdcbfb6167a8e0d520e602..c993f480dca1de1cdd0b7e16e8b9586dc1af99ef 100644 (file)
--- a/lib/neatogen/lu.c
+++ b/lib/neatogen/lu.c
@@ -46,7 +46,7 @@
  */
 
 #include <math.h>
-#include <neato.h>
+#include <neatogen/neato.h>
 
 static double *scales;
 static double **lu;

diff --git a/lib/neatogen/matinv.c b/lib/neatogen/matinv.c
index a2ab1372e027b40d527dfd021de95ee22ade8e6d..0f297c38c6eff441e8b2f766577f065d113eefc4 100644 (file)
--- a/lib/neatogen/matinv.c
+++ b/lib/neatogen/matinv.c
@@ -35,7 +35,7 @@
  */
 
 #include <stdlib.h>
-#include "render.h"
+#include <common/render.h>
 extern int lu_decompose(double **a, int n);
 extern void lu_solve(double *x, double *b, int n);
 

diff --git a/lib/neatogen/matrix_ops.c b/lib/neatogen/matrix_ops.c
index cc0531e743e3f0e076c96af06bb745daa16a572c..c5c6262774718bb15b2bccc17f7738d983c58d60 100644 (file)
--- a/lib/neatogen/matrix_ops.c
+++ b/lib/neatogen/matrix_ops.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 
-#include "matrix_ops.h"
-#include "memory.h"
+#include <neatogen/matrix_ops.h>
+#include <common/memory.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>

diff --git a/lib/neatogen/memory.c b/lib/neatogen/memory.c
index 5d5c4c19bd2fb395c5594c8f85ef8b0400ccd870..1fb993787ce63950d228b68b7f816030a6b5e943 100644 (file)
--- a/lib/neatogen/memory.c
+++ b/lib/neatogen/memory.c
@@ -11,8 +11,8 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "geometry.h"
-#include "render.h"
+#include <neatogen/geometry.h>
+#include <common/render.h>
 
 typedef struct freenode {
     struct freenode *nextfree;
@@ -23,7 +23,7 @@ typedef struct freeblock {
     struct freenode *nodes;
 } Freeblock;
 
-#include "mem.h"
+#include <neatogen/mem.h>
 #include <stdlib.h>
 #include <stdio.h>
 

diff --git a/lib/neatogen/mosek_quad_solve.c b/lib/neatogen/mosek_quad_solve.c
index 84bc51ed9221d400b082a4e1787b2863c7ca0ced..e4c8ca9b2b18a80256f75b208d421c18a27f9aff 100644 (file)
--- a/lib/neatogen/mosek_quad_solve.c
+++ b/lib/neatogen/mosek_quad_solve.c
@@ -26,9 +26,9 @@
 #ifdef MOSEK
 #include <stdio.h>
 #include <assert.h>
-#include "defs.h"
-#include "mosek_quad_solve.h"
-#include "quad_prog_vpsc.h"
+#include <neatogen/defs.h>
+#include <neatogen/mosek_quad_solve.h>
+#include <neatogen/quad_prog_vpsc.h>
 
 /* #define DUMP_CONSTRAINTS */
 /* #define EQUAL_WIDTH_LEVELS */

diff --git a/lib/neatogen/multispline.c b/lib/neatogen/multispline.c
index 702e473ae6822e2b84873fdf9e6893cac9ae0d5a..df752100eb8b6b74fe10d66a08f9e8c6e8741cdc 100644 (file)
--- a/lib/neatogen/multispline.c
+++ b/lib/neatogen/multispline.c
@@ -11,9 +11,9 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include <multispline.h>
-#include <delaunay.h>
-#include <neatoprocs.h>
+#include <neatogen/multispline.h>
+#include <neatogen/delaunay.h>
+#include <neatogen/neatoprocs.h>
 #include <math.h>
 
 
@@ -1262,7 +1262,7 @@ static void resetGraph(tgraph * g, int ncnt, int ecnt)
 #define PQVTYPE float
 
 #define PQ_TYPES
-#include "fPQ.h"
+#include <neatogen/fPQ.h>
 #undef PQ_TYPES
 
 typedef struct {
@@ -1275,7 +1275,7 @@ typedef struct {
 #define N_IDX(pq,n) ((PPQ*)pq)->idxs[n]
 
 #define PQ_CODE
-#include "fPQ.h"
+#include <neatogen/fPQ.h>
 #undef PQ_CODE
 
 #define N_DAD(n) dad[n]

diff --git a/lib/neatogen/neatoinit.c b/lib/neatogen/neatoinit.c
index 5e1b03f49fc08c333b9af3b0dc44f7c12a32d25b..24720b88e6524d7210647462167093196ae54aad 100644 (file)
--- a/lib/neatogen/neatoinit.c
+++ b/lib/neatogen/neatoinit.c
@@ -20,16 +20,16 @@
 #endif
 #include <ctype.h>
 
-#include "neato.h"
-#include "pack.h"
-#include "stress.h"
+#include <neatogen/neato.h>
+#include <pack/pack.h>
+#include <neatogen/stress.h>
 #ifdef DIGCOLA
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #endif
-#include "kkutils.h"
-#include "pointset.h"
-#include "sgd.h"
-#include "strcasecmp.h"
+#include <neatogen/kkutils.h>
+#include <common/pointset.h>
+#include <neatogen/sgd.h>
+#include <cgraph/strcasecmp.h>
 
 #ifndef HAVE_SRAND48
 #define srand48 srand

diff --git a/lib/neatogen/neatosplines.c b/lib/neatogen/neatosplines.c
index cf6716d0cc9411addc7ed8ecc28b7a982f363503..62ff5859d7186e222fce49de103ab827d3158d98 100644 (file)
--- a/lib/neatogen/neatosplines.c
+++ b/lib/neatogen/neatosplines.c
@@ -14,17 +14,17 @@
 
 #include "config.h"
 
-#include "neato.h"
-#include "adjust.h"
-#include "pathplan.h"
-#include "vispath.h"
-#include "multispline.h"
+#include <neatogen/neato.h>
+#include <neatogen/adjust.h>
+#include <pathplan/pathplan.h>
+#include <pathplan/vispath.h>
+#include <neatogen/multispline.h>
 #ifndef HAVE_DRAND48
 extern double drand48(void);
 #endif
 
 #ifdef ORTHO
-#include <ortho.h>
+#include <ortho/ortho.h>
 #endif
 
 extern int in_poly(Ppoly_t argpoly, Ppoint_t q);

diff --git a/lib/neatogen/opt_arrangement.c b/lib/neatogen/opt_arrangement.c
index 54ff4c1df80888cb3f6149b2b0176cb2fb870b78..2d0b274a310a5c4a3bdebcb1f5fae63e080b955c 100644 (file)
--- a/lib/neatogen/opt_arrangement.c
+++ b/lib/neatogen/opt_arrangement.c
@@ -11,10 +11,10 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #ifdef DIGCOLA
-#include "matrix_ops.h"
-#include "conjgrad.h"
+#include <neatogen/matrix_ops.h>
+#include <neatogen/conjgrad.h>
 
 static void construct_b(vtx_data * graph, int n, double *b)
 {

diff --git a/lib/neatogen/overlap.c b/lib/neatogen/overlap.c
index a6a10c4d38aeabe5647ddcbaead36d308baf2fb0..6b58e7a36df0e6c77188fbfe529b20cbb7c205c4 100644 (file)
--- a/lib/neatogen/overlap.c
+++ b/lib/neatogen/overlap.c
@@ -12,17 +12,17 @@
  *************************************************************************/
 
 #include "config.h"
-#include "overlap.h"
+#include <neatogen/overlap.h>
 
 #if ((defined(HAVE_GTS) || defined(HAVE_TRIANGLE)) && defined(SFDP))
 
-#include "SparseMatrix.h"
-#include "call_tri.h"
-#include "red_black_tree.h"
-#include "types.h"
+#include <sparse/SparseMatrix.h>
+#include <neatogen/call_tri.h>
+#include <rbtree/red_black_tree.h>
+#include <common/types.h>
 #include <math.h>
-#include "memory.h"
-#include "globals.h"
+#include <common/memory.h>
+#include <common/globals.h>
 #include <time.h>
 
 static void ideal_distance_avoid_overlap(int dim, SparseMatrix A, real *x, real *width, real *ideal_distance, real *tmax, real *tmin){
@@ -680,8 +680,8 @@ void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntr
 }
 
 #else
-#include "types.h"
-#include "SparseMatrix.h"
+#include <common/types.h>
+#include <sparse/SparseMatrix.h>
 void remove_overlap(int dim, SparseMatrix A, real *x, real *label_sizes, int ntry, real initial_scaling,
                    int edge_labeling_scheme, int n_constr_nodes, int *constr_nodes, SparseMatrix A_constr, int do_shrinking, int *flag)
 {

diff --git a/lib/neatogen/pca.c b/lib/neatogen/pca.c
index 4fa7eb0fcd0e21ed92a92341a7537c6e4808fea7..b863a7789dcf26e2742e271409abab629a1e1844 100644 (file)
--- a/lib/neatogen/pca.c
+++ b/lib/neatogen/pca.c
@@ -12,9 +12,9 @@
  *************************************************************************/
 
 
-#include "matrix_ops.h"
-#include "pca.h"
-#include "closest.h"
+#include <neatogen/matrix_ops.h>
+#include <neatogen/pca.h>
+#include <neatogen/closest.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>

diff --git a/lib/neatogen/poly.c b/lib/neatogen/poly.c
index 686182675d6c9da9548934ef965ec6fc90ac2a7a..a31965ef8a51cc586b3a3fab208a3e70c9e5c75b 100644 (file)
--- a/lib/neatogen/poly.c
+++ b/lib/neatogen/poly.c
@@ -14,13 +14,13 @@
 /* poly.c
  */
 
-#include "neato.h"
+#include <neatogen/neato.h>
 #include <assert.h>
 #include <string.h>
 #include <math.h>
-#include "poly.h"
-#include "geom.h"
-#include "mem.h"
+#include <neatogen/poly.h>
+#include <common/geom.h>
+#include <neatogen/mem.h>
 
 #define BOX 1
 #define ISBOX(p) ((p)->kind & BOX)

diff --git a/lib/neatogen/printvis.c b/lib/neatogen/printvis.c
index 99b1fc14ace31027287da6680b5a2dfe507cf355..81a87cd1f9e50dc13071241799458c7fb5bc9768 100644 (file)
--- a/lib/neatogen/printvis.c
+++ b/lib/neatogen/printvis.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 #include <stdio.h>
-#include <vis.h>
+#include <pathplan/vis.h>
 typedef Ppoint_t point;
 
 

diff --git a/lib/neatogen/quad_prog_solve.c b/lib/neatogen/quad_prog_solve.c
index f8748a92196ee68911dc166805e9d86ff68eff48..9b444af4deb4f77264f5365e363c6c979e00b34d 100644 (file)
--- a/lib/neatogen/quad_prog_solve.c
+++ b/lib/neatogen/quad_prog_solve.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #ifdef DIGCOLA
 #include <math.h>
 #include <stdlib.h>
@@ -19,9 +19,9 @@
 #include <stdio.h>
 #include <float.h>
 #include <assert.h>
-#include "matrix_ops.h"
-#include "kkutils.h"
-#include "quad_prog_solver.h"
+#include <neatogen/matrix_ops.h>
+#include <neatogen/kkutils.h>
+#include <neatogen/quad_prog_solver.h>
 
 #define quad_prog_tol 1e-2
 

diff --git a/lib/neatogen/quad_prog_vpsc.c b/lib/neatogen/quad_prog_vpsc.c
index ff63ec9ec7dc114ba105e2651f8131a66d7cb06e..22297b0d50084acc78bb8c45052c04626620a039 100644 (file)
--- a/lib/neatogen/quad_prog_vpsc.c
+++ b/lib/neatogen/quad_prog_vpsc.c
@@ -25,7 +25,7 @@
  * Tim Dwyer, 2006
  **********************************************************/
 
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #ifdef IPSEPCOLA
 #include <math.h>
 #include <stdlib.h>
@@ -33,11 +33,11 @@
 #include <stdio.h>
 #include <float.h>
 #include <assert.h>
-#include "matrix_ops.h"
-#include "kkutils.h"
-#include <csolve_VPSC.h>
-#include "quad_prog_vpsc.h"
-#include "quad_prog_solver.h"
+#include <neatogen/matrix_ops.h>
+#include <neatogen/kkutils.h>
+#include <vpsc/csolve_VPSC.h>
+#include <neatogen/quad_prog_vpsc.h>
+#include <neatogen/quad_prog_solver.h>
 
 /* #define CONMAJ_LOGGING 1 */
 #define quad_prog_tol 1e-4

diff --git a/lib/neatogen/randomkit.c b/lib/neatogen/randomkit.c
index 9673d91ecb6d4b11f657a5223c769bf51bc02269..0b85dab9f1b11af22b1192525a5f5b8ed335cd69 100644 (file)
--- a/lib/neatogen/randomkit.c
+++ b/lib/neatogen/randomkit.c
@@ -71,7 +71,7 @@
 #include <limits.h>
 #include <math.h>
 
-#include "randomkit.h"
+#include <neatogen/randomkit.h>
 
 #ifndef RK_DEV_URANDOM
 #define RK_DEV_URANDOM "/dev/urandom"

diff --git a/lib/neatogen/sgd.c b/lib/neatogen/sgd.c
index 906ee03c8d136d96919d8ef4c2d2b893f4b44eff..bd7ad613238c7021bd1a0c675e85e8ba23140c68 100644 (file)
--- a/lib/neatogen/sgd.c
+++ b/lib/neatogen/sgd.c
@@ -1,8 +1,8 @@
-#include "neato.h"
-#include "sgd.h"
-#include "dijkstra.h"
-#include "randomkit.h"
-#include "neatoprocs.h"
+#include <neatogen/neato.h>
+#include <neatogen/sgd.h>
+#include <neatogen/dijkstra.h>
+#include <neatogen/randomkit.h>
+#include <neatogen/neatoprocs.h>
 #include <math.h>
 #include <stdlib.h>
 

diff --git a/lib/neatogen/site.c b/lib/neatogen/site.c
index d3e970a45deb73e70a8064f2392b458dc5796dee..464d98b265dc9293d5aca059761ee1fa25bfcf6f 100644 (file)
--- a/lib/neatogen/site.c
+++ b/lib/neatogen/site.c
@@ -11,8 +11,8 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "mem.h"
-#include "site.h"
+#include <neatogen/mem.h>
+#include <neatogen/site.h>
 #include <math.h>
 
 

diff --git a/lib/neatogen/smart_ini_x.c b/lib/neatogen/smart_ini_x.c
index 7a20a0b3894568c1c0a38ebdb1d34c1d82de0d2a..cad383b30a205b98fdbb00885876da86869830c1 100644 (file)
--- a/lib/neatogen/smart_ini_x.c
+++ b/lib/neatogen/smart_ini_x.c
@@ -11,11 +11,11 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "digcola.h"
+#include <neatogen/digcola.h>
 #ifdef DIGCOLA
-#include "kkutils.h"
-#include "matrix_ops.h"
-#include "conjgrad.h"
+#include <neatogen/kkutils.h>
+#include <neatogen/matrix_ops.h>
+#include <neatogen/conjgrad.h>
 
 static void
 standardize(double* orthog, int nvtxs) 

diff --git a/lib/neatogen/solve.c b/lib/neatogen/solve.c
index 6720df7c754c2763c97bd0ec33206a75f0882dd8..ba82f57d66441f9666987ef31ef247674dee8ee7 100644 (file)
--- a/lib/neatogen/solve.c
+++ b/lib/neatogen/solve.c
@@ -16,7 +16,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "render.h"
+#include <common/render.h>
 #define asub(i,j) a[(i)*n + (j)]
 
 

diff --git a/lib/neatogen/stress.c b/lib/neatogen/stress.c
index e8ade2dd0189a823dbf86c24b17f019ec8a29b8f..f43ecb39b3bab82c59bda2c497874db419b9a404 100644 (file)
--- a/lib/neatogen/stress.c
+++ b/lib/neatogen/stress.c
@@ -12,15 +12,15 @@
  *************************************************************************/
 
 
-#include "neato.h"
-#include "dijkstra.h"
-#include "bfs.h"
-#include "pca.h"
-#include "matrix_ops.h"
-#include "conjgrad.h"
-#include "embed_graph.h"
-#include "kkutils.h"
-#include "stress.h"
+#include <neatogen/neato.h>
+#include <neatogen/dijkstra.h>
+#include <neatogen/bfs.h>
+#include <neatogen/pca.h>
+#include <neatogen/matrix_ops.h>
+#include <neatogen/conjgrad.h>
+#include <neatogen/embed_graph.h>
+#include <neatogen/kkutils.h>
+#include <neatogen/stress.h>
 #include <math.h>
 #include <stdlib.h>
 #include <time.h>

diff --git a/lib/neatogen/stuff.c b/lib/neatogen/stuff.c
index ba1796551063929d739cba66539a4625a1657a57..102401fc82fd2f8fe31f97449a544091a70ed24f 100644 (file)
--- a/lib/neatogen/stuff.c
+++ b/lib/neatogen/stuff.c
@@ -14,8 +14,8 @@
 
 #include "config.h"
 
-#include       "neato.h"
-#include       "stress.h"
+#include       <neatogen/neato.h>
+#include       <neatogen/stress.h>
 #include       <time.h>
 #ifndef _WIN32
 #include       <unistd.h>

diff --git a/lib/neatogen/voronoi.c b/lib/neatogen/voronoi.c
index f3b2c83bcc21decc305e9cb49a7c394952019875..03e467095de57bd7c6de8bbfcd1a76bbd3425320 100644 (file)
--- a/lib/neatogen/voronoi.c
+++ b/lib/neatogen/voronoi.c
@@ -11,12 +11,12 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "mem.h"
-#include "geometry.h"
-#include "edges.h"
-#include "hedges.h"
-#include "heap.h"
-#include "voronoi.h"
+#include <neatogen/mem.h>
+#include <neatogen/geometry.h>
+#include <neatogen/edges.h>
+#include <neatogen/hedges.h>
+#include <neatogen/heap.h>
+#include <neatogen/voronoi.h>
 
 
 void voronoi(int triangulate, Site * (*nextsite) (void))