disambiguate cmd/gvmap #includes

Related to #1785.

diff --git a/cmd/gvmap/Makefile.am b/cmd/gvmap/Makefile.am
index 4c9a3121c012e8ac091cc8c3db88224c0b6e6dff..96773cc5a072d1454facd53c2494f0b876be1b89 100644 (file)
--- a/cmd/gvmap/Makefile.am
+++ b/cmd/gvmap/Makefile.am
@@ -4,6 +4,7 @@
 pdfdir = $(pkgdatadir)/doc/pdf
 
 AM_CPPFLAGS = \
+       -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/neatogen \
        -I$(top_srcdir)/lib/sfdpgen \

diff --git a/cmd/gvmap/cluster.c b/cmd/gvmap/cluster.c
index 6840d4494e9cb5dc69d09407229c8cedbd146b9a..7c4c5c19ddeec42b53d3cd4a8fd4c7cf91b7e09c 100644 (file)
--- a/cmd/gvmap/cluster.c
+++ b/cmd/gvmap/cluster.c
@@ -16,20 +16,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 #define STANDALONE
-#include "general.h"
-#include "QuadTree.h"
+#include <sparse/general.h>
+#include <sparse/QuadTree.h>
 #include <time.h>
-#include "SparseMatrix.h"
+#include <sparse/SparseMatrix.h>
 #include <getopt.h>
-#include "string.h"
+#include <string.h>
 #include "make_map.h"
-#include "spring_electrical.h"
-#include "post_process.h"
-#include "overlap.h"
-#include "clustering.h"
-#include "ingraphs.h"
-#include "DotIO.h"
-#include "colorutil.h"
+#include <sfdpgen/spring_electrical.h>
+#include <sfdpgen/post_process.h>
+#include <neatogen/overlap.h>
+#include <sparse/clustering.h>
+#include <ingraphs/ingraphs.h>
+#include <sparse/DotIO.h>
+#include <sparse/colorutil.h>
 
 #ifdef _WIN32 /*dependencies*/
     #pragma comment( lib, "cgraph.lib" )

diff --git a/cmd/gvmap/country_graph_coloring.c b/cmd/gvmap/country_graph_coloring.c
index 86db10a58a6100b93f8a93e4de8b90cccb416773..4b4dc5e1edc24ecf8cebcc950351a2c011a2a1de 100644 (file)
--- a/cmd/gvmap/country_graph_coloring.c
+++ b/cmd/gvmap/country_graph_coloring.c
@@ -16,12 +16,8 @@
 #include <math.h>
 #include "power.h"
 
-/* #include "general.h" */
-/* #include "SparseMatrix.h" */
-/* #include "country_graph_coloring.h" */
-/* #include "power.h" */
-#include "PriorityQueue.h"
-#include "time.h"
+#include <sfdpgen/PriorityQueue.h>
+#include <time.h>
 
 /* int Verbose = FALSE; */
 

diff --git a/cmd/gvmap/country_graph_coloring.h b/cmd/gvmap/country_graph_coloring.h
index 24fa32be03cf97f7cf0827280443972b0bc53143..086320c19f2c6e76e54507f9af456a7e2c151ff9 100644 (file)
--- a/cmd/gvmap/country_graph_coloring.h
+++ b/cmd/gvmap/country_graph_coloring.h
@@ -14,7 +14,7 @@
 #ifndef COUNTRY_GRAPH_CLUSTERING_H
 #define COUNTRY_GRAPH_CLUSTERING_H
 
-#include <SparseMatrix.h>
+#include <sparse/SparseMatrix.h>
 
 enum {DO_SWAPPING = 1, DO_SWAPPING_CHEAP};
 

diff --git a/cmd/gvmap/gvmap.c b/cmd/gvmap/gvmap.c
index 7550177afcb532ae104634f2e2d6a23753a0a2ba..66429e77b82b1f563b109037f6209bb76f1408d3 100644 (file)
--- a/cmd/gvmap/gvmap.c
+++ b/cmd/gvmap/gvmap.c
@@ -16,21 +16,21 @@
 #include <stdio.h>
 #include <stdlib.h>
 #define STANDALONE
-#include "general.h"
-#include "QuadTree.h"
+#include <sparse/general.h>
+#include <sparse/QuadTree.h>
 #include <time.h>
-#include "SparseMatrix.h"
+#include <sparse/SparseMatrix.h>
 #include <getopt.h>
-#include "string.h"
+#include <string.h>
 #include "make_map.h"
-#include "spring_electrical.h"
-#include "post_process.h"
-#include "overlap.h"
-#include "clustering.h"
-#include "ingraphs.h"
-#include "DotIO.h"
-#include "colorutil.h"
-#include "color_palette.h"
+#include <sfdpgen/spring_electrical.h>
+#include <sfdpgen/post_process.h>
+#include <neatogen/overlap.h>
+#include <sparse/clustering.h>
+#include <ingraphs/ingraphs.h>
+#include <sparse/DotIO.h>
+#include <sparse/colorutil.h>
+#include <sparse/color_palette.h>
 
 #ifdef _WIN32
 #define strdup(x) _strdup(x)

diff --git a/cmd/gvmap/gvmap.vcxproj b/cmd/gvmap/gvmap.vcxproj
index b4073c3bdbb4ca8275a8fd825f92122543b6580f..a8ed94c8793d2832a184edffe5d0cc8ab8c535e8 100644 (file)
--- a/cmd/gvmap/gvmap.vcxproj
+++ b/cmd/gvmap/gvmap.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -72,7 +72,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/cmd/gvmap/make_map.c b/cmd/gvmap/make_map.c
index 1ac91462d1882e35db872895869dd9084fdbe70d..04a71aa4b3b84c53b064408db5ed3d2a1ca58de5 100644 (file)
--- a/cmd/gvmap/make_map.c
+++ b/cmd/gvmap/make_map.c
@@ -12,19 +12,17 @@
  *************************************************************************/
 
 #define STANDALONE
-#include "SparseMatrix.h"
-#include "general.h"
+#include <sparse/SparseMatrix.h>
+#include <sparse/general.h>
 #include <math.h>
-#include "QuadTree.h"
-#include "string.h"
-/* #include "types.h" */
-#include <cgraph.h>
+#include <sparse/QuadTree.h>
+#include <string.h>
+#include <cgraph/cgraph.h>
 #include "make_map.h"
-/* #include "ps.h" */
-#include "stress_model.h"
+#include <sfdpgen/stress_model.h>
 #include "country_graph_coloring.h"
-#include "colorutil.h"
-#include "delaunay.h"
+#include <sparse/colorutil.h>
+#include <neatogen/delaunay.h>
 
 #ifdef SINGLE
 #define REAL float
@@ -33,8 +31,8 @@
 #endif /* not SINGLE */
 /* #include "triangle.h" */
 
-#include "lab.h"
-#include "node_distinct_coloring.h"
+#include <edgepaint/lab.h>
+#include <edgepaint/node_distinct_coloring.h>
 
 void map_palette_optimal_coloring(char *color_scheme, char *lightness, SparseMatrix A0, real accuracy, int seed, 
                                  float **rgb_r, float **rgb_g, float **rgb_b){

diff --git a/cmd/gvmap/make_map.h b/cmd/gvmap/make_map.h
index 15d5d5ec8f395c037d0953d5758046b68b57f0ac..2e3e2dd73d82bf6d1c955f5d5ae1886d559b4af4 100644 (file)
--- a/cmd/gvmap/make_map.h
+++ b/cmd/gvmap/make_map.h
@@ -14,8 +14,8 @@
 #ifndef MAKE_MAP_H
 #define MAKE_MAP_H
 
-#include <SparseMatrix.h>
-#include <cgraph.h>
+#include <sparse/SparseMatrix.h>
+#include <cgraph/cgraph.h>
 
 int make_map_from_rectangle_groups(int exclude_random, int include_OK_points, int n, int dim, real *x, real *sizes, 
                                   int *grouping, SparseMatrix graph, real bounding_box_margin[], int *nrandom,int *nart, int nedgep, 

diff --git a/cmd/gvmap/power.c b/cmd/gvmap/power.c
index 4b0a2908678dcbeaa84f6bd7d1a8c43e85c178e9..0a006b831b85766d35d9deeec22f9fe59d38e4ef 100644 (file)
--- a/cmd/gvmap/power.c
+++ b/cmd/gvmap/power.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 #include "power.h"
-#include "SparseMatrix.h"
+#include <sparse/SparseMatrix.h>
 
 void power_method(void (*matvec)(void *, int, int, real*, real **, int, int*),
                  void *A, int n, int K, int random_seed, int maxit, real tol, real **eigv, real **eigs){

diff --git a/cmd/gvmap/power.h b/cmd/gvmap/power.h
index 74296bcb6cb205317237c44b89341049086cc90c..88a526e3790076eada7cdf20196aee6756847a32 100644 (file)
--- a/cmd/gvmap/power.h
+++ b/cmd/gvmap/power.h
@@ -14,7 +14,7 @@
 #ifndef POWER_H
 #define POWER_H
 
-#include <general.h>
+#include <sparse/general.h>
 
 /* if you have a standard dense/sparse matrix, set matvec to matvec_dense/matvec_sparse*/
 void power_method(void (*matvec)(void *M, int m, int n, real *u, real **v, int transposed, int *flag),